rugged 0.17.0.b7 → 0.18.0.b1

data/ext/rugged/rugged_revwalk.c

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2011 GitHub, Inc
+ * Copyright (c) 2013 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
@@ -135,10 +135,12 @@ static VALUE rb_git_walker_push(VALUE self, VALUE rb_commit)
 
 	Data_Get_Struct(self, git_revwalk, walk);
 
-	commit = (git_commit *)rugged_object_load(
+	commit = (git_commit *)rugged_object_get(
 		git_revwalk_repository(walk), rb_commit, GIT_OBJ_COMMIT);
 
 	git_revwalk_push(walk, git_object_id((git_object *)commit));
+
+	git_commit_free(commit);
 	return Qnil;
 }
 
@@ -154,10 +156,12 @@ static VALUE rb_git_walker_hide(VALUE self, VALUE rb_commit)
 
 	Data_Get_Struct(self, git_revwalk, walk);
 
-	commit = (git_commit *)rugged_object_load(
+	commit = (git_commit *)rugged_object_get(
 		git_revwalk_repository(walk), rb_commit, GIT_OBJ_COMMIT);
 
 	git_revwalk_hide(walk, git_object_id((git_object *)commit));
+
+	git_commit_free(commit);
 	return Qnil;
 }
 

data/ext/rugged/rugged_settings.c

@@ -0,0 +1,110 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2013 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
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "rugged.h"
+
+#if !defined(NUM2SIZET)
+#  if SIZEOF_SIZE_T == SIZEOF_LONG
+#    define NUM2SIZET(n) ((size_t)NUM2ULONG(n))
+#    define SIZET2NUM(n) ((size_t)ULONG2NUM(n))
+#  else
+#    define NUM2SIZET(n) ((size_t)NUM2ULL(n))
+#    define SIZET2NUM(n) ((size_t)ULL2NUM(n))
+#  endif
+#endif /* ! defined(NUM2SIZET) */
+
+extern VALUE rb_mRugged;
+
+/*
+ *	call-seq:
+ *		Rugged.Settings[option] = value
+ *
+ *	Sets a libgit2 library option
+ *
+ */
+static VALUE rb_git_set_option(VALUE self, VALUE option, VALUE value)
+{
+	const char *opt;
+
+	Check_Type(option, T_STRING);
+	opt = StringValueCStr(option);
+
+	if (strcmp(opt, "mwindow_size") == 0) {
+		size_t val;
+		Check_Type(value, T_FIXNUM);
+		val = NUM2SIZET(value);
+		git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, val);
+	}
+	
+	else if (strcmp(opt, "mwindow_mapped_limit") == 0) {
+		size_t val;
+		Check_Type(value, T_FIXNUM);
+		val = NUM2SIZET(value);
+		git_libgit2_opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, val);
+	}
+
+	else {
+		rb_raise(rb_eArgError, "Unknown option specified");
+	}
+
+	return Qnil;
+}
+
+/*
+ *	call-seq:
+ *		val = Rugged.Settings[option] 
+ *
+ *	Gets the value of a libgit2 library option
+ *
+ */
+static VALUE rb_git_get_option(VALUE self, VALUE option)
+{
+	const char *opt;
+
+	Check_Type(option, T_STRING);
+	opt = StringValueCStr(option);
+
+	if (strcmp(opt, "mwindow_size") == 0) {
+		size_t val;
+		git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &val);
+		return SIZET2NUM(val);
+	}
+	
+	else if (strcmp(opt, "mwindow_mapped_limit") == 0) {
+		size_t val;
+		git_libgit2_opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, &val);
+		return SIZET2NUM(val);
+	}
+	
+	else {
+		rb_raise(rb_eArgError, "Unknown option specified");
+	}
+}
+
+void Init_rugged_settings()
+{
+	VALUE rb_cRuggedSettings = rb_define_class_under(rb_mRugged, "Settings", rb_cObject);
+	rb_define_module_function(rb_cRuggedSettings, "[]=", rb_git_set_option, 2);
+	rb_define_module_function(rb_cRuggedSettings, "[]", rb_git_get_option, 1);
+}

data/ext/rugged/rugged_signature.c

