rugged 0.17.0b1 → 0.17.0b2

data/Rakefile

@@ -43,7 +43,7 @@ task :cover do
 end
 
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
+  t.libs << 'lib:test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end

data/ext/rugged/rugged.c

@@ -42,7 +42,7 @@ const char *RUGGED_ERROR_NAMES[] = {
 	"IndexerError", /* GITERR_INDEXER, */
 };
 
-#define RUGGED_ERROR_COUNT ((sizeof(RUGGED_ERROR_NAMES)/sizeof(RUGGED_ERROR_NAMES[0])))
+#define RUGGED_ERROR_COUNT (int)((sizeof(RUGGED_ERROR_NAMES)/sizeof(RUGGED_ERROR_NAMES[0])))
 
 VALUE rb_mRugged;
 VALUE rb_eRuggedError;
@@ -67,7 +67,7 @@ static VALUE rb_git_hex_to_raw(VALUE self, VALUE hex)
 	Check_Type(hex, T_STRING);
 	rugged_exception_check(git_oid_fromstr(&oid, StringValueCStr(hex)));
 
-	return rugged_str_ascii(oid.id, 20);
+	return rugged_str_ascii((const char *)oid.id, 20);
 }
 
 /*
@@ -90,7 +90,7 @@ static VALUE rb_git_raw_to_hex(VALUE self, VALUE raw)
 	if (RSTRING_LEN(raw) != GIT_OID_RAWSZ)
 		rb_raise(rb_eTypeError, "Invalid buffer size for an OID");
 
-	git_oid_fromraw(&oid, RSTRING_PTR(raw));
+	git_oid_fromraw(&oid, (const unsigned char *)RSTRING_PTR(raw));
 	git_oid_fmt(out, &oid);
 
 	return rugged_str_new(out, 40, NULL);

data/ext/rugged/rugged.h

@@ -80,7 +80,7 @@ static inline void rugged_set_owner(VALUE object, VALUE owner)
 
 static inline VALUE rugged_owner(VALUE object)
 {
-	rb_iv_get(object, "@owner");
+	return rb_iv_get(object, "@owner");
 }
 
 extern void rugged_exception_raise(int errorcode);
@@ -105,15 +105,9 @@ static inline int rugged_parse_bool(VALUE boolean)
 #	define rugged_str_new2(str, enc) rb_enc_str_new(str, strlen(str), enc)
 #	define rugged_str_ascii(str, len) rb_enc_str_new(str, len, rb_ascii8bit_encoding());
 
-static VALUE rugged_str_repoenc(const char *str, long len, VALUE rb_repo)
-{
-	VALUE rb_enc = rb_iv_get(rb_repo, "@encoding");
-	return rb_enc_str_new(str, len, NIL_P(rb_enc) ? NULL : rb_to_encoding(rb_enc));
-}
 #else
 #	define rugged_str_new(str, len, rb_enc)  rb_str_new(str, len)
 #	define rugged_str_new2(str, rb_enc) rb_str_new2(str)
-#	define rugged_str_repoenc(str, len, repo) rb_str_new(str, len)
 #	define rugged_str_ascii(str, len) rb_str_new(str, len)
 #endif
 

data/ext/rugged/rugged_blob.c

@@ -23,6 +23,7 @@
  */
 
 #include "rugged.h"
+#include <ctype.h>
 
 extern VALUE rb_mRugged;
 extern VALUE rb_cRuggedObject;

data/ext/rugged/rugged_commit.c

