Wrap git_index_add_frombuffer

Author: sagmor

ObjectiveGit/GTIndex.h

@@ -114,6 +114,9 @@
 /// Returns a new GTIndexEntry, or nil if an error occurred.
 - (GTIndexEntry *)entryWithName:(NSString *)name error:(NSError **)error;
 
+///TODO: Document
+- (NSData *)dataWithName:(NSString *)name error:(NSError **)error;
+
 /// Add an entry to the index.
 ///
 /// Note that this *cannot* add submodules. See -[GTSubmodule addToIndex:].
@@ -143,6 +146,9 @@
 /// Returns whether reading the tree was successful.
 - (BOOL)addContentsOfTree:(GTTree *)tree error:(NSError **)error;
 
+///TODO: Document
+- (BOOL)addData:(NSData *)data withName:(NSString *)name error:(NSError **)error;
+
 /// Remove an entry (by relative path) from the index.
 /// Will fail if the receiver's repository is nil.
 ///

ObjectiveGit/GTIndex.m

@@ -36,6 +36,7 @@
 #import "GTRepository+Private.h"
 #import "GTRepository.h"
 #import "GTTree.h"
+#import "GTBlob.h"
 #import "NSArray+StringArray.h"
 #import "NSError+Git.h"
 
@@ -158,6 +159,18 @@ - (GTIndexEntry *)entryWithName:(NSString *)name error:(NSError **)error {
 	return [self entryAtIndex:pos];
 }
 
+- (NSData *)dataWithName:(NSString *)name error:(NSError **)error {
+	GTIndexEntry *entry = [self entryWithName:name error:error];
+	if (*error) return nil;
+	
+	const git_oid *oid = &entry.git_index_entry->id;
+	GTBlob *blob = [self.repository lookUpObjectByGitOid:oid
+											  objectType:GTObjectTypeBlob
+												   error:error];
+	
+	return [blob data];
+}
+
 - (BOOL)addEntry:(GTIndexEntry *)entry error:(NSError **)error {
 	int status = git_index_add(self.git_index, entry.git_index_entry);
 	if (status != GIT_OK) {
@@ -191,6 +204,24 @@ - (BOOL)addContentsOfTree:(GTTree *)tree error:(NSError **)error {
 
 	return YES;
 }
+- (BOOL)addData:(NSData *)data withName:(NSString *)name error:(NSError **)error {
+	NSParameterAssert(data != nil);
+	NSParameterAssert(name != nil);
+	
+	git_index_entry entry;
+	memset(&entry, 0x0, sizeof(git_index_entry));
+	entry.path = [name cStringUsingEncoding:NSUTF8StringEncoding];
+	entry.mode = GIT_FILEMODE_BLOB;
+	
+	int status = git_index_add_frombuffer(self.git_index, &entry, [data bytes], [data length]);
+	
+	if (status != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to add data with name %@ into index.", name];
+		return NO;
+	}
+	
+	return YES;
+}
 
 - (BOOL)removeFile:(NSString *)file error:(NSError **)error {
 	NSString *unicodeString = [self composedUnicodeStringWithString:file];

ObjectiveGitTests/GTIndexSpec.m

@@ -276,6 +276,32 @@
 	});
 });
 
+describe(@"adding data", ^{
+	__block GTRepository *repo;
+	__block GTIndex *index;
+	__block NSError *error;
+	
+	beforeEach(^{
+		error = nil;
+		repo = self.testUnicodeFixtureRepository;
+		// Not sure why but it doesn't work with an in memory index
+		// index = [GTIndex inMemoryIndexWithRepository:repo error:&error];
+		index = [repo indexWithError:&error];
+		expect(error).to(beNil());
+	});
+	
+	it(@"should store data at given path", ^{
+		NSData *data = [NSData dataWithBytes:"foo" length:4];
+		[index addData:data withName:@"bar/foo" error:&error];
+		expect(error).to(beNil());
+		
+		NSData *returnData = [index dataWithName:@"bar/foo" error:&error];
+		expect(error).to(beNil());
+//		expect([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]).to(equal(@"foo"));
+		expect(returnData).to(equal(data));
+	});
+});
+
 afterEach(^{
 	[self tearDown];
 });