rugged 0.17.0b2 → 0.17.0.b6

data/Rakefile

@@ -14,6 +14,12 @@ Rake::ExtensionTask.new('rugged') do |r|
   r.lib_dir = 'lib/rugged'
 end
 
+desc "checkout libgit2 source"
+task :checkout do
+  sh "git submodule update --init"
+end
+Rake::Task[:compile].prerequisites.insert(0, :checkout)
+
 task :embedded_clean do
   lib_path = File.expand_path '../ext/rugged/libgit2_embed.a', __FILE__
   system "rm #{lib_path}"
@@ -30,14 +36,6 @@ end
 #
 task :default => [:compile, :test]
 
-task :pack_dist do
-  dir = File.dirname(File.expand_path(__FILE__))
-  output = File.join(dir, 'ext', 'rugged', 'vendor', 'libgit2-dist.tar.gz')
-  Dir.chdir(ENV['LIBGIT2_PATH']) do
-    `git archive --format=tar --prefix=libgit2-dist/ HEAD | gzip > #{output}`
-  end
-end
-
 task :cover do
   ruby 'test/coverage/cover.rb'
 end
@@ -46,14 +44,15 @@ Rake::TestTask.new do |t|
   t.libs << 'lib:test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
+  t.warning = true
 end
 
 begin
   require 'rdoc/task'
   Rake::RDocTask.new do |rdoc|
-      rdoc.rdoc_dir = 'rdoc'
-      rdoc.rdoc_files.include('ext/**/*.c')
-      rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.rdoc_files.include('ext/**/*.c')
+    rdoc.rdoc_files.include('lib/**/*.rb')
   end
 rescue LoadError
 end

data/ext/rugged/extconf.rb

@@ -16,31 +16,23 @@ end
 if p = ENV['LIBGIT2_PATH']
   $INCFLAGS[0,0] = " -I#{File.join(p, 'include')} "
   $LDFLAGS << " -L#{p} "
-
   unless have_library 'git2' and have_header 'git2.h'
     STDERR.puts "ERROR: Invalid `LIBGIT2_PATH` environment"
     exit(1)
   end
 else
   CWD = File.expand_path(File.dirname(__FILE__))
-
-  LIBGIT2_DIST = 'libgit2-dist.tar.gz'
-  LIBGIT2_DIR = File.basename(LIBGIT2_DIST, '.tar.gz')
+  LIBGIT2_DIR = File.join(CWD, '..', '..', 'vendor', 'libgit2')
   LIBGIT2_LIB_PATH = "#{CWD}/libgit2_embed.a"
 
   if !File.exists?(LIBGIT2_LIB_PATH)
-    Dir.chdir("#{CWD}/vendor") do
-      FileUtils.rm_rf(LIBGIT2_DIR) if File.exists?(LIBGIT2_DIR)
-
-      sys("tar zxvf #{LIBGIT2_DIST}")
-      Dir.chdir(LIBGIT2_DIR) do
-        sys("make -f Makefile.embed")
-        FileUtils.cp "libgit2.a", LIBGIT2_LIB_PATH
-      end
+    Dir.chdir(LIBGIT2_DIR) do
+      sys("make -f Makefile.embed")
+      FileUtils.cp 'libgit2.a', LIBGIT2_LIB_PATH
     end
   end
 
-  $INCFLAGS[0,0] = " -I#{CWD}/vendor/#{LIBGIT2_DIR}/include "
+  $INCFLAGS[0,0] = " -I#{LIBGIT2_DIR}/include "
   $LDFLAGS << " -L#{CWD} "
 
   unless have_library 'git2_embed' and have_header 'git2.h'

data/ext/rugged/rugged_commit.c

@@ -30,9 +30,6 @@ extern VALUE rb_cRuggedRepo;
 extern VALUE rb_cRuggedSignature;
 VALUE rb_cRuggedCommit;
 
