rugged 0.26.7 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4faf206e22374b400418a90f872b67e623ae2e3266e4fb3415eb44503af2f44c
-  data.tar.gz: 4e0f187f1256b99e1bbd9f52525dd21af71b964b7fdcedc6c718b0c8f4d0a619
+  metadata.gz: e29dd42f856fd7e0e631d3c3235ebf227fc47490338078fa91e0e4769b16cc64
+  data.tar.gz: 3f9c8ea45f76799f7eb9096e2de3d551f481f27f5df54cfc21e987a88f9eb019
 SHA512:
-  metadata.gz: 2803d2c5cf95a249b6d5ea2a36a5774243234bf96e0bf336e3a1e211eee3917a26a1c7d293019e63835ade97d8ec133275e3b8445dbebfc40d0b1fb439e2b86e
-  data.tar.gz: 59ba9779ad0090e8dd7ff369ae630e7fc1baf9f1c5de4ee89ec42bb5a9845f71cb485a7fd51a3f5a67f30c34793a94acf09193a77a541344c7143f225a7e7221
+  metadata.gz: c4e6fefc154bc8e6095cab238a698eb3ccae43e8d07f67192f07dbbe5fbee2f766aa024cec42783c16da914a80abd6c975f928d378a06f378b98a73f2b1abe11
+  data.tar.gz: e6a565322fd8bb4910168a34791a3793a336012193d5d193a89552d2b806ef946f421e289192a22f3314a1524e2593d80789bfa3d0ec65440b53a1e77afa7192

data/README.md

