rugged 0.18.0.gh.de28323 → 0.19.0

data/ext/rugged/rugged_revwalk.c

@@ -40,11 +40,11 @@ VALUE rugged_walker_new(VALUE klass, VALUE owner, git_revwalk *walk)
 }
 
 /*
- *	call-seq:
- *		Walker.new(repository) -> walker
+ *  call-seq:
+ *    Walker.new(repository) -> walker
  *
- *	Create a new +Walker+ instance able to walk commits found
- *	in +repository+, which is a <tt>Rugged::Repository</tt> instance.
+ *  Create a new +Walker+ instance able to walk commits found
+ *  in +repository+, which is a <tt>Rugged::Repository</tt> instance.
  */
 static VALUE rb_git_walker_new(VALUE klass, VALUE rb_repo)
 {
@@ -61,29 +61,29 @@ static VALUE rb_git_walker_new(VALUE klass, VALUE rb_repo)
 }
 
 /*
- *	call-seq:
- *		walker.each { |commit| block }
- *		walker.each -> Iterator
+ *  call-seq:
+ *    walker.each { |commit| block }
+ *    walker.each -> Iterator
  *
- *	Perform the walk through the repository, yielding each
- *	one of the commits found as a <tt>Rugged::Commit</tt> instance
- *	to +block+.
+ *  Perform the walk through the repository, yielding each
+ *  one of the commits found as a <tt>Rugged::Commit</tt> instance
+ *  to +block+.
  *
- *	If no +block+ is given, an +Iterator+ will be returned.
+ *  If no +block+ is given, an +Iterator+ will be returned.
  *
- *	The walker must have been previously set-up before a walk can be performed
- *	(i.e. at least one commit must have been pushed).
+ *  The walker must have been previously set-up before a walk can be performed
+ *  (i.e. at least one commit must have been pushed).
  *
- *		walker.push("92b22bbcb37caf4f6f53d30292169e84f5e4283b")
- *		walker.each { |commit| puts commit.oid }
+ *    walker.push("92b22bbcb37caf4f6f53d30292169e84f5e4283b")
+ *    walker.each { |commit| puts commit.oid }
  *
- *	generates:
+ *  generates:
  *
- *		92b22bbcb37caf4f6f53d30292169e84f5e4283b
- *		6b750d5800439b502de669465b385e5f469c78b6
- *		ef9207141549f4ffcd3c4597e270d32e10d0a6bc
- *		cb75e05f0f8ac3407fb3bd0ebd5ff07573b16c9f
- *		...
+ *    92b22bbcb37caf4f6f53d30292169e84f5e4283b
+ *    6b750d5800439b502de669465b385e5f469c78b6
+ *    ef9207141549f4ffcd3c4597e270d32e10d0a6bc
+ *    cb75e05f0f8ac3407fb3bd0ebd5ff07573b16c9f
+ *    ...
  */
 static VALUE rb_git_walker_each(VALUE self)
 {
@@ -113,58 +113,74 @@ static VALUE rb_git_walker_each(VALUE self)
 }
 
 /*
- *	call-seq:
- *		walker.push(commit)
+ *  call-seq:
+ *    walker.push(commit) -> nil
  *
- *	Push one new +commit+ to start the walk from. +commit+ must be a
- *	+String+ with the OID of a commit in the repository, or a <tt>Rugged::Commit</tt>
- *	instance.
+ *  Push one new +commit+ to start the walk from. +commit+ must be a
+ *  +String+ with the OID of a commit in the repository, or a <tt>Rugged::Commit</tt>
+ *  instance.
  *
- *	More than one commit may be pushed to the walker (to walk several
- *	branches simulataneously).
+ *  More than one commit may be pushed to the walker (to walk several
+ *  branches simulataneously).
  *
- *	Duplicate pushed commits will be ignored; at least one commit must have been
- *	pushed as a starting point before the walk can begin.
+ *  Duplicate pushed commits will be ignored; at least one commit must have been
+ *  pushed as a starting point before the walk can begin.
  *
- *		walker.push("92b22bbcb37caf4f6f53d30292169e84f5e4283b")
+ *    walker.push("92b22bbcb37caf4f6f53d30292169e84f5e4283b")
  */
 static VALUE rb_git_walker_push(VALUE self, VALUE rb_commit)
 {
 	git_revwalk *walk;
 	git_commit *commit;
+	int error;
 
 	Data_Get_Struct(self, git_revwalk, walk);
 
 	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));
+	error = git_revwalk_push(walk, git_object_id((git_object *)commit));
 
 	git_commit_free(commit);
+	rugged_exception_check(error);
+
 	return Qnil;
 }
 
 /*
- *	call-seq:
- *		walker.hide(commit)
+ *  call-seq:
+ *    walker.hide(commit) -> nil
  *
+ *  Hide the given +commit+ (and all its parents) from the
+ *  output in the revision walk.
  */
 static VALUE rb_git_walker_hide(VALUE self, VALUE rb_commit)
 {
 	git_revwalk *walk;
 	git_commit *commit;
+	int error;
 
 	Data_Get_Struct(self, git_revwalk, walk);
 
 	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));
+	error = git_revwalk_hide(walk, git_object_id((git_object *)commit));
 
 	git_commit_free(commit);
+	rugged_exception_check(error);
+
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    walker.sorting = sort_mode
+ *
+ *  Change the sorting mode for the revision walk.
+ *
+ *  This will cause +walker+ to be reset.
+ */
 static VALUE rb_git_walker_sorting(VALUE self, VALUE ruby_sort_mode)
 {
 	git_revwalk *walk;
@@ -173,6 +189,13 @@ static VALUE rb_git_walker_sorting(VALUE self, VALUE ruby_sort_mode)
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    walker.reset -> nil
+ *
+ *  Remove all pushed and hidden commits and reset the +walker+
+ *  back into a blank state.
+ */
 static VALUE rb_git_walker_reset(VALUE self)
 {
 	git_revwalk *walk;
@@ -181,7 +204,7 @@ static VALUE rb_git_walker_reset(VALUE self)
 	return Qnil;
 }
 
-void Init_rugged_revwalk()
+void Init_rugged_revwalk(void)
 {
 	rb_cRuggedWalker = rb_define_class_under(rb_mRugged, "Walker", rb_cObject);
 	rb_define_singleton_method(rb_cRuggedWalker, "new", rb_git_walker_new, 1);

data/ext/rugged/rugged_settings.c

@@ -37,11 +37,10 @@
 extern VALUE rb_mRugged;
 
 /*
- *	call-seq:
- *		Rugged.Settings[option] = value
- *
- *	Sets a libgit2 library option
+ *  call-seq:
+ *    Settings[option] = value
  *
+ *  Sets a libgit2 library option.
  */
 static VALUE rb_git_set_option(VALUE self, VALUE option, VALUE value)
 {
@@ -72,11 +71,10 @@ static VALUE rb_git_set_option(VALUE self, VALUE option, VALUE value)
 }
 
 /*
- *	call-seq:
- *		val = Rugged.Settings[option] 
- *
- *	Gets the value of a libgit2 library option
+ *  call-seq:
+ *    Settings[option] -> value
  *
+ *  Gets the value of a libgit2 library option.
  */
 static VALUE rb_git_get_option(VALUE self, VALUE option)
 {
@@ -102,7 +100,7 @@ static VALUE rb_git_get_option(VALUE self, VALUE option)
 	}
 }
 
-void Init_rugged_settings()
+void Init_rugged_settings(void)
 {
 	VALUE rb_cRuggedSettings = rb_define_class_under(rb_mRugged, "Settings", rb_cObject);
 	rb_define_module_function(rb_cRuggedSettings, "[]=", rb_git_set_option, 2);

data/ext/rugged/rugged_signature.c

@@ -27,30 +27,26 @@
 VALUE rugged_signature_new(const git_signature *sig, const char *encoding_name)
 {
 	VALUE rb_sig, rb_time;
-
-#ifdef HAVE_RUBY_ENCODING_H
-	rb_encoding *encoding = NULL;
+	rb_encoding *encoding = rb_utf8_encoding();
 
 	if (encoding_name != NULL)
 		encoding = rb_enc_find(encoding_name);
-#endif
 
 	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_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));
+	rb_hash_aset(rb_sig, CSTR2SYM("name"),
+		rb_enc_str_new(sig->name, strlen(sig->name), encoding));
+
+	rb_hash_aset(rb_sig, CSTR2SYM("email"),
+		rb_enc_str_new(sig->email, strlen(sig->email), encoding));
+
 	rb_hash_aset(rb_sig, CSTR2SYM("time"), rb_time);
 
 	return rb_sig;

data/ext/rugged/rugged_tag.c

@@ -30,13 +30,13 @@ extern VALUE rb_cRuggedRepo;
 VALUE rb_cRuggedTag;
 
 /*
- *	call-seq:
- *		tag.target -> object
+ *  call-seq:
+ *    tag.target -> object
  *
- *	Return the +object+ pointed at by this tag, as a <tt>Rugged::Object</tt>
- *	instance.
+ *  Return the +object+ pointed at by this tag, as a <tt>Rugged::Object</tt>
+ *  instance.
  *
- *		tag.target #=> #<Rugged::Commit:0x108828918>
+ *    tag.target #=> #<Rugged::Commit:0x108828918>
  */
 static VALUE rb_git_tag_target_GET(VALUE self)
 {
@@ -55,14 +55,14 @@ static VALUE rb_git_tag_target_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		tag.target_oid -> oid
- *		tag.target_id -> oid
+ *  call-seq:
+ *    tag.target_oid -> oid
+ *    tag.target_id -> oid
  *
- *	Return the oid pointed at by this tag, as a <tt>String</tt>
- *	instance.
+ *  Return the oid pointed at by this tag, as a <tt>String</tt>
+ *  instance.
  *
- *		tag.target_id #=> "2cb831a8aea28b2c1b9c63385585b864e4d3bad1"
+ *    tag.target_id #=> "2cb831a8aea28b2c1b9c63385585b864e4d3bad1"
  */
 static VALUE rb_git_tag_target_id_GET(VALUE self)
 {
@@ -77,16 +77,16 @@ static VALUE rb_git_tag_target_id_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		tag.type -> t
+ *  call-seq:
+ *    tag.type -> t
  *
- *	Return a symbol representing the type of the objeced pointed at by
- *	this +tag+. Possible values are +:blob+, +:commit+, +:tree+ and +:tag+.
+ *  Return a symbol representing the type of the objeced pointed at by
+ *  this +tag+. Possible values are +:blob+, +:commit+, +:tree+ and +:tag+.
  *
- *	This is always the same as the +type+ of the returned <tt>tag.target</tt>
+ *  This is always the same as the +type+ of the returned <tt>tag.target</tt>
  *
- *		tag.type #=> :commit
- *		tag.target.type == tag.type #=> true
+ *    tag.type #=> :commit
+ *    tag.target.type == tag.type #=> true
  */
 static VALUE rb_git_tag_target_type_GET(VALUE self)
 {
@@ -97,30 +97,30 @@ static VALUE rb_git_tag_target_type_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		tag.name -> name
+ *  call-seq:
+ *    tag.name -> name
  *
- *	Return a string with the name of this +tag+.
+ *  Return a string with the name of this +tag+.
  *
- *		tag.name #=> "v0.16.0"
+ *    tag.name #=> "v0.16.0"
  */
 static VALUE rb_git_tag_name_GET(VALUE self)
 {
 	git_tag *tag;
 	Data_Get_Struct(self, git_tag, tag);
 
-	return rugged_str_new2(git_tag_name(tag), NULL);
+	return rb_str_new_utf8(git_tag_name(tag));
 }
 
 /*
- *	call-seq:
- *		tag.tagger -> signature
+ *  call-seq:
+ *    tag.tagger -> signature
  *
- *	Return the signature for the author of this +tag+. The signature
- *	is returned as a +Hash+ containing +:name+, +:email+ of the author
- *	and +:time+ of the tagging.
+ *  Return the signature for the author of this +tag+. The signature
+ *  is returned as a +Hash+ containing +:name+, +:email+ of the author
+ *  and +:time+ of the tagging.
  *
- *		tag.tagger #=> {:email=>"tanoku@gmail.com", :time=>Tue Jan 24 05:42:45 UTC 2012, :name=>"Vicent Mart\303\255"}
+ *    tag.tagger #=> {:email=>"tanoku@gmail.com", :time=>Tue Jan 24 05:42:45 UTC 2012, :name=>"Vicent Mart\303\255"}
  */
 static VALUE rb_git_tag_tagger_GET(VALUE self)
 {
@@ -137,13 +137,13 @@ static VALUE rb_git_tag_tagger_GET(VALUE self)
 }
 
 /*
- *	call-seq:
- *		tag.message -> msg
+ *  call-seq:
+ *    tag.message -> msg
  *
- *	Return the message of this +tag+. This includes the full body of the
- *	message and any optional footers or signatures after it.
+ *  Return the message of this +tag+. This includes the full body of the
+ *  message and any optional footers or signatures after it.
  *
- *		tag.message #=> "Release v0.16.0, codename 'broken stuff'"
+ *    tag.message #=> "Release v0.16.0, codename 'broken stuff'"
  */
 static VALUE rb_git_tag_message_GET(VALUE self)
 {
@@ -156,9 +156,38 @@ static VALUE rb_git_tag_message_GET(VALUE self)
 	if (!message)
 		return Qnil;
 
-	return rugged_str_new2(message, NULL);
+	return rb_str_new_utf8(message);
 }
 
+/*
+ *  call-seq:
+ *    Tag.create(repo, data) -> oid
+ *
+ *  Create a new tag in +repo+.
+ *
+ *  If +data+ is a String, it has to contain the raw tag data.
+ *
+ *  If +data+ is a Hash, it has to contain the following key value pairs:
+ *
+ *  :name ::
+ *    A String holding the tag's new name.
+ *
+ *  :force ::
+ *    If +true+, existing tags will be overwritten. Defaults to +false+.
+ *
+ *  :tagger ::
+ *    An optional Hash containing a git signature. Will cause the creation of
+ *    an annotated tag object if present.
+ *
+ *  :message ::
+ *    An optional string containing the message for the new tag. Will cause
+ *    the creation of an annotated tag if present.
+ *
+ *  :target ::
+ *    The OID of the object that the new tag should point to.
+ *
+ *  Returns the OID of the newly created tag.
+ */
 static VALUE rb_git_tag_create(VALUE self, VALUE rb_repo, VALUE rb_data)
 {
 	git_oid tag_oid;
@@ -234,12 +263,27 @@ static VALUE rb_git_tag_create(VALUE self, VALUE rb_repo, VALUE rb_data)
 	return rugged_create_oid(&tag_oid);
 }
 
+/*
+ *  call-seq:
+ *    Tag.each(repo[, pattern]) { |name| block } -> nil
+ *    Tag.each(repo[, pattern])                  -> enumerator
+ *
+ *  Iterate through all the tag names in +repo+. Iteration
+ *  can be optionally filtered to the ones matching the given
+ *  +pattern+, a standard Unix filename glob.
+ *
+ *  If +pattern+ is empty or not given, all tag names will be returned.
+ *
+ *  The given block will be called once with the name for each tag.
+ *
+ *  If no block is given, an enumerator will be returned.
+ */
 static VALUE rb_git_tag_each(int argc, VALUE *argv, VALUE self)
 {
 	git_repository *repo;
 	git_strarray tags;
 	size_t i;
-	int error;
+	int error, exception = 0;
 	VALUE rb_repo, rb_pattern;
 	const char *pattern = NULL;
 
@@ -261,13 +305,23 @@ static VALUE rb_git_tag_each(int argc, VALUE *argv, VALUE self)
 	error = git_tag_list_match(&tags, pattern ? pattern : "", repo);
 	rugged_exception_check(error);
 
-	for (i = 0; i < tags.count; ++i)
-		rb_yield(rugged_str_new2(tags.strings[i], NULL));
+	for (i = 0; !exception && i < tags.count; ++i)
+		rb_protect(rb_yield, rb_str_new_utf8(tags.strings[i]), &exception);
 
 	git_strarray_free(&tags);
+
+	if (exception)
+		rb_jump_tag(exception);
+
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    Tag.delete(repo, name) -> nil
+ *
+ *  Delete the tag reference identified by +name+ from +repo+.
+ */
 static VALUE rb_git_tag_delete(VALUE self, VALUE rb_repo, VALUE rb_name)
 {
 	git_repository *repo;
@@ -284,7 +338,7 @@ static VALUE rb_git_tag_delete(VALUE self, VALUE rb_repo, VALUE rb_name)
 	return Qnil;
 }
 
-void Init_rugged_tag()
+void Init_rugged_tag(void)
 {
 	rb_cRuggedTag = rb_define_class_under(rb_mRugged, "Tag", rb_cRuggedObject);