-/*
- * Commit code
- */
 /*
  *	call-seq:
  *		commit.message -> msg
@@ -51,7 +48,7 @@ static VALUE rb_git_commit_message_GET(VALUE self)
 	git_commit *commit;
 
 #ifdef HAVE_RUBY_ENCODING_H
-	rb_encoding *encoding = NULL;
+	rb_encoding *encoding = rb_utf8_encoding();
 	const char *encoding_name;
 #endif
 
@@ -292,7 +289,7 @@ static VALUE rb_git_commit_create(VALUE self, VALUE rb_repo, VALUE rb_data)
 	Check_Type(rb_data, T_HASH);
 
 	if (!rb_obj_is_kind_of(rb_repo, rb_cRuggedRepo))
-		rb_raise(rb_eTypeError, "Expeting a Rugged::Repository instance");
+		rb_raise(rb_eTypeError, "Expecting a Rugged::Repository instance");
 	Data_Get_Struct(rb_repo, git_repository, repo);
 
 	rb_ref = rb_hash_aref(rb_data, CSTR2SYM("update_ref"));

data/ext/rugged/rugged_reference.c

@@ -72,7 +72,7 @@ static VALUE rb_git_ref_packall(VALUE klass, VALUE rb_repo)
 
 static int ref_foreach__block(const char *ref_name, void *opaque)
 {
-	rb_funcall((VALUE)opaque, rb_intern("call"), 1, rugged_str_new2(ref_name, NULL));
+	rb_funcall((VALUE)opaque, rb_intern("call"), 1, rugged_str_new2(ref_name, rb_utf8_encoding()));
 	return GIT_OK;
 }
 
@@ -240,7 +240,7 @@ static VALUE rb_git_ref_target(VALUE self)
 	if (git_reference_type(ref) == GIT_REF_OID) {
 		return rugged_create_oid(git_reference_oid(ref));
 	} else {
-		return rugged_str_new2(git_reference_target(ref), NULL);
+		return rugged_str_new2(git_reference_target(ref), rb_utf8_encoding());
 	}
 }
 
@@ -351,7 +351,7 @@ static VALUE rb_git_ref_name(VALUE self)
 {
 	git_reference *ref;
 	UNPACK_REFERENCE(self, ref);
-	return rugged_str_new2(git_reference_name(ref), NULL);
+	return rugged_str_new2(git_reference_name(ref), rb_utf8_encoding());
 }
 
 /*
@@ -456,10 +456,12 @@ static VALUE reflog_entry_new(const git_reflog_entry *entry)
 		rugged_signature_new(git_reflog_entry_committer(entry), NULL)
 	);
 
-	rb_hash_aset(rb_entry,
-		CSTR2SYM("message"),
-		rugged_str_new2(git_reflog_entry_msg(entry), NULL)
-	);
+	if (git_reflog_entry_msg(entry) != NULL) {
+		rb_hash_aset(rb_entry,
+			CSTR2SYM("message"),
+			rugged_str_new2(git_reflog_entry_msg(entry), NULL)
+		);
+	}
 
 	return rb_entry;
 }
@@ -514,48 +516,47 @@ static VALUE rb_git_reflog(VALUE self)
 
 /*
  *	call-seq:
- *		reference.log!(old_oid, committer, message = nil)
+ *		reference.log!(committer, message = nil)
  *
  *	Log a modification for this reference to the reflog.
- *	+old_oid+ may be +nil+ for newly created references.
  */
-static VALUE rb_git_reflog_write(
-	VALUE self,
-	VALUE rb_oid_old,
-	VALUE rb_committer,
-	VALUE rb_message)
+static VALUE rb_git_reflog_write(int argc, VALUE *argv, VALUE self)
 {
 	git_reference *ref;
+	git_reflog *reflog;
 	int error;
+
+	VALUE rb_committer, rb_message;
+
 	git_signature *committer;
 	const char *message = NULL;
-	git_oid oid_old;
+	
+	git_oid oid;
 
 	UNPACK_REFERENCE(self, ref);
 
+	rb_scan_args(argc, argv, "11", &rb_committer, &rb_message);
+
 	if (!NIL_P(rb_message)) {
 		Check_Type(rb_message, T_STRING);
 		message = StringValueCStr(rb_message);
 	}
 
-	if (!NIL_P(rb_oid_old)) {
-		Check_Type(rb_oid_old, T_STRING);
-		error = git_oid_fromstr(&oid_old, StringValueCStr(rb_oid_old));
-		rugged_exception_check(error);
-	}
+	error = git_reflog_read(&reflog, ref);
+	rugged_exception_check(error);
 
 	committer = rugged_signature_get(rb_committer);
 
-	error = git_reflog_write(
-		ref,
-		NIL_P(rb_oid_old) ? NULL : &oid_old,
-		committer,
-		message
-	);
+	error = git_reflog_append(reflog, git_reference_oid(ref), committer, message);
+	rugged_exception_check(error);
+
+	error = git_reflog_write(reflog);
+	rugged_exception_check(error);
+
+	git_reflog_free(reflog);
 
 	git_signature_free(committer);
 
-	rugged_exception_check(error);
 	return Qnil;
 }
 