@@ -1,4 +1,4 @@
-# Rugged
+# Rugged [![Build Status](https://travis-ci.org/libgit2/rugged.svg?branch=master)](https://travis-ci.org/libgit2/rugged)
 **libgit2 bindings in Ruby**
 
 Rugged is a library for accessing [libgit2](https://github.com/libgit2/libgit2) in Ruby. It gives you the speed and
@@ -571,7 +571,7 @@ Rugged.raw_to_hex("\277\336Y\315\320\337\254\035\211(\024\366j\225d\032\275\212\
 
 ---
 
-### Alternative backends
+### Alternative backends
 
 You can store bare repositories in alternative backends instead of storing on disk. (see
 `redbadger/rugged-redis` for an example of how a rugged backend works).

data/ext/rugged/rugged_blame.c

@@ -188,6 +188,11 @@ static VALUE rb_git_blame_count(VALUE self)
 	return UINT2NUM(git_blame_get_hunk_count(blame));
 }
 
+static VALUE rugged_blame_enum_size(VALUE rb_blame, VALUE rb_args, VALUE rb_eobj)
+{
+	return rb_git_blame_count(rb_blame);
+}
+
 /*
  *  call-seq:
  *    blame[index] -> hunk
@@ -242,9 +247,7 @@ static VALUE rb_git_blame_each(VALUE self)
 	git_blame *blame;
 	uint32_t i, blame_count;
 
-	if (!rb_block_given_p()) {
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each"), self);
-	}
+	RETURN_SIZED_ENUMERATOR(self, 0, 0, rugged_blame_enum_size);
 
 	Data_Get_Struct(self, git_blame, blame);
 

data/ext/rugged/rugged_branch_collection.c

@@ -178,19 +178,16 @@ static VALUE rb_git_branch_collection_aref(VALUE self, VALUE rb_name) {
 
 static VALUE each_branch(int argc, VALUE *argv, VALUE self, int branch_names_only)
 {
-	VALUE rb_repo = rugged_owner(self), rb_filter;
+	VALUE rb_repo, rb_filter;
 	git_repository *repo;
 	git_branch_iterator *iter;
 	int error, exception = 0;
 	git_branch_t filter = (GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE), branch_type;
 
+	RETURN_ENUMERATOR(self, argc, argv);
 	rb_scan_args(argc, argv, "01", &rb_filter);
 
-	if (!rb_block_given_p()) {
-		VALUE symbol = branch_names_only ? CSTR2SYM("each_name") : CSTR2SYM("each");
-		return rb_funcall(self, rb_intern("to_enum"), 2, symbol, rb_filter);
-	}
-
+	rb_repo = rugged_owner(self);
 	rugged_check_repo(rb_repo);
 
 	if (!NIL_P(rb_filter))

data/ext/rugged/rugged_commit.c

@@ -7,6 +7,7 @@
 
 #include "rugged.h"
 #include "git2/commit.h"
+#include "git2/message.h"
 
 extern VALUE rb_mRugged;
 extern VALUE rb_cRuggedObject;
@@ -44,6 +45,60 @@ static VALUE rb_git_commit_message_GET(VALUE self)
 	return rb_enc_str_new(message, strlen(message), encoding);
 }
 
+/*
+ *  call-seq:
+ *    commit.trailers -> [["Trailer-name", "trailer value"], ...]
+ *
+ *  Return an array of arrays, each of which is a key/value pair representing a
+ *  commit message trailer. Both the keys and values will be strings. An array
+ *  is used to preserve the order the trailers were found.
+ *
+ *  In Ruby 1.9+, the returned strings will be encoded with the encoding
+ *  specified in the +Encoding+ header of the commit, if available.
+ *
+ */
+static VALUE rb_git_commit_trailers_GET(VALUE self)
+{
+	git_commit *commit;
+	const char *message;
+	rb_encoding *encoding = rb_utf8_encoding();
+	const char *encoding_name;
+	git_message_trailer_array arr;
+	VALUE trailers = rb_ary_new();
+	int error;
+	size_t i;
+
+	Data_Get_Struct(self, git_commit, commit);
+
+	encoding_name = git_commit_message_encoding(commit);
+	if (encoding_name != NULL)
+		encoding = rb_enc_find(encoding_name);
+
+	message = git_commit_message(commit);
+
+	error = git_message_trailers(&arr, message);
+	rugged_exception_check(error);
+
+	for(i = 0; i < arr.count; i++) {
+		VALUE pair = rb_ary_new();
+		const char *key = arr.trailers[i].key;
+		const char *value = arr.trailers[i].value;
+
+		// trailer key
+		rb_ary_push(pair, rb_enc_str_new(key, strlen(key), encoding));
+
+		// trailer value
+		rb_ary_push(pair, rb_enc_str_new(value, strlen(value), encoding));
+
+		// add it to the list
+		rb_ary_push(trailers, pair);
+	}
+
+	git_message_trailer_array_free(&arr);
+
+	return trailers;
+}
+
 /*
  *  call-seq:
  *    commit.summary -> summary
@@ -819,6 +874,7 @@ void Init_rugged_commit(void)
 	rb_define_singleton_method(rb_cRuggedCommit, "extract_signature", rb_git_commit_extract_signature, -1);
 
 	rb_define_method(rb_cRuggedCommit, "message", rb_git_commit_message_GET, 0);
+	rb_define_method(rb_cRuggedCommit, "trailers", rb_git_commit_trailers_GET, 0);
 	rb_define_method(rb_cRuggedCommit, "summary", rb_git_commit_summary_GET, 0);
 	rb_define_method(rb_cRuggedCommit, "epoch_time", rb_git_commit_epoch_time_GET, 0);
 	rb_define_method(rb_cRuggedCommit, "committer", rb_git_commit_committer_GET, 0);

data/ext/rugged/rugged_config.c

@@ -43,7 +43,7 @@ static VALUE rb_git_config_new(VALUE klass, VALUE rb_path)
 		for (i = 0; i < RARRAY_LEN(rb_path) && !error; ++i) {
 			VALUE f = rb_ary_entry(rb_path, i);
 			Check_Type(f, T_STRING);
-			error = git_config_add_file_ondisk(config, StringValueCStr(f), i + 1, 1);
+			error = git_config_add_file_ondisk(config, StringValueCStr(f), i + 1, NULL, 1);
 		}
 
 		if (error) {
@@ -198,7 +198,7 @@ static int cb_config__to_hash(const git_config_entry *entry, void *opaque)
 /*
  *  call-seq:
  *    cfg.each_key { |key| block }
- *    cfg.each_key -> enumarator
+ *    cfg.each_key -> enumerator
  *
  *  Call the given block once for each key in the config file. If no block
  *  is given, an enumerator is returned.
@@ -212,11 +212,9 @@ static VALUE rb_git_config_each_key(VALUE self)
 	git_config *config;
 	int error;
 
+	RETURN_ENUMERATOR(self, 0, 0);
 	Data_Get_Struct(self, git_config, config);
 
-	if (!rb_block_given_p())
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_key"));
-
 	error = git_config_foreach(config, &cb_config__each_key, (void *)rb_block_proc());
 	rugged_exception_check(error);
 	return Qnil;
@@ -240,12 +238,10 @@ static VALUE rb_git_config_each_pair(VALUE self)
 {
 	git_config *config;
 	int error;
-
+	
+	RETURN_ENUMERATOR(self, 0, 0);
 	Data_Get_Struct(self, git_config, config);
 
-	if (!rb_block_given_p())
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_pair"));
-
 	error = git_config_foreach(config, &cb_config__each_pair, (void *)rb_block_proc());
 	rugged_exception_check(error);
 	return Qnil;
@@ -358,6 +354,44 @@ static VALUE rb_git_config_transaction(VALUE self)
 	return rb_result;
 }
 
+static int each_config_value(const git_config_entry * entry, void *ctx)
+{
+	VALUE list = (VALUE)ctx;
+	rb_ary_push(list, rb_str_new_utf8(entry->value));
+	return 0;
+}
+
+/*
+ *  call-seq:
+ *    cfg.get_all(key) -> [value1, value2, ...]
+ *
+ *  Get a list of values for the given config +key+. Values are always
+ *  returned as an +Array+ of +String+, or +nil+ if the given key doesn't exist
+ *  in the Config file.
+ *
+ *    cfg['apply.whitespace'] #=> ['fix']
+ *    cfg['diff.renames'] #=> ['true']
+ *    cfg['remote.origin.fetch'] #=> ["+refs/heads/*:refs/remotes/origin/*", "+refs/heads/*:refs/lolol/origin/*"]
+ */
+static VALUE rb_git_config_get_all(VALUE self, VALUE key)
+{
+	git_config *config;
+	VALUE list;
+	int error;
+
+	Data_Get_Struct(self, git_config, config);
+
+	list = rb_ary_new();
+	error = git_config_get_multivar_foreach(
+		config, StringValueCStr(key), NULL, each_config_value, (void *)list);
+
+	if (error == GIT_ENOTFOUND)
+		return Qnil;
+
+	rugged_exception_check(error);
+	return list;
+}
+
 void Init_rugged_config(void)
 {
 	/*
@@ -376,6 +410,7 @@ void Init_rugged_config(void)
 
 	rb_define_method(rb_cRuggedConfig, "get", rb_git_config_get, 1);
 	rb_define_method(rb_cRuggedConfig, "[]", rb_git_config_get, 1);
+	rb_define_method(rb_cRuggedConfig, "get_all", rb_git_config_get_all, 1);
 
 	rb_define_method(rb_cRuggedConfig, "each_key", rb_git_config_each_key, 0);
 	rb_define_method(rb_cRuggedConfig, "each_pair", rb_git_config_each_pair, 0);

data/ext/rugged/rugged_diff.c

@@ -447,10 +447,7 @@ static VALUE rb_git_diff_each_patch(VALUE self)
 	int error = 0;
 	size_t d, delta_count;
 
-	if (!rb_block_given_p()) {
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_patch"), self);
-	}
-
+	RETURN_ENUMERATOR(self, 0, 0);
 	Data_Get_Struct(self, git_diff, diff);
 
 	delta_count = git_diff_num_deltas(diff);
@@ -481,13 +478,9 @@ static VALUE rb_git_diff_each_delta(VALUE self)
 {
 	git_diff *diff;
 	const git_diff_delta *delta;
-	int error = 0;
 	size_t d, delta_count;
 
-	if (!rb_block_given_p()) {
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_delta"), self);
-	}
-
+	RETURN_ENUMERATOR(self, 0, 0);
 	Data_Get_Struct(self, git_diff, diff);
 
 	delta_count = git_diff_num_deltas(diff);
@@ -496,8 +489,6 @@ static VALUE rb_git_diff_each_delta(VALUE self)
 		rb_yield(rugged_diff_delta_new(self, delta));
 	}
 
-	rugged_exception_check(error);
-
 	return self;
 }
 
@@ -524,6 +515,7 @@ static VALUE rb_git_diff_each_line(int argc, VALUE *argv, VALUE self)
 	git_diff_format_t format;
 	int exception = 0, error;
 
+	RETURN_ENUMERATOR(self, argc, argv);
 	Data_Get_Struct(self, git_diff, diff);
 
 	if (rb_scan_args(argc, argv, "01", &rb_format) == 1) {
@@ -532,9 +524,6 @@ static VALUE rb_git_diff_each_line(int argc, VALUE *argv, VALUE self)
 		rb_format = CSTR2SYM("patch");
 	}
 
-	if (!rb_block_given_p())
-		return rb_funcall(self, rb_intern("to_enum"), 2, CSTR2SYM("each_line"), rb_format);
-
 	if (SYM2ID(rb_format) == rb_intern("patch")) {
 		format = GIT_DIFF_FORMAT_PATCH;
 	} else if (SYM2ID(rb_format) == rb_intern("patch_header")) {

data/ext/rugged/rugged_diff_hunk.c

@@ -42,9 +42,7 @@ static VALUE rb_git_diff_hunk_each_line(VALUE self)
 	git_patch *patch;
 	int error = 0, l, lines_count, hunk_idx;
 
-	if (!rb_block_given_p()) {
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_line"), self);
-	}
+	RETURN_ENUMERATOR(self, 0, 0);
 
 	Data_Get_Struct(rugged_owner(self), git_patch, patch);
 

data/ext/rugged/rugged_index.c

@@ -190,11 +190,9 @@ static VALUE rb_git_index_each(VALUE self)
 	git_index *index;
 	unsigned int i, count;
 
+	RETURN_ENUMERATOR(self, 0, 0);
 	Data_Get_Struct(self, git_index, index);
 
-	if (!rb_block_given_p())
-		return rb_funcall(self, rb_intern("to_enum"), 0);
-
 	count = (unsigned int)git_index_entrycount(index);
 	for (i = 0; i < count; ++i) {
 		const git_index_entry *entry = git_index_get_byindex(index, i);
@@ -607,8 +605,6 @@ static void rb_git_indexentry_toC(git_index_entry *entry, VALUE rb_entry)
 		entry->flags &= ~GIT_IDXENTRY_VALID;
 		if (rugged_parse_bool(val))
 			entry->flags |= GIT_IDXENTRY_VALID;
-	} else {
-		entry->flags |= GIT_IDXENTRY_VALID;
 	}
 }
 

data/ext/rugged/rugged_note.c

@@ -297,12 +297,9 @@ static VALUE rb_git_note_each(int argc, VALUE *argv, VALUE self)
 	struct rugged_cb_payload payload = { self, 0 };
 	VALUE rb_notes_ref;
 
+	RETURN_ENUMERATOR(self, argc, argv);
 	rb_scan_args(argc, argv, "01", &rb_notes_ref);
 
-	if (!rb_block_given_p()) {
-		return rb_funcall(self, rb_intern("to_enum"), 3, CSTR2SYM("each_note"), self, rb_notes_ref);
-	}
-
 	if (!NIL_P(rb_notes_ref)) {
 		Check_Type(rb_notes_ref, T_STRING);
 		notes_ref = StringValueCStr(rb_notes_ref);

data/ext/rugged/rugged_patch.c

@@ -93,10 +93,7 @@ static VALUE rb_git_diff_patch_each_hunk(VALUE self)
 	int error = 0;
 	size_t hunks_count, h;
 
-	if (!rb_block_given_p()) {
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_hunk"), self);
-	}
-
+	RETURN_ENUMERATOR(self, 0, 0);
 	Data_Get_Struct(self, git_patch, patch);
 
 	hunks_count = git_patch_num_hunks(patch);

data/ext/rugged/rugged_reference_collection.c

@@ -114,15 +114,9 @@ static VALUE rb_git_reference_collection__each(int argc, VALUE *argv, VALUE self
 	git_reference_iterator *iter;
 	int error, exception = 0;
 
+	RETURN_ENUMERATOR(self, argc, argv);
 	rb_scan_args(argc, argv, "01", &rb_glob);
 
-	if (!rb_block_given_p()) {
-		return rb_funcall(self,
-			rb_intern("to_enum"), 2,
-			only_names ? CSTR2SYM("each_name") : CSTR2SYM("each"),
-			rb_glob);
-	}
-
 	rugged_check_repo(rb_repo);
 
 	Data_Get_Struct(rb_repo, git_repository, repo);

data/ext/rugged/rugged_remote.c

@@ -304,13 +304,10 @@ static VALUE rb_git_remote_ls(int argc, VALUE *argv, VALUE self)
 	int error;
 	size_t heads_len, i;
 
+	RETURN_ENUMERATOR(self, argc, argv);
 	Data_Get_Struct(self, git_remote, remote);
-
 	rb_scan_args(argc, argv, ":", &rb_options);
 
-	if (!rb_block_given_p())
-		return rb_funcall(self, rb_intern("to_enum"), 2, CSTR2SYM("ls"), rb_options);
-
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 	init_custom_headers(rb_options, &custom_headers);
 
@@ -324,7 +321,7 @@ static VALUE rb_git_remote_ls(int argc, VALUE *argv, VALUE self)
 	cleanup:
 
 	git_remote_disconnect(remote);
-	git_strarray_free(&custom_headers);
+	xfree(custom_headers.strings);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);
@@ -517,7 +514,7 @@ static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
 	error = git_remote_connect(remote, direction, &callbacks, NULL, &custom_headers);
 	git_remote_disconnect(remote);
 
-	git_strarray_free(&custom_headers);
+	xfree(custom_headers.strings);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);
@@ -617,7 +614,7 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 	error = git_remote_fetch(remote, &refspecs, &opts, log_message);
 
 	xfree(refspecs.strings);
-	git_strarray_free(&opts.custom_headers);
+	xfree(opts.custom_headers.strings);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);
@@ -692,7 +689,7 @@ static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 	error = git_remote_push(remote, &refspecs, &opts);
 
 	xfree(refspecs.strings);
-	git_strarray_free(&opts.custom_headers);
+	xfree(opts.custom_headers.strings);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);

data/ext/rugged/rugged_remote_collection.c

@@ -139,12 +139,7 @@ static VALUE rb_git_remote_collection__each(VALUE self, int only_names)
 
 	VALUE rb_repo;
 
-	if (!rb_block_given_p()) {
-		if (only_names)
-			return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_name"));
-		else
-			return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each"));
-	}
+	RETURN_ENUMERATOR(self, 0, 0);
 
 	rb_repo = rugged_owner(self);
 	rugged_check_repo(rb_repo);

data/ext/rugged/rugged_repo.c

@@ -1511,58 +1511,26 @@ static int rugged__status_cb(const char *path, unsigned int flags, void *payload
 	return GIT_OK;
 }
 
-/*
- *  call-seq:
- *    repo.status { |file, status_data| block }
- *    repo.status(path) -> status_data
- *
- *  Returns the status for one or more files in the working directory
- *  of the repository. This is equivalent to the +git status+ command.
- *
- *  The returned +status_data+ is always an array containing one or more
- *  status flags as Ruby symbols. Possible flags are:
- *
- *  - +:index_new+: the file is new in the index
- *  - +:index_modified+: the file has been modified in the index
- *  - +:index_deleted+: the file has been deleted from the index
- *  - +:worktree_new+: the file is new in the working directory
- *  - +:worktree_modified+: the file has been modified in the working directory
- *  - +:worktree_deleted+: the file has been deleted from the working directory
- *
- *  If a +block+ is given, status information will be gathered for every
- *  single file on the working dir. The +block+ will be called with the
- *  status data for each file.
- *
- *    repo.status { |file, status_data| puts "#{file} has status: #{status_data.inspect}" }
- *
- *  results in, for example:
- *
- *    src/diff.c has status: [:index_new, :worktree_new]
- *    README has status: [:worktree_modified]
- *
- *  If a +path+ is given instead, the function will return the +status_data+ for
- *  the file pointed to by path, or raise an exception if the path doesn't exist.
- *
- *  +path+ must be relative to the repository's working directory.
- *
- *    repo.status('src/diff.c') #=> [:index_new, :worktree_new]
- */
-static VALUE rb_git_repo_status(int argc, VALUE *argv, VALUE self)
+static VALUE rb_git_repo_file_status(VALUE self, VALUE rb_path)
 {
+	unsigned int flags;
 	int error;
-	VALUE rb_path;
 	git_repository *repo;
 
 	Data_Get_Struct(self, git_repository, repo);
+	Check_Type(rb_path, T_STRING);
+	error = git_status_file(&flags, repo, StringValueCStr(rb_path));
+	rugged_exception_check(error);
 
-	if (rb_scan_args(argc, argv, "01", &rb_path) == 1) {
-		unsigned int flags;
-		Check_Type(rb_path, T_STRING);
-		error = git_status_file(&flags, repo, StringValueCStr(rb_path));
-		rugged_exception_check(error);
+	return flags_to_rb(flags);
+}
 
-		return flags_to_rb(flags);
-	}
+static VALUE rb_git_repo_file_each_status(VALUE self)
+{
+	int error;
+	git_repository *repo;
+
+	Data_Get_Struct(self, git_repository, repo);
 
 	if (!rb_block_given_p())
 		rb_raise(rb_eRuntimeError,
@@ -1601,8 +1569,7 @@ static VALUE rb_git_repo_each_id(VALUE self)
 	git_odb *odb;
 	int error, exception = 0;
 
-	if (!rb_block_given_p())
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_id"));
+	RETURN_ENUMERATOR(self, 0, 0);
 
 	Data_Get_Struct(self, git_repository, repo);
 
@@ -2605,7 +2572,8 @@ void Init_rugged_repo(void)
 	rb_define_method(rb_cRuggedRepo, "path",  rb_git_repo_path, 0);
 	rb_define_method(rb_cRuggedRepo, "workdir",  rb_git_repo_workdir, 0);
 	rb_define_method(rb_cRuggedRepo, "workdir=",  rb_git_repo_set_workdir, 1);
-	rb_define_method(rb_cRuggedRepo, "status",  rb_git_repo_status,  -1);
+	rb_define_private_method(rb_cRuggedRepo, "file_status",  rb_git_repo_file_status, 1);
+	rb_define_private_method(rb_cRuggedRepo, "each_status",  rb_git_repo_file_each_status, 0);
 
 	rb_define_method(rb_cRuggedRepo, "index",  rb_git_repo_get_index,  0);
 	rb_define_method(rb_cRuggedRepo, "index=",  rb_git_repo_set_index,  1);