@@ -173,7 +173,6 @@ static VALUE rb_git_commit_tree_oid_GET(VALUE self)
 {
 	git_commit *commit;
 	const git_oid *tree_oid;
-	int error;
 
 	Data_Get_Struct(self, git_commit, commit);
 
@@ -233,7 +232,6 @@ static VALUE rb_git_commit_parent_oids_GET(VALUE self)
 	const git_oid *parent_oid;
 	unsigned int n, parent_count;
 	VALUE ret_arr;
-	int error;
 
 	Data_Get_Struct(self, git_commit, commit);
 

data/ext/rugged/rugged_config.c

@@ -166,7 +166,6 @@ static VALUE rb_git_config_delete(VALUE self, VALUE rb_key)
 {
 	git_config *config;
 	int error;
-	VALUE result;
 
 	Data_Get_Struct(self, git_config, config);
 	Check_Type(rb_key, T_STRING);

data/ext/rugged/rugged_object.c

@@ -2,17 +2,17 @@
  * The MIT License
  *
  * Copyright (c) 2011 GitHub, Inc
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -164,7 +164,7 @@ static git_otype class2otype(VALUE klass)
 
 	if (klass == rb_cRuggedTree)
 		return GIT_OBJ_TREE;
-	
+
 	return GIT_OBJ_BAD;
 }
 
@@ -207,6 +207,44 @@ VALUE rb_git_object_lookup(VALUE klass, VALUE rb_repo, VALUE rb_hex)
 	return rugged_object_new(rb_repo, object);
 }
 
