rugged 0.22.0b1 → 0.22.0b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aa39e21ccc3e603f31e60c998ccc0c71980ba60
-  data.tar.gz: fff10f16bf3d155d9851ea92cbfa49b2f30e8dda
+  metadata.gz: a1fcbe10398bb6a72a8b366a061a86dc86a22d86
+  data.tar.gz: 6d0ab2ee6aa49b3d0d6e7f9c2f5c7ee18f01e820
 SHA512:
-  metadata.gz: 0e4bb2074cfea2e6cef066c7bc23b28c07d2dee537ebae03697328bde5dfa8ed012b8c4bab5ad3f52ad2a43781e9230937c9778f40e32a55baf5fd125fc8eede
-  data.tar.gz: cb09bd34a103015ad61d197989e31c7fa28df5e1199c10bf5b41e423a224d11b2b9f5e6063c07380d6617c1655ef266d3a8a3c4fbca8567ab0cc168b876f3a42
+  metadata.gz: 47f0d46dbfb6a493678c7c0fffc12d25ffadabc3b8210920a2f509556e2504b48de4223db27488e70a78da1d2bbf6d440dfe15b3992ff7a2ded9bdebf5219d3b
+  data.tar.gz: 2c83e8937a0bda990da855f793901299269ea2cf174c2e7f7501795c7f3a7377b37b60fe555a453963206d93c4c035fe24c9ee02afcd084d101e484426b35030

data/ext/rugged/rugged_blob.c

@@ -32,6 +32,7 @@ extern VALUE rb_cRuggedRepo;
 static ID id_read;
 
 VALUE rb_cRuggedBlob;
+VALUE rb_cRuggedBlobLoader;
 VALUE rb_cRuggedBlobSig;
 
 /*
@@ -479,46 +480,75 @@ static VALUE rb_git_blob_diff(int argc, VALUE *argv, VALUE self)
 	return rugged_patch_new(self, patch);
 }
 
-static VALUE rb_git_blob_to_buffer(int argc, VALUE *argv, VALUE self)
+/*
+ *  call-seq:
+ *    Rugged::Blob::Loader.new(repository, max_size) -> Blob::Loader instance
+ *
+ *	Create a Blob Loader instance that allows you to bring several blobs
+ *	from the object database with no extra memory cost by reusing the same
+ *	underlying storage.
+ *
+ *	repository - the repo where the blobs will be loaded from
+ *	max_size - the maximum size for the underlying storage; blobs larger than
+ *	that size will be truncated
+ *
+ *	Example:
+ *
+ *		loader = loader = Rugged::Blob::Loader.new(@repo, 4 * 1024)
+ *		#=> Blob::Loader instance
+ *
+ *		loader.load("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
+ *		#=> [contents, real_size]
+ */
+static VALUE rb_git_blob_loader_new(VALUE self, VALUE rb_repo, VALUE rb_max_bytes)
 {
-	VALUE rb_repo, rb_sha1, rb_max_bytes;
-	VALUE rb_ret;
+	long max_bytes;
+
+	rugged_check_repo(rb_repo);
+	Check_Type(rb_max_bytes, T_FIXNUM);
+
+	/* extra byte for NULL-termination */
+	max_bytes = (long)FIX2INT(rb_max_bytes) + 1;
+
+	rb_iv_set(self, "@repository", rb_repo);
+	rb_iv_set(self, "buffer", rb_str_buf_new(max_bytes));
+	return Qnil;
+}
+
+static VALUE rb_git_blob_loader_load(VALUE self, VALUE rb_sha1)
+{
+	VALUE rb_ret, rb_repo, rb_buffer;
 
 	git_repository *repo = NULL;
 	git_blob *blob = NULL;
 
-	size_t size;
+	size_t size, capacity;
 	const char *content;
 
-	rb_scan_args(argc, argv, "21", &rb_repo, &rb_sha1, &rb_max_bytes);
+	rb_repo = rb_iv_get(self, "@repository");
+	rb_buffer = rb_iv_get(self, "buffer");
 
+	Check_Type(rb_buffer, T_STRING);
 	rugged_check_repo(rb_repo);
 	Data_Get_Struct(rb_repo, git_repository, repo);
 
 	blob = (git_blob *)rugged_object_get(repo, rb_sha1, GIT_OBJ_BLOB);
 
 	content = git_blob_rawcontent(blob);
-	size = git_blob_rawsize(blob);
+	size = (long)git_blob_rawsize(blob);
+	capacity = rb_str_capacity(rb_buffer);
 
-	if (!NIL_P(rb_max_bytes)) {
-		int maxbytes;
+	if (size > capacity - 1)
+		size = capacity - 1;
 
-		Check_Type(rb_max_bytes, T_FIXNUM);
-		maxbytes = FIX2INT(rb_max_bytes);
-
-		if (maxbytes >= 0 && (size_t)maxbytes < size)
-			size = (size_t)maxbytes;
-	}
+	memcpy(RSTRING_PTR(rb_buffer), content, size);
+	rb_str_set_len(rb_buffer, size);
 
 	rb_ret = rb_ary_new();
-
-	rb_ary_push(rb_ret, rb_str_new(content, size));
+	rb_ary_push(rb_ret, rb_buffer);
 	rb_ary_push(rb_ret, INT2FIX(git_blob_rawsize(blob)));
 
 	git_object_free((git_object*)blob);
-
-	/* TODO: LOC */
-
 	return rb_ret;
 }
 