@@ -585,5 +586,5 @@ void Init_rugged_reference()
 
 	rb_define_method(rb_cRuggedReference, "packed?", rb_git_ref_packed, 0);
 	rb_define_method(rb_cRuggedReference, "log", rb_git_reflog, 0);
-	rb_define_method(rb_cRuggedReference, "log!", rb_git_reflog_write, 3);
+	rb_define_method(rb_cRuggedReference, "log!", rb_git_reflog_write, -1);
 }

data/ext/rugged/rugged_remote.c

@@ -191,7 +191,7 @@ static VALUE rb_git_remote_update_tips(VALUE self)
 	Data_Get_Struct(self, git_remote, remote);
 
 	// TODO: Maybe allow passing down a block?
-	error = git_remote_update_tips(remote, NULL);
+	error = git_remote_update_tips(remote);
 	rugged_exception_check(error);
 
 	return Qnil;

data/ext/rugged/rugged_repo.c

@@ -136,6 +136,9 @@ static VALUE rugged_repo_new(VALUE klass, git_repository *repo)
 		rb_enc_from_encoding(rb_filesystem_encoding()));
 #endif
 
+	rb_iv_set(rb_repo, "@config", Qnil);
+	rb_iv_set(rb_repo, "@index", Qnil);
+
 	return rb_repo;
 }
 
@@ -531,7 +534,7 @@ static VALUE rb_git_repo_set_workdir(VALUE self, VALUE rb_workdir)
 	Check_Type(rb_workdir, T_STRING);
 
 	rugged_exception_check(
-		git_repository_set_workdir(repo, StringValueCStr(rb_workdir))
+		git_repository_set_workdir(repo, StringValueCStr(rb_workdir), 0)
 	);
 
 	return Qnil;

data/ext/rugged/rugged_tree.c

@@ -44,7 +44,7 @@ static VALUE rb_git_treeentry_fromC(const git_tree_entry *entry)
 	rb_hash_aset(rb_entry, CSTR2SYM("name"), rugged_str_new2(git_tree_entry_name(entry), NULL));
 	rb_hash_aset(rb_entry, CSTR2SYM("oid"), rugged_create_oid(git_tree_entry_id(entry)));
 