@@ -1,18 +1,18 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2011 GitHub, Inc
- * 
+ * Copyright (c) 2013 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
@@ -37,8 +37,17 @@ VALUE rugged_signature_new(const git_signature *sig, const char *encoding_name)
 
 	rb_sig = rb_hash_new();
 
+#if RUBY_API_VERSION_MINOR >= 9
+	/* Allocate the time with a the given timezone */
+	rb_time = rb_funcall(
+		rb_time_new(sig->when.time, 0),
+		rb_intern("getlocal"), 1,
+		INT2FIX(sig->when.offset * 60)
+	);
+#else
 	rb_time = rb_time_new(sig->when.time, 0);
-	rb_funcall(rb_time, rb_intern("utc"), 0);
+	rb_hash_aset(rb_sig, CSTR2SYM("time_offset"), INT2FIX(sig->when.offset * 60));
+#endif
 
 	rb_hash_aset(rb_sig, CSTR2SYM("name"), rugged_str_new2(sig->name, encoding));
 	rb_hash_aset(rb_sig, CSTR2SYM("email"), rugged_str_new2(sig->email, encoding));
@@ -50,7 +59,7 @@ VALUE rugged_signature_new(const git_signature *sig, const char *encoding_name)
 git_signature *rugged_signature_get(VALUE rb_sig)
 {
 	int error;
-	VALUE rb_time, rb_unix_t, rb_offset, rb_name, rb_email;
+	VALUE rb_time, rb_unix_t, rb_offset, rb_name, rb_email, rb_time_offset;
 	git_signature *sig;
 
 	Check_Type(rb_sig, T_HASH);
@@ -58,6 +67,7 @@ git_signature *rugged_signature_get(VALUE rb_sig)
 	rb_name = rb_hash_aref(rb_sig, CSTR2SYM("name"));
 	rb_email = rb_hash_aref(rb_sig, CSTR2SYM("email"));
 	rb_time = rb_hash_aref(rb_sig, CSTR2SYM("time"));
+	rb_time_offset = rb_hash_aref(rb_sig, CSTR2SYM("time_offset"));
 
 	Check_Type(rb_name, T_STRING);
 	Check_Type(rb_email, T_STRING);
@@ -65,7 +75,13 @@ git_signature *rugged_signature_get(VALUE rb_sig)
 		rb_raise(rb_eTypeError, "expected Time object");
 
 	rb_unix_t = rb_funcall(rb_time, rb_intern("tv_sec"), 0);
-	rb_offset = rb_funcall(rb_time, rb_intern("utc_offset"), 0);
+
+	if (NIL_P(rb_time_offset)) {
+		rb_offset = rb_funcall(rb_time, rb_intern("utc_offset"), 0);
+	} else {
+		Check_Type(rb_time_offset, T_FIXNUM);
+		rb_offset = rb_time_offset;
+	}
 
 	error = git_signature_new(&sig,
 		StringValueCStr(rb_name),

data/ext/rugged/rugged_tag.c

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2011 GitHub, Inc
+ * Copyright (c) 2013 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
@@ -57,20 +57,21 @@ static VALUE rb_git_tag_target_GET(VALUE self)
 /*
  *	call-seq:
  *		tag.target_oid -> oid
+ *		tag.target_id -> oid
  *
  *	Return the oid pointed at by this tag, as a <tt>String</tt>
  *	instance.
  *
- *		tag.target_oid #=> "2cb831a8aea28b2c1b9c63385585b864e4d3bad1"
+ *		tag.target_id #=> "2cb831a8aea28b2c1b9c63385585b864e4d3bad1"
  */
-static VALUE rb_git_tag_target_oid_GET(VALUE self)
+static VALUE rb_git_tag_target_id_GET(VALUE self)
 {
 	git_tag *tag;
 	const git_oid *target_oid;
 
 	Data_Get_Struct(self, git_tag, tag);
 
-	target_oid = git_tag_target_oid(tag);
+	target_oid = git_tag_target_id(tag);
 
 	return rugged_create_oid(target_oid);
 }
@@ -92,7 +93,7 @@ static VALUE rb_git_tag_target_type_GET(VALUE self)
 	git_tag *tag;
 	Data_Get_Struct(self, git_tag, tag);
 
-	return rugged_otype_new(git_tag_type(tag));
+	return rugged_otype_new(git_tag_target_type(tag));
 }
 
 /*
@@ -124,9 +125,15 @@ static VALUE rb_git_tag_name_GET(VALUE self)
 static VALUE rb_git_tag_tagger_GET(VALUE self)
 {
 	git_tag *tag;
+	const git_signature *tagger;
+
 	Data_Get_Struct(self, git_tag, tag);
+	tagger = git_tag_tagger(tag);
+
+	if (!tagger)
+		return Qnil;
 
-	return rugged_signature_new(git_tag_tagger(tag), NULL);
+	return rugged_signature_new(tagger, NULL);
 }
 
 /*
@@ -141,9 +148,15 @@ static VALUE rb_git_tag_tagger_GET(VALUE self)
 static VALUE rb_git_tag_message_GET(VALUE self)
 {
 	git_tag *tag;
+	const char *message;
+
 	Data_Get_Struct(self, git_tag, tag);
+	message = git_tag_message(tag);
+
+	if (!message)
+		return Qnil;
 
-	return rugged_str_new2(git_tag_message(tag), NULL);
+	return rugged_str_new2(message, NULL);
 }
 
 static VALUE rb_git_tag_create(VALUE self, VALUE rb_repo, VALUE rb_data)
@@ -155,7 +168,7 @@ static VALUE rb_git_tag_create(VALUE self, VALUE rb_repo, VALUE rb_data)
 	VALUE rb_name, rb_target, rb_tagger, rb_message, rb_force;
 
 	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);
 
@@ -172,22 +185,24 @@ static VALUE rb_git_tag_create(VALUE self, VALUE rb_repo, VALUE rb_data)
 		rb_name = rb_hash_aref(rb_data, CSTR2SYM("name"));
 		Check_Type(rb_name, T_STRING);
 
-		rb_target = rb_hash_aref(rb_data, CSTR2SYM("target"));
-		target = rugged_object_load(repo, rb_target, GIT_OBJ_ANY);
-
 		rb_force = rb_hash_aref(rb_data, CSTR2SYM("force"));
 		if (!NIL_P(rb_force))
 			force = rugged_parse_bool(rb_force);
 
 		/* only for heavy tags */
-		rb_message = rb_hash_aref(rb_data, CSTR2SYM("message"));
 		rb_tagger = rb_hash_aref(rb_data, CSTR2SYM("tagger"));
+		rb_message = rb_hash_aref(rb_data, CSTR2SYM("message"));
+
+		if (!NIL_P(rb_message))
+			Check_Type(rb_message, T_STRING);
+
+		rb_target = rb_hash_aref(rb_data, CSTR2SYM("target"));
+		target = rugged_object_get(repo, rb_target, GIT_OBJ_ANY);
 
 		if (!NIL_P(rb_tagger) && !NIL_P(rb_message)) {
 			git_signature *tagger = NULL;
 
 			tagger = rugged_signature_get(rb_tagger);
-			Check_Type(rb_message, T_STRING);
 
 			error = git_tag_create(
 				&tag_oid,
@@ -239,7 +254,7 @@ static VALUE rb_git_tag_each(int argc, VALUE *argv, VALUE self)
 	}
 
 	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);
 
@@ -259,7 +274,7 @@ static VALUE rb_git_tag_delete(VALUE self, VALUE rb_repo, VALUE rb_name)
 	int error;
 
 	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);
 
 	Check_Type(rb_name, T_STRING);
@@ -280,7 +295,8 @@ void Init_rugged_tag()
 	rb_define_method(rb_cRuggedTag, "message", rb_git_tag_message_GET, 0);
 	rb_define_method(rb_cRuggedTag, "name", rb_git_tag_name_GET, 0);
 	rb_define_method(rb_cRuggedTag, "target", rb_git_tag_target_GET, 0);
-	rb_define_method(rb_cRuggedTag, "target_oid", rb_git_tag_target_oid_GET, 0);
+	rb_define_method(rb_cRuggedTag, "target_oid", rb_git_tag_target_id_GET, 0);
+	rb_define_method(rb_cRuggedTag, "target_id", rb_git_tag_target_id_GET, 0);
 	rb_define_method(rb_cRuggedTag, "target_type", rb_git_tag_target_type_GET, 0);
 	rb_define_method(rb_cRuggedTag, "tagger", rb_git_tag_tagger_GET, 0);
 }

data/ext/rugged/rugged_tree.c

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2011 GitHub, Inc
+ * Copyright (c) 2013 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
@@ -67,6 +67,7 @@ static VALUE rb_git_treeentry_fromC(const git_tree_entry *entry)
 /*
  * Rugged Tree
  */
+
 /*
  *	call-seq:
  *		tree.count -> count
@@ -117,6 +118,33 @@ static VALUE rb_git_tree_get_entry(VALUE self, VALUE entry_id)
 		rb_raise(rb_eTypeError, "entry_id must be either an index or a filename");
 }
 
+/*
+ *	call-seq:
+ *		tree.get_entry_by_oid(rb_oid) -> entry
+ *
+ *	Return one of the entries from a tree as a +Hash+, based off the oid SHA.
+ *	
+ *	If the entry doesn't exist, +nil+ will be returned.
+ *
+ *	This does a full traversal of the every element in the tree, so this method
+ *	is not especially fast.
+ *
+ *		tree.get_entry_by_oid("d8786bfc97485e8d7b19b21fb88c8ef1f199fc3f") 
+ *		#=> {:name => "foo.txt", :type => :blob, :oid => "d8786bfc97485e8d7b19b21fb88c8ef1f199fc3f", :filemode => 0}
+ *
+ */
+static VALUE rb_git_tree_get_entry_by_oid(VALUE self, VALUE rb_oid)
+{
+	git_tree *tree;
+	git_oid oid;
+	Data_Get_Struct(self, git_tree, tree);
+
+	Check_Type(rb_oid, T_STRING);
+	rugged_exception_check(git_oid_fromstr(&oid, StringValueCStr(rb_oid)));
+
+	return rb_git_treeentry_fromC(git_tree_entry_byoid(tree, &oid));
+}
+
 /*
  *	call-seq:
  *		tree.each { |entry| block }
@@ -139,7 +167,7 @@ static VALUE rb_git_tree_get_entry(VALUE self, VALUE entry_id)
 static VALUE rb_git_tree_each(VALUE self)
 {
 	git_tree *tree;
-	unsigned int i, count;
+	size_t i, count;
 	Data_Get_Struct(self, git_tree, tree);
 
 	if (!rb_block_given_p())
@@ -206,9 +234,9 @@ static VALUE rb_git_tree_walk(VALUE self, VALUE rb_mode)
 		mode = GIT_TREEWALK_POST;
 	else
 		rb_raise(rb_eTypeError,
-			"Invalid iteration mode. Expected `:preorder` or `:postorder`");
+				"Invalid iteration mode. Expected `:preorder` or `:postorder`");
 
-	error = git_tree_walk(tree, &rugged__treewalk_cb, mode, (void *)rb_block_proc());
+	error = git_tree_walk(tree, mode, &rugged__treewalk_cb, (void *)rb_block_proc());
 	rugged_exception_check(error);
 
 	return Qnil;
@@ -216,20 +244,20 @@ static VALUE rb_git_tree_walk(VALUE self, VALUE rb_mode)
 
 static VALUE rb_git_tree_path(VALUE self, VALUE rb_path)
 {
-  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);
+	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);
 
-  error = git_tree_entry_bypath(&entry, tree, StringValueCStr(rb_path));
-  rugged_exception_check(error);
+	error = git_tree_entry_bypath(&entry, tree, StringValueCStr(rb_path));
+	rugged_exception_check(error);
 
-  rb_entry = rb_git_treeentry_fromC(entry);
-  git_tree_entry_free(entry);
+	rb_entry = rb_git_treeentry_fromC(entry);
+	git_tree_entry_free(entry);
 
-  return rb_entry;
+	return rb_entry;
 }
 
 static void rb_git_treebuilder_free(git_treebuilder *bld)
@@ -373,6 +401,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_entry_by_oid", rb_git_tree_get_entry_by_oid, 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);