+static VALUE rugged_object_rev_parse(VALUE klass, VALUE rb_repo, VALUE rb_spec, int as_obj)
+{
+	git_object *object;
+	const char *spec;
+	int error;
+	git_repository *repo;
+	VALUE ret;
+
+	Check_Type(rb_spec, T_STRING);
+	spec = RSTRING_PTR(rb_spec);
+
+	if (!rb_obj_is_instance_of(rb_repo, rb_cRuggedRepo))
+		rb_raise(rb_eTypeError, "Expecting a Rugged Repository");
+
+	Data_Get_Struct(rb_repo, git_repository, repo);
+
+	error = git_revparse_single(&object, repo, spec);
+	rugged_exception_check(error);
+
+	if (as_obj) {
+		return rugged_object_new(rb_repo, object);
+	}
+
+	ret = rugged_create_oid(git_object_id(object));
+	git_object_free(object);
+	return ret;
+}
+
+VALUE rb_git_object_rev_parse(VALUE klass, VALUE rb_repo, VALUE rb_spec)
+{
+	return rugged_object_rev_parse(klass, rb_repo, rb_spec, 1);
+}
+
+VALUE rb_git_object_rev_parse_oid(VALUE klass, VALUE rb_repo, VALUE rb_spec)
+{
+	return rugged_object_rev_parse(klass, rb_repo, rb_spec, 0);
+}
+
 static VALUE rb_git_object_equal(VALUE self, VALUE other)
 {
 	git_object *a, *b;
@@ -247,6 +285,8 @@ void Init_rugged_object()
 {
 	rb_cRuggedObject = rb_define_class_under(rb_mRugged, "Object", rb_cObject);
 	rb_define_singleton_method(rb_cRuggedObject, "lookup", rb_git_object_lookup, 2);
+	rb_define_singleton_method(rb_cRuggedObject, "rev_parse", rb_git_object_rev_parse, 2);
+	rb_define_singleton_method(rb_cRuggedObject, "rev_parse_oid", rb_git_object_rev_parse_oid, 2);
 	rb_define_singleton_method(rb_cRuggedObject, "new", rb_git_object_lookup, 2);
 
 	rb_define_method(rb_cRuggedObject, "read_raw", rb_git_object_read_raw, 0);

data/ext/rugged/rugged_tag.c

@@ -2,17 +2,17 @@
  * The MIT License
  *
  * Copyright (c) 2011 GitHub, Inc
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,7 +35,7 @@ VALUE rb_cRuggedTag;
  *
  *	Return the +object+ pointed at by this tag, as a <tt>Rugged::Object</tt>
  *	instance.
- *		
+ *
  *		tag.target #=> #<Rugged::Commit:0x108828918>
  */
 static VALUE rb_git_tag_target_GET(VALUE self)
@@ -61,13 +61,12 @@ static VALUE rb_git_tag_target_GET(VALUE self)
  *	Return the oid pointed at by this tag, as a <tt>String</tt>
  *	instance.
  *
- *		tag.target #=> "2cb831a8aea28b2c1b9c63385585b864e4d3bad1"
+ *		tag.target_oid #=> "2cb831a8aea28b2c1b9c63385585b864e4d3bad1"
  */
 static VALUE rb_git_tag_target_oid_GET(VALUE self)
 {
 	git_tag *tag;
 	const git_oid *target_oid;
-	int error;
 
 	Data_Get_Struct(self, git_tag, tag);
 

data/ext/rugged/vendor/libgit2-dist/include/git2/refspec.h

@@ -19,6 +19,14 @@
  */
 GIT_BEGIN_DECL
 
+/**
+ * Parse a refspec string and create a refspec object
+ *
+ * @param refspec pointer to the refspec structure to be used
+ * @param str the refspec as a string
+ */
+GIT_EXTERN(int) git_refspec_parse(git_refspec *refspec, const char *str);
+
 /**
  * Get the source specifier
  *

data/ext/rugged/vendor/libgit2-dist/src/ignore.c

@@ -28,6 +28,8 @@ static int parse_ignore_file(
 			GITERR_CHECK_ALLOC(match);
 		}
 
+		match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE;
+
 		if (!(error = git_attr_fnmatch__parse(
 			match, ignores->pool, context, &scan)))
 		{

data/ext/rugged/vendor/libgit2-dist/src/posix.h

@@ -66,6 +66,7 @@ typedef int GIT_SOCKET;
 #else
 
 typedef SOCKET GIT_SOCKET;
+struct timezone;
 extern struct tm * p_localtime_r (const time_t *timer, struct tm *result);
 extern struct tm * p_gmtime_r (const time_t *timer, struct tm *result);
 extern int p_gettimeofday(struct timeval *tv, struct timezone *tz);

data/ext/rugged/vendor/libgit2-dist/src/repository.c

@@ -718,6 +718,9 @@ static int repo_init_config(const char *git_dir, bool is_bare, bool is_reinit)
 	SET_REPO_CONFIG(int32, "core.repositoryformatversion", GIT_REPO_VERSION);
 	SET_REPO_CONFIG(bool, "core.filemode", is_chmod_supported(git_buf_cstr(&cfg_path)));
 	
+	if (!is_bare)
+		SET_REPO_CONFIG(bool, "core.logallrefupdates", true);
+
 	if (!is_reinit && is_filesystem_case_insensitive(git_dir))
 		SET_REPO_CONFIG(bool, "core.ignorecase", true);
 	/* TODO: what other defaults? */

data/ext/rugged/vendor/libgit2-dist/src/revparse.c

@@ -13,8 +13,6 @@
 
 #include "git2.h"
 
-GIT_BEGIN_DECL
-
 typedef enum {
    REVPARSE_STATE_INIT,
    REVPARSE_STATE_CARET,
@@ -748,6 +746,3 @@ int git_revparse_single(git_object **out, git_repository *repo, const char *spec
    git_buf_free(&stepbuffer);
    return retcode;
 }
-
-
-GIT_END_DECL

data/ext/rugged/vendor/libgit2-dist/src/revwalk.c

@@ -169,14 +169,23 @@ static commit_object *commit_lookup(git_revwalk *walk, const git_oid *oid)
 	return commit;
 }
 
+static int commit_error(commit_object *commit, const char *msg)
+{
+	char commit_oid[GIT_OID_HEXSZ + 1];
+	git_oid_fmt(commit_oid, &commit->oid);
+	commit_oid[GIT_OID_HEXSZ] = '\0';
+
+	giterr_set(GITERR_ODB, "Failed to parse commit %s - %s", commit_oid, msg);
+
+	return -1;
+}
+
 static int commit_quick_parse(git_revwalk *walk, commit_object *commit, git_rawobj *raw)
 {
 	const size_t parent_len = strlen("parent ") + GIT_OID_HEXSZ + 1;
-
 	unsigned char *buffer = raw->data;
 	unsigned char *buffer_end = buffer + raw->len;
 	unsigned char *parents_start;
-
 	int i, parents = 0;
 	int commit_time;
 
@@ -207,21 +216,18 @@ static int commit_quick_parse(git_revwalk *walk, commit_object *commit, git_rawo
 
 	commit->out_degree = (unsigned short)parents;
 
-	if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) {
-		giterr_set(GITERR_ODB, "Failed to parse commit. Object is corrupted");
-		return -1;
-	}
+	if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL)
+		return commit_error(commit, "object is corrupted");
 
-	buffer = memchr(buffer, '>', buffer_end - buffer);
-	if (buffer == NULL) {
-		giterr_set(GITERR_ODB, "Failed to parse commit. Can't find author");
-		return -1;
-	}
+	if ((buffer = memchr(buffer, '<', buffer_end - buffer)) == NULL ||
+		(buffer = memchr(buffer, '>', buffer_end - buffer)) == NULL)
+		return commit_error(commit, "malformed author information");
 
-	if (git__strtol32(&commit_time, (char *)buffer + 2, NULL, 10) < 0) {
-		giterr_set(GITERR_ODB, "Failed to parse commit. Can't parse commit time");
-		return -1;
-	}
+	while (*buffer == '>' || git__isspace(*buffer))
+		buffer++;
+
+	if (git__strtol32(&commit_time, (char *)buffer, NULL, 10) < 0)
+		return commit_error(commit, "cannot parse commit time");
 
 	commit->time = (time_t)commit_time;
 	commit->parsed = 1;

data/ext/rugged/vendor/libgit2-dist/tests-clar/repo/init.c

@@ -166,14 +166,14 @@ void test_repo_init__additional_templates(void)
 	git_buf_free(&path);
 }
 
-static void assert_config_entry_on_init(const char *config_key, int expected_value)
+static void assert_config_entry_on_init_bytype(const char *config_key, int expected_value, bool is_bare)
 {
 	git_config *config;
 	int current_value;
 
 	cl_set_cleanup(&cleanup_repository, "config_entry");
 	
-	cl_git_pass(git_repository_init(&_repo, "config_entry/test.git", 1));
+	cl_git_pass(git_repository_init(&_repo, "config_entry/test.git", is_bare));
 	git_repository_config(&config, _repo);
 
 	if (expected_value >= 0) {
@@ -189,6 +189,14 @@ static void assert_config_entry_on_init(const char *config_key, int expected_val
 	git_config_free(config);
 }
 
+static void assert_config_entry_on_init(const char *config_key, int expected_value)
+{
+	assert_config_entry_on_init_bytype(config_key, expected_value, true);
+	git_repository_free(_repo);
+
+	assert_config_entry_on_init_bytype(config_key, expected_value, false);
+}
+
 void test_repo_init__detect_filemode(void)
 {
 #ifdef GIT_WIN32
@@ -233,3 +241,9 @@ void test_repo_init__reinit_doesnot_overwrite_ignorecase(void)
 
 	git_config_free(config);
 }
+
+void test_repo_init__sets_logAllRefUpdates_according_to_type_of_repository(void)
+{
+	assert_config_entry_on_init_bytype("core.logallrefupdates", GIT_ENOTFOUND, true);
+	assert_config_entry_on_init_bytype("core.logallrefupdates", true, false);
+}

data/ext/rugged/vendor/libgit2-dist/tests-clar/status/ignore.c

@@ -131,3 +131,17 @@ void test_status_ignore__empty_repo_with_gitignore_rewrite(void)
 	cl_assert(ignored);
 }
 
+void test_status_ignore__ignore_pattern_contains_space(void)
+{
+	unsigned int flags;
+	const mode_t mode = 0777;
+
+	g_repo = cl_git_sandbox_init("empty_standard_repo");
+	cl_git_rewritefile("empty_standard_repo/.gitignore", "foo bar.txt\n");
+
+	cl_git_pass(git_futils_mkdir_r("empty_standard_repo/foo", NULL, mode));
+	cl_git_mkfile("empty_standard_repo/foo/look-ma.txt", "I'm not going to be ignored!");
+
+	cl_git_pass(git_status_file(&flags, g_repo, "foo/look-ma.txt"));
+	cl_assert(flags == GIT_STATUS_WT_NEW);
+}

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_ids}>"
+      "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_oids.inspect}>"
     end
 
     # The time when this commit was made effective. This is the same value
@@ -22,10 +22,6 @@ 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

@@ -47,6 +47,20 @@ module Rugged
       Rugged::Object.lookup(self, oid)
     end
 
+    # Look up an object by a revision string.
+    #
+    # Returns one of the four classes that inherit from Rugged::Object.
+    def rev_parse(spec)
+      Rugged::Object.rev_parse(self, spec)
+    end
+
+    # Look up an object by a revision string.
+    #
+    # Returns the oid of the matched object as a String
+    def rev_parse_oid(spec)
+      Rugged::Object.rev_parse_oid(self, spec)
+    end
+
     # Look up a single reference by name.
     #
     # Example:

data/lib/rugged/version.rb

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

data/test/blob_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 
 context "Rugged::Blob tests" do
   setup do

data/test/commit_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 
 context "Rugged::Commit tests" do
   setup do

data/test/config_test.rb

@@ -1,8 +1,8 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 
 context "Rugged::Config tests" do
   setup do
-    @repo = Rugged::Repository.new(test_repo('testrepo.git'))
+    @repo = Rugged::Repository.new(temp_repo('testrepo.git'))
   end
 
   test "can read the config file from repo" do

data/test/index_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 require 'base64'
 require 'tempfile'
 require 'fileutils'
@@ -75,7 +75,7 @@ context "Rugged::Index reading stuff" do
   end
 
   test "can update entries" do
-    now = Time.now
+    now = Time.at Time.now.to_i
     e = @index.get_entry(0)
 
     e[:oid] = "12ea3153a78002a988bb92f4123e7e831fd1138a"

data/test/lib_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 require 'base64'
 
 context "Rugged::Lib stuff" do

data/test/object_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 require 'base64'
 
 context "Rugged::Object stuff" do
@@ -30,4 +30,17 @@ context "Rugged::Object stuff" do
     assert obj.read_raw
   end
 
+  test "can lookup an object by revision string" do
+    obj = @repo.rev_parse("v1.0")
+    assert "0c37a5391bbff43c37f0d0371823a5509eed5b1d", obj.oid
+    obj = @repo.rev_parse("v1.0^1")
+    assert "8496071c1b46c854b31185ea97743be6a8774479", obj.oid
+  end
+
+  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")
+    assert "8496071c1b46c854b31185ea97743be6a8774479", oid
+  end
 end

data/test/reference_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 
 context "Rugged::Reference stuff" do
   setup do

data/test/remote_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 
 context "Rugged::Tag tests" do
   setup do

data/test/repo_pack_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 require 'base64'
 
 context "Rugged::Repository packed stuff" do

data/test/repo_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require 'test_helper'
 require 'base64'
 
 context "Rugged::Repository stuff" do

data/test/tag_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 
 context "Rugged::Tag tests" do
   setup do

data/test/test_helper.rb

@@ -1,75 +1,61 @@
-dir = File.dirname(File.expand_path(__FILE__))
-$LOAD_PATH.unshift dir + '/../lib'
-$TEST_DIR = File.dirname(File.expand_path(__FILE__))
-$TESTING = true
-require 'test/unit'
 require 'tempfile'
+require 'tmpdir'
 require 'rubygems'
+require 'minitest/autorun'
 require 'rugged'
 require 'pp'
 
-##
-# test/spec/mini 3
-# http://gist.github.com/25455
-# chris@ozmm.org
-#
-def context(*args, &block)
-  return super unless (name = args.first) && block
-  require 'test/unit'
-  klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
-    def self.test(name, &block)
-      define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
-    end
-    def self.xtest(*args) end
-    def self.setup(&block) define_method(:setup, &block) end
-    def self.teardown(&block) define_method(:teardown, &block) end
-  end
-  (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
-  klass.class_eval &block
-  ($contexts ||= []) << klass # make sure klass doesn't get GC'd
-  klass
-end
+# backwards compat with test/spec/mini 3
+alias :context :describe
 
-def testpath(path)
-  File.join($TEST_DIR, path)
-end
+module Rugged
+  class TestCase < MiniTest::Spec
+    TEST_DIR = File.dirname(File.expand_path(__FILE__))
 
-def test_repo(repo)
-  dir = temp_dir
-  repo_dir = testpath(File.join('fixtures', repo, '.'))
-  `git clone #{repo_dir} #{dir}`
-  dir
-end
+    class << self
+      # backwards compat with test/spec/mini 3
+      alias :setup :before
+      alias :teardown :after
+      alias :test :it
+    end
 
-def temp_dir
-  file = Tempfile.new('dir')
-  dir = file.path
-  file.unlink
-  Dir.mkdir(dir)
-  dir
-end
+    # backwards compat with test/unit
+    alias :assert_not_nil :refute_nil
+    alias :assert_raise :assert_raises
 
-def rm_loose(oid)
+    private
 
-  base_path = File.join(@path, "objects", oid[0, 2])
+    def temp_repo(repo)
+      dir = Dir.mktmpdir 'dir'
+      repo_dir = File.join(TEST_DIR, (File.join('fixtures', repo, '.')))
+      `git clone #{repo_dir} #{dir}`
+      dir
+    end
 
-  file = File.join(base_path, oid[2, 38])
-  dir_contents = File.join(base_path, "*")
+    def rm_loose(oid)
+      base_path = File.join(@path, "objects", oid[0, 2])
 
-  File.delete(file)
+      file = File.join(base_path, oid[2, 38])
+      dir_contents = File.join(base_path, "*")
 
-  if Dir[dir_contents].empty?
-    Dir.delete(base_path)
-  end
-end
+      File.delete(file)
+
+      if Dir[dir_contents].empty?
+        Dir.delete(base_path)
+      end
+    end
 
-def with_default_encoding(encoding, &block)
-  old_encoding = Encoding.default_internal
+    def with_default_encoding(encoding, &block)
+      old_encoding = Encoding.default_internal
 
-  new_encoding = Encoding.find(encoding)
-  Encoding.default_internal = new_encoding
+      new_encoding = Encoding.find(encoding)
+      Encoding.default_internal = new_encoding
 
-  yield new_encoding
+      yield new_encoding
 
-  Encoding.default_internal = old_encoding
+      Encoding.default_internal = old_encoding
+    end
+  end
 end
+
+MiniTest::Spec.register_spec_type(/./, Rugged::TestCase)

data/test/tree_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 
 context "Rugged::Tree tests" do
   setup do

data/test/walker_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path "../test_helper", __FILE__
+require "test_helper"
 require 'base64'
 
 context "Rugged::Walker stuff" do

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification 
 name: rugged
 version: !ruby/object:Gem::Version 
-  hash: -2606657106
+  hash: 355
   prerelease: 6
   segments: 
   - 0
   - 17
   - 0
   - b
-  - 1
-  version: 0.17.0b1
+  - 2
+  version: 0.17.0b2
 platform: ruby
 authors: 
-- GitHub, Inc
+- Scott Chacon
+- Vicent Marti
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 +02:00
-default_executable: 
+date: 2012-06-15 00:00:00 Z
 dependencies: []
 
 description: |
   Rugged is a Ruby bindings to the libgit2 linkable C Git library. This is
   for testing and using the libgit2 library in a language that is awesome.
 
-email: libgit2@librelist.org
+email: schacon@gmail.com
 executables: []
 
 extensions: 
@@ -454,7 +454,6 @@ files:
 - ext/rugged/vendor/libgit2-dist/tests-clar/status/status_helpers.h
 - ext/rugged/vendor/libgit2-dist.tar.gz
 - ext/rugged/extconf.rb
-has_rdoc: true
 homepage: http://github.com/libgit2/rugged
 licenses: []
 
@@ -486,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Rugged is a Ruby binding to the libgit2 linkable library