rugged 0.28.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a520ac9fb1ac94fe6c890408004acaca2aacc597ae9b1ba5be720c09ef7aa65
-  data.tar.gz: 208ae60e1ad7b01bcfb2317a81267b5139e8874496c9a46f5410e1b87b2801f9
+  metadata.gz: 3a1ceba88401d9f47e851b97baaa27f2604baa0bb47ee81a4616e238c0706867
+  data.tar.gz: 514e432c6e411dfe4e185e5cfcd831c5110cf7a1da819390de46045b01446ea3
 SHA512:
-  metadata.gz: 0b9ec4638789d9cccab65aba6208c6fe713dd289a228b050f4fc1887897930247f43daa64f43adcdf5955b77095b60b95d3bd70b846c69df119a7a1be46bab92
-  data.tar.gz: 10fb00b82a494e72e704eb1e2ab2eae9545ba972c98f5dfabcb523d5c7fdb523d7cb16d8c97dfb2bc428100c47e98a76a52ce366e1fb6a0a842b571b68c37e65
+  metadata.gz: cb345a0ed8a223c30f86e0878b098d9e88b9d2b096bdb67b3b3fb9c82be6c8b9dd5677224f50b1d765032386eaa3926b331864af5b754bc175cd9a268fd939da
+  data.tar.gz: 959b9bb61ab95c6f250a605984846577f74a1b33a9165ca1daa7641f8f1b507f239d5b17bfb4de01180c81eb1e7d3ff3ba5aa6aa40740cb0788753040e5d887d

data/README.md

@@ -17,9 +17,9 @@ Rugged is a self-contained gem. You can install it by running:
 
     $ gem install rugged
 