@@ -591,9 +621,11 @@ void Init_rugged_blob(void)
 	rb_define_singleton_method(rb_cRuggedBlob, "from_disk", rb_git_blob_from_disk, 2);
 	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);
+
+	rb_cRuggedBlobLoader = rb_define_class_under(rb_cRuggedBlob, "Loader", rb_cObject);
+	rb_define_method(rb_cRuggedBlobLoader, "initialize", rb_git_blob_loader_new, 2);
+	rb_define_method(rb_cRuggedBlobLoader, "load", rb_git_blob_loader_load, 1);
 }

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.22.0b1'
+  Version = VERSION = '0.22.0b2'
 end

data/vendor/libgit2/include/git2/remote.h

@@ -14,6 +14,7 @@
 #include "indexer.h"
 #include "strarray.h"
 #include "transport.h"
+#include "push.h"
 
 /**
  * @file git2/remote.h
@@ -280,14 +281,19 @@ GIT_EXTERN(const git_refspec *)git_remote_get_refspec(const git_remote *remote,
 GIT_EXTERN(int) git_remote_connect(git_remote *remote, git_direction direction);
 
 /**
- * Get a list of refs at the remote
+ * Get the remote repository's reference advertisement list
  *
- * The remote (or more exactly its transport) must be connected. The
- * memory belongs to the remote.
+ * Get the list of references with which the server responds to a new
+ * connection.
  *
- * The array will stay valid as long as the remote object exists and
- * its transport isn't changed, but a copy is recommended for usage of
- * the data.
+ * The remote (or more exactly its transport) must have connected to
+ * the remote repository. This list is available as soon as the
+ * connection to the remote is initiated and it remains available
+ * after disconnecting.
+ *
+ * The memory belongs to the remote. The pointer will be valid as long
+ * as a new connection is not initiated, but it is recommended that
+ * you make a copy in order to make use of the data.
  *
  * @param out pointer to the array
  * @param size the number of remote heads
@@ -337,8 +343,7 @@ GIT_EXTERN(void) git_remote_stop(git_remote *remote);
 /**
  * Disconnect from the remote
  *
- * Close the connection to the remote and free the underlying
- * transport.
+ * Close the connection to the remote.
  *
  * @param remote the remote to disconnect from
  */
@@ -389,6 +394,23 @@ GIT_EXTERN(int) git_remote_fetch(
 		const git_signature *signature,
 		const char *reflog_message);
 
+/**
+ * Perform a push
+ *
+ * Peform all the steps from a push.
+ *
+ * @param remote the remote to push to
+ * @param refspecs the refspecs to use for pushing. If none are
+ * passed, the configured refspecs will be used
+ * @param opts the options
+ * @param signature signature to use for the reflog of updated references
+ * @param reflog_message message to use for the reflog of upated references
+ */
+GIT_EXTERN(int) git_remote_push(git_remote *remote,
+				git_strarray *refspecs,
+				const git_push_options *opts,
+				const git_signature *signature, const char *reflog_message);
+
 /**
  * Get a list of the configured remotes for a repo
  *
@@ -461,6 +483,28 @@ struct git_remote_callbacks {
 	 */
 	int (*update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data);
 