-	rb_hash_aset(rb_entry, CSTR2SYM("attributes"), INT2FIX(git_tree_entry_attributes(entry)));
+	rb_hash_aset(rb_entry, CSTR2SYM("filemode"), INT2FIX(git_tree_entry_filemode(entry)));
 
 	switch(git_tree_entry_type(entry)) {
 		case GIT_OBJ_TREE:
@@ -96,9 +96,9 @@ static VALUE rb_git_tree_entrycount(VALUE self)
  *
  *	If the entry doesn't exist, +nil+ will be returned.
  *
- *		tree[3] #=> {:name => "foo.txt", :type => :blob, :oid => "d8786bfc97485e8d7b19b21fb88c8ef1f199fc3f", :attributes => 0}
+ *		tree[3] #=> {:name => "foo.txt", :type => :blob, :oid => "d8786bfc97485e8d7b19b21fb88c8ef1f199fc3f", :filemode => 0}
  *
- *		tree['bar.txt'] #=> {:name => "bar.txt", :type => :blob, :oid => "de5ba987198bcf2518885f0fc1350e5172cded78", :attributes => 0}
+ *		tree['bar.txt'] #=> {:name => "bar.txt", :type => :blob, :oid => "de5ba987198bcf2518885f0fc1350e5172cded78", :filemode => 0}
  *
  *		tree['baz.txt'] #=> nil
  */
@@ -132,8 +132,8 @@ static VALUE rb_git_tree_get_entry(VALUE self, VALUE entry_id)
  *
  *	generates:
  *
- *		{:name => "foo.txt", :type => :blob, :oid => "d8786bfc97485e8d7b19b21fb88c8ef1f199fc3f", :attributes => 0}
- *		{:name => "bar.txt", :type => :blob, :oid => "de5ba987198bcf2518885f0fc1350e5172cded78", :attributes => 0}
+ *		{:name => "foo.txt", :type => :blob, :oid => "d8786bfc97485e8d7b19b21fb88c8ef1f199fc3f", :filemode => 0}
+ *		{:name => "bar.txt", :type => :blob, :oid => "de5ba987198bcf2518885f0fc1350e5172cded78", :filemode => 0}
  *		...
  */
 static VALUE rb_git_tree_each(VALUE self)
@@ -155,7 +155,7 @@ static VALUE rb_git_tree_each(VALUE self)
 	return Qnil;
 }
 
