Added some convenience methods for remotes

John Haley · maxkorp · commit 43762f9edd3c · 2014-12-01T14:49:50.000-07:00
diff --git a/example/details-for-tree-entry.js b/example/details-for-tree-entry.js
@@ -7,8 +7,7 @@ var path = require('path');
 
 nodegit.Repository.open(path.resolve(__dirname, '../.git'))
 .then(function(repo) {
-  return repo.getTree(
-    nodegit.Oid.fromString("e1b0c7ea57bfc5e30ec279402a98168a27838ac9"))
+  return repo.getTree("e1b0c7ea57bfc5e30ec279402a98168a27838ac9")
   .then(function(tree) {
     var treeEntry = tree.entryByIndex(0);
 
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -1068,6 +1068,13 @@
         "git_remote_default_branch": {
           "ignore": true
         },
+        "git_remote_fetch": {
+          "args": {
+            "reflog_message": {
+              "isOptional": true
+            }
+          }
+        },
         "git_remote_get_fetch_refspecs": {
           "ignore": true
         },
@@ -1156,6 +1163,9 @@
     },
 	  "signature": {
 	    "functions": {
+        "git_signature_default": {
+          "isAsync": false
+        },
 	      "git_signature_new": {
 	        "isAsync": false
 	      },
diff --git a/lib/repository.js b/lib/repository.js
@@ -92,22 +92,6 @@ Repository.prototype.getBranchCommit = function(name, callback) {
   }, callback);
 };
 
-/**
- * Lists out the remotes in the given repository.
- *
- * @param {Function} Optional callback
- * @return {Object} Promise object.
- */
-Repository.prototype.getRemotes = function(callback) {
-  return Remote.list(this).then(function(remotes) {
-    if (typeof callback === "function") {
-      callback(null, remotes);
-    }
-
-    return remotes;
-  }, callback);
-};
-
 /**
  * Lookup the reference with the given name.
  *
@@ -425,9 +409,10 @@ Repository.prototype.createCommitOnHead = function(
         committer,
         message,
         treeOid,
-        [parent]);
+        [parent],
+        callback);
     });
-  });
+  }, callback);
 };
 
 /**
@@ -455,4 +440,85 @@ Repository.prototype.treeBuilder = function() {
   return builder;
 };
 
+/**
+ * Gets the default signature for the default user and now timestamp
+ * @return {Signature}
+ */
+Repository.prototype.defaultSignature = function() {
+  return NodeGit.Signature.default(this);
+};
+
+/**
+* Lists out the remotes in the given repository.
+*
+* @param {Function} Optional callback
+* @return {Object} Promise object.
+*/
+Repository.prototype.getRemotes = function(callback) {
+  return Remote.list(this).then(function(remotes) {
+    if (typeof callback === "function") {
+      callback(null, remotes);
+    }
+
+    return remotes;
+  }, callback);
+};
+
+/**
+ * Gets a remote from the repo
+ *
+ * @param {String|Remote} remote
+ * @param {Function} callback
+ * @return {Remote} The remote object
+ */
+Repository.prototype.getRemote = function(remote, callback) {
+  if (remote instanceof NodeGit.Remote) {
+    return Promise.resolve(remote).then(function(remoteObj) {
+      if (typeof callback === "function") {
+        callback(null, remoteObj);
+      }
+
+      return remoteObj;
+    }, callback);
+  }
+
+  return NodeGit.Remote.load(this, remote).then(function(remoteObj) {
+    if (typeof callback === "function") {
+      callback(null, remoteObj);
+    }
+
+    return remoteObj;
+  }, callback);
+};
+
+/**
+ * Fetches from a remote
+ *
+ * @param {String|Remote} remote
+ */
+Repository.prototype.fetch = function(remote) {
+  var repo = this;
+
+  return repo.getRemote(remote).then(function(remote) {
+    return remote.fetch(repo.defaultSignature());
+  });
+};
+
+/**
+ * Fetches from all remotes
+ */
+Repository.prototype.fetchAll = function() {
+  var repo = this;
+
+  return repo.getRemotes(function(remotes) {
+    var fetchPromises = [];
+
+    remotes.forEach(function(remote) {
+      fetchPromises.push(repo.fetch(remote));
+    });
+
+    return Promise.all(fetchPromises);
+  });
+};
+
 module.exports = Repository;
diff --git a/package.json b/package.json
@@ -86,6 +86,7 @@
     "lint": "jshint lib test/tests",
     "cov": "node test",
     "mocha": "mocha test/runner test/tests",
+    "mochaDebug": "mocha --debug-brk test/runner test/tests",
     "test": "npm run lint && npm run cov",
     "generateJson": "node generate/scripts/generateJson",
     "generateNativeCode": "node generate/scripts/generateNativeCode",
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -88,7 +88,7 @@ describe("Remote", function() {
     });
   });
 
-  it("can fetch from a remote", function() {
+  it("can download from a remote", function() {
     var repo = this.repository;
 
     return Remote.load(repo, "origin")
@@ -102,4 +102,13 @@ describe("Remote", function() {
       assert(false);
     });
   });
+
+  it("can fetch from a remote", function() {
+    return this.repository.fetch("origin")
+    .then(function() {
+      assert(true);
+    }, function() {
+      assert(false);
+    });
+  });
 });