-You need to have CMake and `pkg-config` installed on your system to be able to build the included version of `libgit2`. On OS X, after installing [Homebrew](http://brew.sh/), you can get CMake with:
+You need to have CMake and `pkg-config` installed on your system to be able to build the included version of `libgit2`. On OS X, after installing [Homebrew](http://brew.sh/), you can get the required packages with:
 ```bash
-$ brew install cmake
+$ brew install cmake pkg-config
 ```
 
 Please follow the above in case installation of the gem fails with `ERROR: CMake is required to build Rugged.`.

data/ext/rugged/extconf.rb

@@ -14,6 +14,7 @@ $CFLAGS << " -O3" unless $CFLAGS[/-O\d/]
 $CFLAGS << " -Wall -Wno-comment"
 
 cmake_flags = [ ENV["CMAKE_FLAGS"] ]
+cmake_flags << "-DREGEX_BACKEND=builtin"
 cmake_flags << "-DUSE_SHA1DC=ON" if with_config("sha1dc")
 
 def sys(cmd)
@@ -30,7 +31,8 @@ end
 
 def self.run_cmake(timeout, args)
   # Set to process group so we can kill it and its children
-  pid = Process.spawn("cmake #{args}", pgroup: true)
+  pgroup = Gem.win_platform? ? :new_pgroup : :pgroup
+  pid = Process.spawn("cmake #{args}", pgroup => true)
 
   Timeout.timeout(timeout) do
     Process.waitpid(pid)

data/ext/rugged/rugged.c

@@ -8,37 +8,41 @@
 #include "rugged.h"
 
 const char *RUGGED_ERROR_NAMES[] = {
-	"None",            /* GITERR_NONE */
-	"NoMemError",      /* GITERR_NOMEMORY */
-	"OSError",         /* GITERR_OS */
-	"InvalidError",    /* GITERR_INVALID */
-	"ReferenceError",  /* GITERR_REFERENCE */
-	"ZlibError",       /* GITERR_ZLIB */
-	"RepositoryError", /* GITERR_REPOSITORY */
-	"ConfigError",     /* GITERR_CONFIG */
-	"RegexError",      /* GITERR_REGEX */
-	"OdbError",        /* GITERR_ODB */
-	"IndexError",      /* GITERR_INDEX */
-	"ObjectError",     /* GITERR_OBJECT */
-	"NetworkError",    /* GITERR_NET */
-	"TagError",        /* GITERR_TAG */
-	"TreeError",       /* GITERR_TREE */
-	"IndexerError",    /* GITERR_INDEXER */
-	"SslError",        /* GITERR_SSL */
-	"SubmoduleError",  /* GITERR_SUBMODULE */
-	"ThreadError",     /* GITERR_THREAD */
-	"StashError",      /* GITERR_STASH */
-	"CheckoutError",   /* GITERR_CHECKOUT */
-	"FetchheadError",  /* GITERR_FETCHHEAD */
-	"MergeError",      /* GITERR_MERGE */
-	"SshError",        /* GITERR_SSH */
-	"FilterError",     /* GITERR_FILTER */
-	"RevertError",     /* GITERR_REVERT */
-	"CallbackError",   /* GITERR_CALLBACK */
-	"CherrypickError", /* GITERR_CHERRYPICK */
-	"DescribeError",   /* GITERR_DESCRIBE */
-	"RebaseError",     /* GITERR_REBASE */
-	"FilesystemError", /* GITERR_FILESYSTEM */
+	"None",            /* GIT_ERROR_NONE */
+	"NoMemError",      /* GIT_ERROR_NOMEMORY */
+	"OSError",         /* GIT_ERROR_OS */
+	"InvalidError",    /* GIT_ERROR_INVALID */
+	"ReferenceError",  /* GIT_ERROR_REFERENCE */
+	"ZlibError",       /* GIT_ERROR_ZLIB */
+	"RepositoryError", /* GIT_ERROR_REPOSITORY */
+	"ConfigError",     /* GIT_ERROR_CONFIG */
+	"RegexError",      /* GIT_ERROR_REGEX */
+	"OdbError",        /* GIT_ERROR_ODB */
+	"IndexError",      /* GIT_ERROR_INDEX */
+	"ObjectError",     /* GIT_ERROR_OBJECT */
+	"NetworkError",    /* GIT_ERROR_NET */
+	"TagError",        /* GIT_ERROR_TAG */
+	"TreeError",       /* GIT_ERROR_TREE */
+	"IndexerError",    /* GIT_ERROR_INDEXER */
+	"SslError",        /* GIT_ERROR_SSL */
+	"SubmoduleError",  /* GIT_ERROR_SUBMODULE */
+	"ThreadError",     /* GIT_ERROR_THREAD */
+	"StashError",      /* GIT_ERROR_STASH */
+	"CheckoutError",   /* GIT_ERROR_CHECKOUT */
+	"FetchheadError",  /* GIT_ERROR_FETCHHEAD */
+	"MergeError",      /* GIT_ERROR_MERGE */
+	"SshError",        /* GIT_ERROR_SSH */
+	"FilterError",     /* GIT_ERROR_FILTER */
+	"RevertError",     /* GIT_ERROR_REVERT */
+	"CallbackError",   /* GIT_ERROR_CALLBACK */
+	"CherrypickError", /* GIT_ERROR_CHERRYPICK */
+	"DescribeError",   /* GIT_ERROR_DESCRIBE */
+	"RebaseError",     /* GIT_ERROR_REBASE */
+	"FilesystemError", /* GIT_ERROR_FILESYSTEM */
+	"PathError",       /* GIT_ERROR_PATCH */
+	"WorktreeError",   /* GIT_ERROR_WORKTREE */
+	"SHA1Error",       /* GIT_ERROR_SHA1 */
+	"HTTPError",       /* GIT_ERROR_HTTP */
 };
 
 #define RUGGED_ERROR_COUNT (int)((sizeof(RUGGED_ERROR_NAMES)/sizeof(RUGGED_ERROR_NAMES[0])))

data/ext/rugged/rugged.h

@@ -104,6 +104,12 @@ VALUE rugged_signature_from_buffer(const char *buffer, const char *encoding_name
 void rugged_rb_ary_to_strarray(VALUE rb_array, git_strarray *str_array);
 VALUE rugged_strarray_to_rb_ary(git_strarray *str_array);
 
+#define CALLABLE_OR_RAISE(ret, name) \
+	do { \
+		if (!rb_respond_to(ret, rb_intern("call"))) \
+			rb_raise(rb_eArgError, "Expected a Proc or an object that responds to #call (:" name " )."); \
+	} while (0);
+
 static inline void rugged_set_owner(VALUE object, VALUE owner)
 {
 	rb_iv_set(object, "@owner", owner);
@@ -134,6 +140,13 @@ extern VALUE rb_cRuggedRepo;
 
 VALUE rugged__block_yield_splat(VALUE args);
 
+struct rugged_apply_cb_payload
+{
+	VALUE delta_cb;
+	VALUE hunk_cb;
+	int exception;
+};
+
 struct rugged_cb_payload
 {
     VALUE rb_data;

data/ext/rugged/rugged_blob.c

@@ -17,6 +17,8 @@ static ID id_read;
 VALUE rb_cRuggedBlob;
 VALUE rb_cRuggedBlobSig;
 
+extern const rb_data_type_t rugged_object_type;
+
 /*
  *  call-seq:
  *    blob.text(max_lines = -1, encoding = Encoding.default_external) -> string
@@ -38,7 +40,7 @@ static VALUE rb_git_blob_text_GET(int argc, VALUE *argv, VALUE self)
 	const char *content;
 	VALUE rb_max_lines, rb_encoding;
 
-	Data_Get_Struct(self, git_blob, blob);
+	TypedData_Get_Struct(self, git_blob, &rugged_object_type, blob);
 	rb_scan_args(argc, argv, "02", &rb_max_lines, &rb_encoding);
 
 	content = git_blob_rawcontent(blob);
@@ -85,7 +87,7 @@ static VALUE rb_git_blob_content_GET(int argc, VALUE *argv, VALUE self)
 	const char *content;
 	VALUE rb_max_bytes;
 
-	Data_Get_Struct(self, git_blob, blob);
+	TypedData_Get_Struct(self, git_blob, &rugged_object_type, blob);
 	rb_scan_args(argc, argv, "01", &rb_max_bytes);
 
 	content = git_blob_rawcontent(blob);
@@ -119,7 +121,7 @@ static VALUE rb_git_blob_content_GET(int argc, VALUE *argv, VALUE self)
 static VALUE rb_git_blob_rawsize(VALUE self)
 {
 	git_blob *blob;
-	Data_Get_Struct(self, git_blob, blob);
+	TypedData_Get_Struct(self, git_blob, &rugged_object_type, blob);
 
 	return INT2FIX(git_blob_rawsize(blob));
 }
@@ -304,7 +306,7 @@ static VALUE rb_git_blob_loc(VALUE self)
 	const char *data, *data_end;
 	size_t loc = 0;
 
-	Data_Get_Struct(self, git_blob, blob);
+	TypedData_Get_Struct(self, git_blob, &rugged_object_type, blob);
 
 	data = git_blob_rawcontent(blob);
 	data_end = data + git_blob_rawsize(blob);
@@ -343,7 +345,7 @@ static VALUE rb_git_blob_sloc(VALUE self)
 	const char *data, *data_end;
 	size_t sloc = 0;
 
-	Data_Get_Struct(self, git_blob, blob);
+	TypedData_Get_Struct(self, git_blob, &rugged_object_type, blob);
 
 	data = git_blob_rawcontent(blob);
 	data_end = data + git_blob_rawsize(blob);
@@ -383,7 +385,7 @@ static VALUE rb_git_blob_sloc(VALUE self)
 static VALUE rb_git_blob_is_binary(VALUE self)
 {
 	git_blob *blob;
-	Data_Get_Struct(self, git_blob, blob);
+	TypedData_Get_Struct(self, git_blob, &rugged_object_type, blob);
 	return git_blob_is_binary(blob) ? Qtrue : Qfalse;
 }
 
@@ -467,14 +469,14 @@ static VALUE rb_git_blob_diff(int argc, VALUE *argv, VALUE self)
 		rugged_parse_diff_options(&opts, rb_options);
 	}
 
-	Data_Get_Struct(self, git_blob, blob);
+	TypedData_Get_Struct(self, git_blob, &rugged_object_type, blob);
 
 	if (NIL_P(rb_other)) {
 		error = git_patch_from_blobs(&patch, blob, old_path, NULL, new_path, &opts);
 	} else if (rb_obj_is_kind_of(rb_other, rb_cRuggedBlob)) {
 		git_blob *other_blob;
 
-		Data_Get_Struct(rb_other, git_blob, other_blob);
+		TypedData_Get_Struct(rb_other, git_blob, &rugged_object_type, other_blob);
 
 		error = git_patch_from_blobs(&patch, blob, old_path, other_blob, new_path, &opts);
 	} else if (TYPE(rb_other) == T_STRING) {
@@ -649,7 +651,7 @@ static VALUE rb_git_blob_sig_new(int argc, VALUE *argv, VALUE klass)
 
 	if (rb_obj_is_kind_of(rb_blob, rb_cRuggedBlob)) {
 		git_blob *blob;
-		Data_Get_Struct(rb_blob, git_blob, blob);
+		TypedData_Get_Struct(rb_blob, git_blob, &rugged_object_type, blob);
 
 		error = git_hashsig_create(&sig,
 				git_blob_rawcontent(blob),

data/ext/rugged/rugged_commit.c

@@ -15,6 +15,8 @@ extern VALUE rb_cRuggedRepo;
 extern VALUE rb_cRuggedSignature;
 VALUE rb_cRuggedCommit;
 
+extern const rb_data_type_t rugged_object_type;
+
 /*
  *  call-seq:
  *    commit.message -> msg
@@ -35,7 +37,7 @@ static VALUE rb_git_commit_message_GET(VALUE self)
 	const char *encoding_name;
 	const char *message;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	message = git_commit_message(commit);
 	encoding_name = git_commit_message_encoding(commit);
@@ -68,7 +70,7 @@ static VALUE rb_git_commit_trailers_GET(VALUE self)
 	int error;
 	size_t i;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	encoding_name = git_commit_message_encoding(commit);
 	if (encoding_name != NULL)
@@ -118,7 +120,7 @@ static VALUE rb_git_commit_summary_GET(VALUE self)
 	const char *encoding_name;
 	const char *summary;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	summary = git_commit_summary(commit);
 	encoding_name = git_commit_message_encoding(commit);
@@ -147,7 +149,7 @@ static VALUE rb_git_commit_summary_GET(VALUE self)
 static VALUE rb_git_commit_committer_GET(VALUE self)
 {
 	git_commit *commit;
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	return rugged_signature_new(
 		git_commit_committer(commit),
@@ -172,7 +174,7 @@ static VALUE rb_git_commit_committer_GET(VALUE self)
 static VALUE rb_git_commit_author_GET(VALUE self)
 {
 	git_commit *commit;
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	return rugged_signature_new(
 		git_commit_author(commit),
@@ -192,7 +194,7 @@ static VALUE rb_git_commit_author_GET(VALUE self)
 static VALUE rb_git_commit_epoch_time_GET(VALUE self)
 {
 	git_commit *commit;
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	return ULONG2NUM(git_commit_time(commit));
 }
@@ -213,7 +215,7 @@ static VALUE rb_git_commit_tree_GET(VALUE self)
 	VALUE owner;
 	int error;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 	owner = rugged_owner(self);
 
 	error = git_commit_tree(&tree, commit);
@@ -236,7 +238,7 @@ static VALUE rb_git_commit_tree_id_GET(VALUE self)
 	git_commit *commit;
 	const git_oid *tree_id;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	tree_id = git_commit_tree_id(commit);
 
@@ -262,7 +264,7 @@ static VALUE rb_git_commit_parents_GET(VALUE self)
 	VALUE ret_arr, owner;
 	int error;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 	owner = rugged_owner(self);
 
 	parent_count = git_commit_parentcount(commit);
@@ -295,7 +297,7 @@ static VALUE rb_git_commit_parent_ids_GET(VALUE self)
 	unsigned int n, parent_count;
 	VALUE ret_arr;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	parent_count = git_commit_parentcount(commit);
 	ret_arr = rb_ary_new2((long)parent_count);
@@ -352,7 +354,7 @@ static VALUE rb_git_commit_amend(VALUE self, VALUE rb_data)
 
 	Check_Type(rb_data, T_HASH);
 
-	Data_Get_Struct(self, git_commit, commit_to_amend);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit_to_amend);
 
 	owner = rugged_owner(self);
 	Data_Get_Struct(owner, git_repository, repo);
@@ -423,7 +425,7 @@ struct commit_data {
  * Note that parents may be set even when the function errors, so make
  * sure to free this data.
  */
-static VALUE parse_commit_options(struct commit_data *out, git_repository *repo, VALUE rb_data)
+static int parse_commit_options(struct commit_data *out, git_repository *repo, VALUE rb_data)
 {
 	VALUE rb_message, rb_tree, rb_parents, rb_ref;
 	int error = 0, parent_count, i;
@@ -474,7 +476,7 @@ static VALUE parse_commit_options(struct commit_data *out, git_repository *repo,
 			if (error < GIT_OK)
 				goto out;
 		} else if (rb_obj_is_kind_of(p, rb_cRuggedCommit)) {
-			Data_Get_Struct(p, git_commit, tmp);
+			TypedData_Get_Struct(p, git_commit, &rugged_object_type, tmp);
 			if ((error = git_object_dup((git_object **) &parent, (git_object *) tmp)) < 0)
 				goto out;
 		} else {
@@ -614,7 +616,7 @@ static VALUE rb_git_commit_to_mbox(int argc, VALUE *argv, VALUE self)
 	rugged_check_repo(rb_repo);
 	Data_Get_Struct(rb_repo, git_repository, repo);
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	if (!NIL_P(rb_options)) {
 		Check_Type(rb_options, T_HASH);
@@ -673,7 +675,7 @@ static VALUE rb_git_commit_header_field(VALUE self, VALUE rb_field)
 	int error;
 
 	Check_Type(rb_field, T_STRING);
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	error = git_commit_header_field(&header_field, commit, StringValueCStr(rb_field));
 
@@ -704,7 +706,7 @@ static VALUE rb_git_commit_header(VALUE self)
 	git_commit *commit;
 	const char *raw_header;
 
-	Data_Get_Struct(self, git_commit, commit);
+	TypedData_Get_Struct(self, git_commit, &rugged_object_type, commit);
 
 	raw_header = git_commit_raw_header(commit);
 	return rb_str_new_utf8(raw_header);

data/ext/rugged/rugged_config.c

@@ -173,7 +173,7 @@ static int cb_config__each_key(const git_config_entry *entry, void *payload)
 {
 	int *exception = (int *) payload;
 
-	rb_protect(rb_yield, rb_ary_new3(1, rb_str_new_utf8(entry->name)), exception);
+	rb_protect(rb_yield, rb_str_new_utf8(entry->name), exception);
 
 	return (*exception != 0) ? GIT_EUSER : GIT_OK;
 }

data/ext/rugged/rugged_diff.c

@@ -6,7 +6,6 @@
  */
 
 #include "rugged.h"
-#include <ruby/thread.h>
 
 extern VALUE rb_mRugged;
 VALUE rb_cRuggedDiff;
@@ -198,22 +197,6 @@ static int diff_print_cb(
 	return GIT_OK;
 }
 
-struct nogvl_diff_patch_args {
-	git_diff * diff;
-	git_diff_format_t format;
-	VALUE rb_str;
-};
-
-static void * rb_git_diff_patch_nogvl(void * _args)
-{
-	struct nogvl_diff_patch_args * args;
-
-	args = (struct nogvl_diff_patch_args *)_args;
-	git_diff_print(args->diff, args->format, diff_print_cb, (void*) args->rb_str);
-
-        return NULL;
-}
-
 /*
  *  call-seq:
  *    diff.patch -> patch
@@ -226,8 +209,6 @@ static VALUE rb_git_diff_patch(int argc, VALUE *argv, VALUE self)
 	git_diff *diff;
 	VALUE rb_str = rb_str_new(NULL, 0);
 	VALUE rb_opts;
-	struct nogvl_diff_patch_args args;
-	git_diff_format_t format = GIT_DIFF_FORMAT_PATCH;
 
 	rb_scan_args(argc, argv, "00:", &rb_opts);
 
@@ -235,16 +216,13 @@ static VALUE rb_git_diff_patch(int argc, VALUE *argv, VALUE self)
 
 	if (!NIL_P(rb_opts)) {
 		if (rb_hash_aref(rb_opts, CSTR2SYM("compact")) == Qtrue)
-			format = GIT_DIFF_FORMAT_NAME_STATUS;
+			git_diff_print(diff, GIT_DIFF_FORMAT_NAME_STATUS, diff_print_cb, (void*)rb_str);
 		else
-			format = GIT_DIFF_FORMAT_PATCH;
+			git_diff_print(diff, GIT_DIFF_FORMAT_PATCH, diff_print_cb, (void*)rb_str);
+	} else {
+		git_diff_print(diff, GIT_DIFF_FORMAT_PATCH, diff_print_cb, (void*)rb_str);
 	}
 
-	args.diff = diff;
-	args.format = format;
-	args.rb_str = rb_str;
-	rb_thread_call_without_gvl(rb_git_diff_patch_nogvl, &args, RUBY_UBF_PROCESS, NULL);
-
 	return rb_str;
 }
 

data/ext/rugged/rugged_index.c

@@ -13,6 +13,8 @@ extern VALUE rb_cRuggedCommit;
 extern VALUE rb_cRuggedDiff;
 extern VALUE rb_cRuggedTree;
 
+extern const rb_data_type_t rugged_object_type;
+
 static void rb_git_indexentry_toC(git_index_entry *entry, VALUE rb_entry);
 static VALUE rb_git_indexentry_fromC(const git_index_entry *entry);
 
@@ -658,7 +660,7 @@ static VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
 	int error;
 
 	Data_Get_Struct(self, git_index, index);
-	Data_Get_Struct(rb_tree, git_tree, tree);
+	TypedData_Get_Struct(rb_tree, git_tree, &rugged_object_type, tree);
 
 	if (!rb_obj_is_kind_of(rb_tree, rb_cRuggedTree)) {
 		rb_raise(rb_eTypeError, "A Rugged::Tree instance is required");
@@ -690,7 +692,7 @@ static VALUE rb_git_diff_tree_to_index(VALUE self, VALUE rb_other, VALUE rb_opti
 	// the "old file" side of the diff.
 	opts.flags ^= GIT_DIFF_REVERSE;
 
-	Data_Get_Struct(rb_other, git_tree, other_tree);
+	TypedData_Get_Struct(rb_other, git_tree, &rugged_object_type, other_tree);
 	error = git_diff_tree_to_index(&diff, repo, other_tree, index, &opts);
 
 	xfree(opts.pathspec.strings);