+	/**
+	 * Function to call with progress information during pack
+	 * building. Be aware that this is called inline with pack
+	 * building operations, so performance may be affected.
+	 */
+	git_packbuilder_progress pack_progress;
+
+	/**
+	 * Function to call with progress information during the
+	 * upload portion of a push. Be aware that this is called
+	 * inline with pack building operations, so performance may be
+	 * affected.
+	 */
+	git_push_transfer_progress push_transfer_progress;
+
+	/**
+	 * Called for each updated reference on push. If `status` is
+	 * not `NULL`, the update was rejected by the remote server
+	 * and `status` contains the reason given.
+	 */
+	int (*push_update_reference)(const char *refname, const char *status, void *data);
+
 	/**
 	 * This will be passed to each of the callbacks in this struct
 	 * as the last parameter.

data/vendor/libgit2/src/odb.c

@@ -762,12 +762,12 @@ static int hardcoded_objects(git_rawobj *raw, const git_oid *id)
 	if (!git_oid_cmp(id, &empty_blob)) {
 		raw->type = GIT_OBJ_BLOB;
 		raw->len = 0;
-		raw->data = NULL;
+		raw->data = git__calloc(1, sizeof(uint8_t));
 		return 0;
 	} else if (!git_oid_cmp(id, &empty_tree)) {
 		raw->type = GIT_OBJ_TREE;
 		raw->len = 0;
-		raw->data = NULL;
+		raw->data = git__calloc(1, sizeof(uint8_t));
 		return 0;
 	} else {
 		return GIT_ENOTFOUND;

data/vendor/libgit2/src/push.c

@@ -333,7 +333,8 @@ static int revwalk(git_vector *commits, git_push *push)
 				continue;
 
 			if (!git_odb_exists(push->repo->_odb, &spec->roid)) {
-				giterr_set(GITERR_REFERENCE, "Cannot push missing reference");
+				giterr_set(GITERR_REFERENCE, 
+					"Cannot push because a reference that you are trying to update on the remote contains commits that are not present locally.");
 				error = GIT_ENONFASTFORWARD;
 				goto on_error;
 			}

data/vendor/libgit2/src/remote.c

@@ -706,7 +706,7 @@ int git_remote_ls(const git_remote_head ***out, size_t *size, git_remote *remote
 	assert(remote);
 
 	if (!remote->transport) {
-		giterr_set(GITERR_NET, "No transport bound to this remote");
+		giterr_set(GITERR_NET, "this remote has never connected");
 		return -1;
 	}
 
@@ -2115,3 +2115,63 @@ int git_remote_default_branch(git_buf *out, git_remote *remote)
 
 	return git_buf_puts(out, guess->name);
 }
+
+int git_remote_push(git_remote *remote, git_strarray *refspecs, const git_push_options *opts,
+		    const git_signature *signature, const char *reflog_message)
+{
+	int error;
+	size_t i;
+	git_push *push = NULL;
+	git_remote_callbacks *cbs;
+	git_refspec *spec;
+
+	assert(remote && refspecs);
+
+	if ((error = git_remote_connect(remote, GIT_DIRECTION_PUSH)) < 0)
+		return error;
+
+	if ((error = git_push_new(&push, remote)) < 0)
+		goto cleanup;
+
+	if (opts && (error = git_push_set_options(push, opts)) < 0)
+		goto cleanup;
+
+	if (refspecs && refspecs->count > 0) {
+		for (i = 0; i < refspecs->count; i++) {
+			if ((error = git_push_add_refspec(push, refspecs->strings[i])) < 0)
+				goto cleanup;
+		}
+	} else {
+		git_vector_foreach(&remote->refspecs, i, spec) {
+			if (!spec->push)
+				continue;
+			if ((error = git_push_add_refspec(push, spec->string)) < 0)
+				goto cleanup;
+		}
+	}
+
+	cbs = &remote->callbacks;
+	if ((error = git_push_set_callbacks(push,
+					    cbs->pack_progress, cbs->payload,
+					    cbs->push_transfer_progress, cbs->payload)) < 0)
+		goto cleanup;
+
+	if ((error = git_push_finish(push)) < 0)
+		goto cleanup;
+
+	if (!git_push_unpack_ok(push)) {
+		error = -1;
+		giterr_set(GITERR_NET, "error in the remote while trying to unpack");
+		goto cleanup;
+	}
+
+	if ((error = git_push_status_foreach(push, cbs->push_update_reference, cbs->payload)) < 0)
+		goto cleanup;
+
+	error = git_push_update_tips(push, signature, reflog_message);
+
+cleanup:
+	git_remote_disconnect(remote);
+	git_push_free(push);
+	return error;
+}

data/vendor/libgit2/src/transports/http.c

@@ -1009,6 +1009,7 @@ static int http_close(git_smart_subtransport *subtransport)
 	git_vector_clear(&t->auth_contexts);
 
 	gitno_connection_data_free_ptrs(&t->connection_data);
+	memset(&t->connection_data, 0x0, sizeof(gitno_connection_data));
 
 	return 0;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.22.0b1
+  version: 0.22.0b2
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler