rugged 0.21.4 → 0.22.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f476d2b5aaa786237a1a2e6c02ad6817395753a
-  data.tar.gz: bf560fd348d673a1ecf2082347cdcab68bc85141
+  metadata.gz: 0aa39e21ccc3e603f31e60c998ccc0c71980ba60
+  data.tar.gz: fff10f16bf3d155d9851ea92cbfa49b2f30e8dda
 SHA512:
-  metadata.gz: a47343b080593b0e668fdb259baafb7cd6f0a26dd7813476bafa83e60ded6e9218c417f4591b266825369ad8b600e3bd0e4016f2efa1c536501f39c64160256f
-  data.tar.gz: eec3ac2c4f8d77755e44c8f6d5e4358dbfa650905b6d6dfa8ecc2b404ffc466b4f1d34cfa8ea6879f9081a13d4a21cbf49c87ebb1826c2377c7a5094a3758d85
+  metadata.gz: 0e4bb2074cfea2e6cef066c7bc23b28c07d2dee537ebae03697328bde5dfa8ed012b8c4bab5ad3f52ad2a43781e9230937c9778f40e32a55baf5fd125fc8eede
+  data.tar.gz: cb09bd34a103015ad61d197989e31c7fa28df5e1199c10bf5b41e423a224d11b2b9f5e6063c07380d6617c1655ef266d3a8a3c4fbca8567ab0cc168b876f3a42

data/README.md

@@ -17,7 +17,12 @@ Rugged is a self-contained gem. You can install it by running:
 
     $ gem install rugged
 
-You need to have CMake installed on your system to be able to build the included version of `libgit2`. If you want to build Rugged with HTTPS and SSH support, check out the list of optional [libgit2 dependencies](https://github.com/libgit2/libgit2#optional-dependencies).
+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:
+```bash
+$ brew install cmake
+```
+
+If you want to build Rugged with HTTPS and SSH support, check out the list of optional [libgit2 dependencies](https://github.com/libgit2/libgit2#optional-dependencies).
 
 If you're using bundler and want to bundle `libgit2` with Rugged, you can use the `:submodules` option:
 
@@ -96,7 +101,7 @@ repo.bare?
 # => false
 repo.empty?
 # => true
-repo.head_orphan?
+repo.head_unborn?
 # => false
 repo.head_detached?
 # => false
@@ -109,13 +114,15 @@ repo.workdir
 
 # The HEAD of the repository.
 ref = repo.head
-# => #<Rugged::Reference:2228467240 {name: "refs/heads/master", target: "07b44cbda23b726e5d54e2ef383495922c024202"}>
+# => #<Rugged::Reference:2228467240 {name: "refs/heads/master", target:  #<Rugged::Commit:2228467250 {message: "helpful message", tree: #<Rugged::Tree:2228467260 {oid: 5d6f29220a0783b8085134df14ec4d960b6c3bf2}>}>
 
-# From the returned ref, you can also access the `name` and `target`:
+# From the returned ref, you can also access the `name`, `target`, and target SHA:
 ref.name
 # => "refs/heads/master"
 ref.target
-# => "07b44cbda23b726e5d54e2ef383495922c024202"
+# => #<Rugged::Commit:2228467250 {message: "helpful message", tree: #<Rugged::Tree:2228467260 {oid: 5d6f29220a0783b8085134df14ec4d960b6c3bf2}>}>
+ref.target_id
+# => "2bc6a70483369f33f641ca44873497f13a15cde5"
 
 # Reading an object
 object = repo.read('a0ae5566e3c8a3bddffab21022056f0b5e03ef07')

data/ext/rugged/extconf.rb

@@ -15,18 +15,10 @@ def sys(cmd)
   ret
 end
 
-if !find_executable('cmake')
-  abort "ERROR: CMake is required to build Rugged."
-end
-
 if !(MAKE = find_executable('gmake') || find_executable('make'))
   abort "ERROR: GNU make is required to build Rugged."
 end
 
-if !find_executable('pkg-config')
-  abort "ERROR: pkg-config is required to build Rugged."
-end
-
 if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES'])
   puts "Building Rugged using system libraries.\n"
 
@@ -40,6 +32,14 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES'])
 #endif
   SRC
 else
+  if !find_executable('cmake')
+    abort "ERROR: CMake is required to build Rugged."
+  end
+
+  if !find_executable('pkg-config')
+    abort "ERROR: pkg-config is required to build Rugged."
+  end
+
   CWD = File.expand_path(File.dirname(__FILE__))
   LIBGIT2_DIR = File.join(CWD, '..', '..', 'vendor', 'libgit2')
 
@@ -47,7 +47,7 @@ else
     Dir.mkdir("build") if !Dir.exists?("build")
 
     Dir.chdir("build") do
-      sys("cmake .. -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS=-fPIC -DCMAKE_BUILD_TYPE=RelWithDebInfo")
+      sys("cmake .. -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS=-fPIC -DCMAKE_BUILD_TYPE=RelWithDebInfo -G \"Unix Makefiles\"")
       sys(MAKE)
 
       pcfile = File.join(LIBGIT2_DIR, "build", "libgit2.pc")

data/ext/rugged/rugged.c

@@ -299,7 +299,7 @@ static VALUE rb_git_minimize_oid(int argc, VALUE *argv, VALUE self)
 static void cleanup_cb(void *unused)
 {
 	(void)unused;
-	git_threads_shutdown();
+	git_libgit2_shutdown();
 }
 
 void rugged_exception_raise(void)
@@ -446,6 +446,8 @@ void Init_rugged(void)
 	Init_rugged_remote_collection();
 	Init_rugged_notes();
 	Init_rugged_settings();
+	Init_rugged_submodule();
+	Init_rugged_submodule_collection();
 	Init_rugged_diff();
 	Init_rugged_patch();
 	Init_rugged_diff_delta();
@@ -484,7 +486,7 @@ void Init_rugged(void)
 	rb_define_const(rb_mRugged, "SORT_REVERSE", INT2FIX(GIT_SORT_REVERSE));
 
 	/* Initialize libgit2 */
-	git_threads_init();
+	git_libgit2_init();
 
 	/* Hook a global object to cleanup the library
 	 * on shutdown */

data/ext/rugged/rugged.h

@@ -65,6 +65,8 @@ void Init_rugged_remote(void);
 void Init_rugged_remote_collection(void);
 void Init_rugged_notes(void);
 void Init_rugged_settings(void);
+void Init_rugged_submodule(void);
+void Init_rugged_submodule_collection(void);
 void Init_rugged_diff(void);
 void Init_rugged_patch(void);
 void Init_rugged_diff_delta(void);
@@ -79,6 +81,7 @@ VALUE rugged_raw_read(git_repository *repo, const git_oid *oid);
 
 VALUE rugged_signature_new(const git_signature *sig, const char *encoding_name);
 
+VALUE rugged_repo_new(VALUE klass, git_repository *repo);
 VALUE rugged_index_new(VALUE klass, VALUE owner, git_index *index);
 VALUE rugged_config_new(VALUE klass, VALUE owner, git_config *cfg);
 VALUE rugged_object_new(VALUE owner, git_object *object);
@@ -117,13 +120,6 @@ static inline VALUE rugged_owner(VALUE object)
 	return rb_iv_get(object, "@owner");
 }
 
-static inline void rugged_validate_remote_url(VALUE rb_url)
-{
-	Check_Type(rb_url, T_STRING);
-	if (!git_remote_valid_url(StringValueCStr(rb_url)))
-		rb_raise(rb_eArgError, "Invalid URL format");
-}
-
 extern void rugged_exception_raise(void);
 
 static inline void rugged_exception_check(int errorcode)

data/ext/rugged/rugged_blob.c

@@ -24,6 +24,7 @@
 
 #include "rugged.h"
 #include <ctype.h>
+#include <git2/sys/hashsig.h>
 
 extern VALUE rb_mRugged;
 extern VALUE rb_cRuggedObject;
@@ -31,6 +32,7 @@ extern VALUE rb_cRuggedRepo;
 static ID id_read;
 
 VALUE rb_cRuggedBlob;
+VALUE rb_cRuggedBlobSig;
 
 /*
  *  call-seq:
@@ -520,6 +522,57 @@ static VALUE rb_git_blob_to_buffer(int argc, VALUE *argv, VALUE self)
 	return rb_ret;
 }
 
+static VALUE rb_git_blob_sig_new(int argc, VALUE *argv, VALUE klass)
+{
+	int error, opts = 0;
+	git_hashsig *sig;
+	VALUE rb_blob, rb_options;
+
+	if (rb_scan_args(argc, argv, "11", &rb_blob, &rb_options) == 2) {
+		Check_Type(rb_options, T_FIXNUM);
+		opts = FIX2INT(rb_options);
+	}
+
+	if (rb_obj_is_kind_of(rb_blob, rb_cRuggedBlob)) {
+		git_blob *blob;
+		Data_Get_Struct(rb_blob, git_blob, blob);
+
+		error = git_hashsig_create(&sig,
+				git_blob_rawcontent(blob),
+				git_blob_rawsize(blob),
+				opts);
+	} else {
+		Check_Type(rb_blob, T_STRING);
+		error = git_hashsig_create(&sig, RSTRING_PTR(rb_blob), RSTRING_LEN(rb_blob), opts);
+	}
+
+	rugged_exception_check(error);
+
+	return Data_Wrap_Struct(klass, NULL, &git_hashsig_free, sig);
+}
+
+static VALUE rb_git_blob_sig_compare(VALUE self, VALUE rb_sig_a, VALUE rb_sig_b)
+{
+	git_hashsig *sig_a;
+	git_hashsig *sig_b;
+	int result;
+
+	if (!rb_obj_is_kind_of(rb_sig_a, rb_cRuggedBlobSig) ||
+		!rb_obj_is_kind_of(rb_sig_b, rb_cRuggedBlobSig)) {
+		rb_raise(rb_eTypeError, "Expected Rugged::Blob::HashSignature");
+	}
+
+	Data_Get_Struct(rb_sig_a, git_hashsig, sig_a);
+	Data_Get_Struct(rb_sig_b, git_hashsig, sig_b);
+
+	result = git_hashsig_compare(sig_a, sig_b);
+
+	if (result < 0)
+		rugged_exception_check(result);
+
+	return INT2FIX(result);
+}
+
 void Init_rugged_blob(void)
 {
 	id_read = rb_intern("read");
@@ -539,4 +592,8 @@ void Init_rugged_blob(void)
 	rb_define_singleton_method(rb_cRuggedBlob, "from_io", rb_git_blob_from_io, -1);
 
 	rb_define_singleton_method(rb_cRuggedBlob, "to_buffer", rb_git_blob_to_buffer, -1);
+
+	rb_cRuggedBlobSig = rb_define_class_under(rb_cRuggedBlob, "HashSignature", rb_cObject);
+	rb_define_singleton_method(rb_cRuggedBlobSig, "new", rb_git_blob_sig_new, -1);
+	rb_define_singleton_method(rb_cRuggedBlobSig, "compare", rb_git_blob_sig_compare, 2);
 }

data/ext/rugged/rugged_cred.c

@@ -88,19 +88,42 @@ static void rugged_cred_extract_default(git_cred **cred, VALUE rb_credential)
 	rugged_exception_check(git_cred_default_new(cred));
 }
 
+static void rugged_cred_extract_username(git_cred **cred, VALUE rb_credential)
+{
+	VALUE rb_username = rb_iv_get(rb_credential, "@username");
+	Check_Type(rb_username, T_STRING);
+
+	rugged_exception_check(git_cred_username_new(cred, StringValueCStr(rb_username)));
+}
+
 void rugged_cred_extract(git_cred **cred, int allowed_types, VALUE rb_credential)
 {
 	if (rb_obj_is_kind_of(rb_credential, rb_cRuggedCredUserPassword)) {
+		if (allowed_types & GIT_CREDTYPE_USERNAME) {
+			rugged_cred_extract_username(cred, rb_credential);
+			return;
+		}
+
 		if (!(allowed_types & GIT_CREDTYPE_USERPASS_PLAINTEXT))
 			rb_raise(rb_eArgError, "Invalid credential type");
 
 		rugged_cred_extract_userpass(cred, rb_credential);
 	} else if (rb_obj_is_kind_of(rb_credential, rb_cRuggedCredSshKey)) {
+		if (allowed_types & GIT_CREDTYPE_USERNAME) {
+			rugged_cred_extract_username(cred, rb_credential);
+			return;
+		}
+
 		if (!(allowed_types & GIT_CREDTYPE_SSH_KEY))
 			rb_raise(rb_eArgError, "Invalid credential type");
 
 		rugged_cred_extract_ssh_key(cred, rb_credential);
 	} else if (rb_obj_is_kind_of(rb_credential, rb_cRuggedCredSshKeyFromAgent)) {
+		if (allowed_types & GIT_CREDTYPE_USERNAME) {
+			rugged_cred_extract_username(cred, rb_credential);
+			return;
+		}
+
 		if (!(allowed_types & GIT_CREDTYPE_SSH_KEY))
 			rb_raise(rb_eArgError, "Invalid credential type");
 

data/ext/rugged/rugged_index.c

@@ -681,6 +681,10 @@ static VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
 	Data_Get_Struct(self, git_index, index);
 	Data_Get_Struct(rb_tree, git_tree, tree);
 
+	if (!rb_obj_is_kind_of(rb_tree, rb_cRuggedTree)) {
+		rb_raise(rb_eTypeError, "A Rugged::Tree instance is required");
+	}
+
 	error = git_index_read_tree(index, tree);
 	rugged_exception_check(error);
 
@@ -752,7 +756,7 @@ static VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
  *  :recurse_untracked_dirs ::
  *    Even if +:include_untracked+ is true, untracked directories will only be
  *    marked with a single entry in the diff. If this flag is set to true,
- *    all files under ignored directories will be included in the di ff, too.
+ *    all files under ignored directories will be included in the diff, too.
  *
  *  :disable_pathspec_match ::
  *    If true, the given +:paths+ will be applied as exact matches, instead of
@@ -831,7 +835,7 @@ static VALUE rb_git_index_diff(int argc, VALUE *argv, VALUE self)
 	xfree(opts.pathspec.strings);
 	rugged_exception_check(error);
 
-	return rugged_diff_new(rb_cRuggedDiff, self, diff);
+	return rugged_diff_new(rb_cRuggedDiff, owner, diff);
 }
 
 /*

data/ext/rugged/rugged_remote.c

@@ -29,7 +29,7 @@ extern VALUE rb_cRuggedRepo;
 extern VALUE rb_eRuggedError;
 VALUE rb_cRuggedRemote;
 
-#define RUGGED_REMOTE_CALLBACKS_INIT {1, progress_cb, NULL, credentials_cb, transfer_progress_cb, update_tips_cb, NULL}
+#define RUGGED_REMOTE_CALLBACKS_INIT {1, progress_cb, NULL, credentials_cb, NULL, transfer_progress_cb, update_tips_cb, NULL}
 
 static int progress_cb(const char *str, int len, void *data)
 {
@@ -322,7 +322,7 @@ static VALUE rb_git_remote_set_url(VALUE self, VALUE rb_url)
 {
 	git_remote *remote;
 
-	rugged_validate_remote_url(rb_url);
+	Check_Type(rb_url, T_STRING);
 	Data_Get_Struct(self, git_remote, remote);
 
 	rugged_exception_check(
@@ -364,7 +364,7 @@ static VALUE rb_git_remote_set_push_url(VALUE self, VALUE rb_url)
 {
 	git_remote *remote;
 
-	rugged_validate_remote_url(rb_url);
+	Check_Type(rb_url, T_STRING);
 	Data_Get_Struct(self, git_remote, remote);
 
 	rugged_exception_check(
@@ -499,40 +499,69 @@ static VALUE rb_git_remote_save(VALUE self)
 
 /*
  *  call-seq:
- *    remote.rename!(new_name) -> array or nil
+ *    remote.check_connection(direction, options = {}) -> boolean
  *
- *  Renames a remote.
+ *  Try to connect to the +remote+. Useful to simulate
+ *  <tt>git fetch --dry-run</tt> and <tt>git push --dry-run</tt>.
  *
- *  All remote-tracking branches and configuration settings
- *  for the remote are updated.
+ *  Returns +true+ if connection is successful, +false+ otherwise.
  *
- *  Returns +nil+ if everything was updated or array of fetch refspecs
- *  that haven't been automatically updated and need potential manual
- *  tweaking.
+ *  +direction+ must be either +:fetch+ or +:push+.
  *
- *  Anonymous, in-memory remotes created through
- *  +ReferenceCollection#create_anonymous+ can not be given a name through
- *  this method.
+ *  The following options can be passed in the +options+ Hash:
  *
- *    remote = Rugged::Remote.lookup(@repo, 'origin')
- *    remote.rename!('upstream') #=> nil
+ *  +credentials+ ::
+ *    The credentials to use for the connection. Can be either an instance of
+ *    one of the Rugged::Credentials types, or a proc returning one of the
+ *    former.
+ *    The proc will be called with the +url+, the +username+ from the url (if
+ *    applicable) and a list of applicable credential types.
+ *
+ *  Example:
+ *
+ *    remote = repo.remotes["origin"]
+ *    success = remote.check_connection(:fetch)
+ *    raise Error("Unable to pull without credentials") unless success
  */
-static VALUE rb_git_remote_rename(VALUE self, VALUE rb_new_name)
+static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
 {
 	git_remote *remote;
-	git_strarray problems = {0};
-	VALUE rb_result;
+	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
+	struct rugged_remote_cb_payload payload = { Qnil, Qnil, Qnil, Qnil, Qnil, 0 };
+	VALUE rb_direction, rb_options;
+	ID id_direction;
+	int error, direction;
 
-	Check_Type(rb_new_name, T_STRING);
 	Data_Get_Struct(self, git_remote, remote);
-	
-	rugged_exception_check(
-		git_remote_rename(&problems, remote, StringValueCStr(rb_new_name))
-	);
+	rb_scan_args(argc, argv, "01:", &rb_direction, &rb_options);
+
+	Check_Type(rb_direction, T_SYMBOL);
+	id_direction = SYM2ID(rb_direction);
+	if (id_direction == rb_intern("fetch"))
+		direction = GIT_DIRECTION_FETCH;
+	else if (id_direction == rb_intern("push"))
+		direction = GIT_DIRECTION_PUSH;
+	else
+		rb_raise(rb_eTypeError, "Invalid direction. Expected :fetch or :push");
 
-	rb_result = problems.count == 0 ? Qnil : rugged_strarray_to_rb_ary(&problems);
-	git_strarray_free(&problems);
-	return rb_result;
+	if (!NIL_P(rb_options))
+		rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
+
+	if ((error = git_remote_set_callbacks(remote, &callbacks)) < 0)
+		goto cleanup;
+
+	if (git_remote_connect(remote, direction))
+		return Qfalse;
+	else {
+		git_remote_disconnect(remote);
+		return Qtrue;
+	}
+
+cleanup:
+	if (payload.exception)
+		rb_jump_tag(payload.exception);
+	rugged_exception_check(error);
+	return Qfalse;
 }
 
 /*
@@ -541,7 +570,7 @@ static VALUE rb_git_remote_rename(VALUE self, VALUE rb_new_name)
  *
  *  Downloads new data from the remote for the given +refspecs+ and updates tips.
  *
- *  You can optionally pass in an alternative list of +refspecs+ to use instead of the fetch
+ *  You can optionally pass in a single or multiple alternative +refspecs+ to use instead of the fetch
  *  refspecs already configured for +remote+.
  *
  *  Returns a hash containing statistics for the fetch operation.
@@ -584,26 +613,21 @@ static VALUE rb_git_remote_rename(VALUE self, VALUE rb_new_name)
  */
 static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 {
-	git_remote *remote, *tmp_remote = NULL;
+	git_remote *remote;
 	git_repository *repo;
 	git_signature *signature = NULL;
+	git_strarray refspecs;
 	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
 	struct rugged_remote_cb_payload payload = { Qnil, Qnil, Qnil, Qnil, Qnil, 0 };
 
 	char *log_message = NULL;
-	int error, i;
+	int error;
 
 	VALUE rb_options, rb_refspecs, rb_result = Qnil, rb_repo = rugged_owner(self);
 
 	rb_scan_args(argc, argv, "01:", &rb_refspecs, &rb_options);
 
-	if (!NIL_P(rb_refspecs)) {
-		Check_Type(rb_refspecs, T_ARRAY);
-		for (i = 0; i < RARRAY_LEN(rb_refspecs); ++i) {
-			VALUE rb_refspec = rb_ary_entry(rb_refspecs, i);
-			Check_Type(rb_refspec, T_STRING);
-		}
-	}
+	rugged_rb_ary_to_strarray(rb_refspecs, &refspecs);
 
 	Data_Get_Struct(self, git_remote, remote);
 	rugged_check_repo(rb_repo);
@@ -621,22 +645,11 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 		rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 	}
 
-	if ((error = git_remote_dup(&tmp_remote, remote)) ||
-		(error = git_remote_set_callbacks(tmp_remote, &callbacks)))
+	if ((error = git_remote_set_callbacks(remote, &callbacks)))
 		goto cleanup;
 
-	if (!NIL_P(rb_refspecs)) {
-		git_remote_clear_refspecs(tmp_remote);
-		for (i = 0; !error && i < RARRAY_LEN(rb_refspecs); ++i) {
-			VALUE rb_refspec = rb_ary_entry(rb_refspecs, i);
-
-			if ((error = git_remote_add_fetch(tmp_remote, StringValueCStr(rb_refspec))))
-				goto cleanup;
-		}
-	}
-
-	if ((error = git_remote_fetch(tmp_remote, signature, log_message)) == GIT_OK) {
-		const git_transfer_progress *stats = git_remote_stats(tmp_remote);
+	if ((error = git_remote_fetch(remote, &refspecs, signature, log_message)) == GIT_OK) {
+		const git_transfer_progress *stats = git_remote_stats(remote);
 
 		rb_result = rb_hash_new();
 		rb_hash_aset(rb_result, CSTR2SYM("total_objects"),    UINT2NUM(stats->total_objects));
@@ -650,8 +663,8 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 
 	cleanup:
 
+	xfree(refspecs.strings);
 	git_signature_free(signature);
-	git_remote_free(tmp_remote);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);
@@ -827,9 +840,9 @@ void Init_rugged_remote(void)
 	rb_define_method(rb_cRuggedRemote, "add_fetch", rb_git_remote_add_fetch, 1);
 	rb_define_method(rb_cRuggedRemote, "add_push", rb_git_remote_add_push, 1);
 	rb_define_method(rb_cRuggedRemote, "ls", rb_git_remote_ls, -1);
+	rb_define_method(rb_cRuggedRemote, "check_connection", rb_git_remote_check_connection, -1);
 	rb_define_method(rb_cRuggedRemote, "fetch", rb_git_remote_fetch, -1);
 	rb_define_method(rb_cRuggedRemote, "push", rb_git_remote_push, -1);
 	rb_define_method(rb_cRuggedRemote, "clear_refspecs", rb_git_remote_clear_refspecs, 0);
 	rb_define_method(rb_cRuggedRemote, "save", rb_git_remote_save, 0);
-	rb_define_method(rb_cRuggedRemote, "rename!", rb_git_remote_rename, 1);
 }