-static int rugged__treewalk_cb(const char *root, git_tree_entry *entry, void *proc)
+static int rugged__treewalk_cb(const char *root, const git_tree_entry *entry, void *proc)
 {
 	rb_funcall((VALUE)proc, rb_intern("call"), 2,
 		rugged_str_new2(root, NULL),
@@ -214,21 +214,22 @@ static VALUE rb_git_tree_walk(VALUE self, VALUE rb_mode)
 	return Qnil;
 }
 
-static VALUE rb_git_tree_subtree(VALUE self, VALUE rb_path)
+static VALUE rb_git_tree_path(VALUE self, VALUE rb_path)
 {
-	int error;
-	git_tree *tree, *subtree;
-	VALUE owner;
+  int error;
+  git_tree *tree;
+  git_tree_entry *entry;
+  VALUE rb_entry;
+  Data_Get_Struct(self, git_tree, tree);
+  Check_Type(rb_path, T_STRING);
 
-	Data_Get_Struct(self, git_tree, tree);
-	owner = rugged_owner(self);
+  error = git_tree_entry_bypath(&entry, tree, StringValueCStr(rb_path));
+  rugged_exception_check(error);
 
-	Check_Type(rb_path, T_STRING);
-
-	error = git_tree_get_subtree(&subtree, tree, StringValueCStr(rb_path));
-	rugged_exception_check(error);
+  rb_entry = rb_git_treeentry_fromC(entry);
+  git_tree_entry_free(entry);
 
-	return rugged_object_new(owner, (git_object *)subtree);
+  return rb_entry;
 }
 
 static void rb_git_treebuilder_free(git_treebuilder *bld)
@@ -297,7 +298,7 @@ static VALUE rb_git_treebuilder_insert(VALUE self, VALUE rb_entry)
 	Check_Type(rb_oid, T_STRING);
 	rugged_exception_check(git_oid_fromstr(&oid, StringValueCStr(rb_oid)));
 
-	rb_attr = rb_hash_aref(rb_entry, CSTR2SYM("attributes"));
+	rb_attr = rb_hash_aref(rb_entry, CSTR2SYM("filemode"));
 	Check_Type(rb_attr, T_FIXNUM);
 
 	error = git_treebuilder_insert(NULL,
@@ -372,7 +373,7 @@ void Init_rugged_tree()
 	rb_define_method(rb_cRuggedTree, "count", rb_git_tree_entrycount, 0);
 	rb_define_method(rb_cRuggedTree, "length", rb_git_tree_entrycount, 0);
 	rb_define_method(rb_cRuggedTree, "get_entry", rb_git_tree_get_entry, 1);
-	rb_define_method(rb_cRuggedTree, "get_subtree", rb_git_tree_subtree, 1);
+	rb_define_method(rb_cRuggedTree, "path", rb_git_tree_path, 1);
 	rb_define_method(rb_cRuggedTree, "[]", rb_git_tree_get_entry, 1);
 	rb_define_method(rb_cRuggedTree, "each", rb_git_tree_each, 0);
 	rb_define_method(rb_cRuggedTree, "walk", rb_git_tree_walk, 1);

data/lib/rugged/commit.rb

@@ -2,7 +2,7 @@ module Rugged
   class Commit
 
     def inspect
-      "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_oids.inspect}>"
+      "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_ids}>"
     end
 
     # The time when this commit was made effective. This is the same value
@@ -22,6 +22,10 @@ module Rugged
         :parents => parents,
       }
     end
+    
+    def parent_ids
+      parents.map { |parent| parent.oid }
+    end
 
     def modify(new_args, update_ref=nil)
       args = self.to_hash.merge(new_args)

data/lib/rugged/repository.rb

@@ -129,11 +129,13 @@ module Rugged
     # Returns a String.
     def file_at(revision, path)
       tree = Rugged::Commit.lookup(self, revision).tree
-      subtree = tree.get_subtree(path)
-      blob_data = subtree.get_entry(File.basename path)
-      return nil unless blob_data
+	  begin
+		blob_data = tree.path(path)
+	  rescue Rugged::IndexerError
+        return nil
+	  end
       blob = Rugged::Blob.lookup(self, blob_data[:oid])
-      blob.content
+	  (blob.type == :blob) ? blob.content : nil
     end
   end
 end

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.17.0b2'
+  Version = VERSION = '0.17.0.b6'
 end

data/test/config_test.rb

@@ -30,7 +30,7 @@ context "Rugged::Config tests" do
     assert_equal 'my value', config2['custom.value']
 
     content = File.read(File.join(@repo.path, 'config'))
-    assert_match /value = my value/, content
+    assert_match(/value = my value/, content)
   end
 
   test "can delete config values" do

data/test/index_test.rb

@@ -92,6 +92,8 @@ context "Rugged::Index reading stuff" do
     @index.add(e)
     new_e = @index[e[:path]]
 
+    # git only sets executable bit based on owner
+    e[:mode] = 33188
     assert_equal e, new_e
   end
 
@@ -99,7 +101,7 @@ context "Rugged::Index reading stuff" do
     e = new_index_entry
     @index << e
     assert_equal 3, @index.count
-    itr_test = @index.sort { |a, b| a[:oid] <=> b[:oid] }.map { |e| e[:path] }.join(':')
+    itr_test = @index.sort { |a, b| a[:oid] <=> b[:oid] }.map { |x| x[:path] }.join(':')
     assert_equal "README:new_path:new.txt", itr_test
   end
 end
@@ -129,7 +131,7 @@ context "Rugged::Index writing stuff" do
 
     index2 = Rugged::Index.new(@tmppath)
 
-    itr_test = index2.sort { |a, b| a[:oid] <=> b[:oid] }.map { |e| e[:path] }.join(':')
+    itr_test = index2.sort { |a, b| a[:oid] <=> b[:oid] }.map { |x| x[:path] }.join(':')
     assert_equal "README:else.txt:new_path:new.txt", itr_test
     assert_equal 4, index2.count
   end

data/test/object_test.rb

@@ -8,8 +8,8 @@ context "Rugged::Object stuff" do
   end
 
   test "cannot lookup a non-existant object" do
-    assert_raise Rugged::OdbError do
-      obj = @repo.lookup("a496071c1b46c854b31185ea97743be6a8774479")
+    assert_raises Rugged::OdbError do
+      @repo.lookup("a496071c1b46c854b31185ea97743be6a8774479")
     end
   end
 
@@ -40,7 +40,7 @@ context "Rugged::Object stuff" do
   test "can lookup just an object's oid by revision string" do
     oid = @repo.rev_parse_oid("v1.0")
     assert "0c37a5391bbff43c37f0d0371823a5509eed5b1d", oid
-    obj = @repo.rev_parse_oid("v1.0^1")
+    @repo.rev_parse_oid("v1.0^1")
     assert "8496071c1b46c854b31185ea97743be6a8774479", oid
   end
 end