Added all test files and did some refactoring

nodegit · tbranyen · Jul 12, 2014 · Jul 4, 2014 · Jul 4, 2014 · Jul 4, 2014
commit 9ea39f6942999795c5cb645a65941a086380a693
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -227,7 +227,7 @@
         "isConstructorMethod": true,
         "args": [
           { "isReturn": true },
-          { "isSelf": true },
+          { "isSelf": false },
           {},
           {},
           { "isOptional": true }

diff --git a/lib/commit.js b/lib/commit.js
@@ -32,8 +32,8 @@ Commit.prototype.date = function() {
  * Get the tree associated with this commit.
  * @return {Tree}
  */
-Commit.prototype.getTree = function(callback) {
-  return this.repo.getTree(this.treeId(), callback);
+Commit.prototype.getTree = function() {
+  return this.repo.getTree(this.treeId());
 };
 
 /**
@@ -44,16 +44,12 @@ Commit.prototype.getTree = function(callback) {
  * @param {Function} callback
  * @return {TreeEntry}
  */
-Commit.prototype.getEntry = function(path, callback) {
+Commit.prototype.getEntry = function(path) {
   return this.getTree().then(function(tree) {
     return tree.getEntry(path).then(function(entry) {
-      if (callback) {
-        callback(entry);
-      }
-
       return entry;
     });
-  }, callback);
+  });
 };
 
 /**
@@ -172,19 +168,21 @@ Commit.prototype.getDiff = function(callback) {
   var commit = this;
 
   return commit.getParents().then(function(parents) {
-    return parents.map(function(parent) {
-      return parent.getTree(function(parentTree) {
-        return commit.getTree(function(thisTree) {
+    var diffs = parents.map(function(parent) {
+      return parent.getTree().then(function(parentTree) {
+        return commit.getTree().then(function(thisTree) {
           return parentTree.diff(thisTree);
         });
       });
     });
-  }).then(function(parentDiffs) {
+
+    return Promise.all(diffs);
+  }).then(function(diffs) {
     if (callback) {
-      callback(null, parentDiffs);
+      callback(null, diffs);
     }
 
-    return parentDiffs;
+    return diffs;
   }, callback);
 };
 

diff --git a/lib/diff.js b/lib/diff.js
@@ -54,9 +54,11 @@ Diff.LineOrigin = {
 Diff.prototype.patches = function() {
   var size = this.size();
   var result = [];
+
   for (var i = 0; i < size; i++) {
     result.push(new ConvenientPatch(this.getDelta(i), Patch.fromDiff(this, i)));
   }
+
   return result;
 };
 

diff --git a/lib/nodegit.js b/lib/nodegit.js
@@ -12,26 +12,6 @@ catch (e) {
   rawApi = require("../build/Debug/nodegit");
 }
 
-// Set the exports prototype to the raw API.
-exports.__proto__ = rawApi;
-
-// Import extensions
-require("./commit.js");
-require("./diff.js");
-require("./blob.js");
-require("./object.js");
-require("./signature.js");
-require("./odb.js");
-require("./oid.js");
-require("./index.js");
-require("./repository.js");
-require("./reference.js");
-require("./revwalk.js");
-require("./tree.js");
-
-// Wrap asynchronous methods to return promises.
-promisify(exports);
-
 // Native methods do not return an identifiable function, so this function will
 // filter down the function identity to match the libgit2 descriptor.
 descriptors.forEach(function(descriptor) {
@@ -55,6 +35,26 @@ descriptors.forEach(function(descriptor) {
   });
 });
 
+// Set the exports prototype to the raw API.
+exports.__proto__ = rawApi;
+
+// Import extensions
+require("./commit.js");
+require("./diff.js");
+require("./blob.js");
+require("./object.js");
+require("./signature.js");
+require("./odb.js");
+require("./oid.js");
+require("./index.js");
+require("./repository.js");
+require("./refs.js");
+require("./revwalk.js");
+require("./tree.js");
+
+// Wrap asynchronous methods to return promises.
+promisify(exports);
+
 // Set version.
 exports.version = require("../package").version;
 

diff --git a/lib/reference.js → lib/refs.js b/lib/reference.js → lib/refs.js
diff --git a/lib/repository.js b/lib/repository.js
@@ -2,7 +2,7 @@ var NodeGit = require("../");
 var normalizeOid = require("./util/normalize_oid");
 var Blob = require("./blob");
 var Tree = require("./tree");
-var Reference = require("./reference");
+var Reference = require("./refs");
 var Revwalk = require("./revwalk");
 var Commit = require("./commit");
 
@@ -122,7 +122,6 @@ Repository.prototype.getTree = function(oid, callback) {
 
   var repository = this;
 
-
   return Tree.lookup(repository, oid).then(function(tree) {
     tree.repo = repository;
 

diff --git a/lib/revwalk.js b/lib/revwalk.js
@@ -1,17 +1,18 @@
-var git = require("../");
-var util = require("./util");
-var Revwalk = git.Revwalk;
+var NodeGit = require("../");
+var normalizeOid = require("./util/normalize_oid");
+
+var Revwalk = NodeGit.Revwalk;
 
 // Backwards compatibility.
-Object.defineProperty(git, "RevWalk", {
+Object.defineProperty(NodeGit, "RevWalk", {
   value: Revwalk,
   enumerable: false
 });
 
 var oldSorting = Revwalk.prototype.sorting;
 
 /**
- * Refer to vendor/libgit2/include/git2/revwalk.h for sort definitions.
+ * Refer to vendor/libNodeGit2/include/NodeGit2/revwalk.h for sort definitions.
  */
 Revwalk.Sort = {
   None: 0,
@@ -22,7 +23,7 @@ Revwalk.Sort = {
 
 /**
  * Set the sort order for the revwalk. This function takes variable arguments
- * like `revwalk.sorting(git.RevWalk.Topological, git.RevWalk.Reverse).`
+ * like `revwalk.sorting(NodeGit.RevWalk.Topological, NodeGit.RevWalk.Reverse).`
  *
  * @param {Number} sort
  */
@@ -45,6 +46,8 @@ Revwalk.prototype.sorting = function() {
  * @return {Commit}
  */
 Revwalk.prototype.walk = function(oid, callback) {
+  oid = normalizeOid(oid);
+
   var self = this;
 
   this.push(oid);
@@ -73,7 +76,4 @@ Revwalk.prototype.walk = function(oid, callback) {
   walk();
 };
 
-util.normalizeOid(Revwalk.prototype, "walk");
-util.makeSafe(Revwalk.prototype, "walk");
-
 module.exports = Revwalk;
diff --git a/lib/tree.js b/lib/tree.js
@@ -24,7 +24,7 @@ Object.defineProperties(Tree.prototype, {
  * @return {DiffList}
  */
 Tree.prototype.diff = function(tree, callback) {
-  return Diff.treeToTree.call(this.repo, tree, this, null, callback);
+  return Diff.treeToTree(this.repo, tree, this, null).then(null, callback);
 };
 
 /**

diff --git a/lib/util.js b/lib/util.js
diff --git a/test/commit.js b/test/commit.js
diff --git a/test/diff.js b/test/diff.js
diff --git a/test/nodegit.js b/test/nodegit.js
diff --git a/test/oid.js b/test/oid.js
diff --git a/test/reference.js b/test/reference.js
diff --git a/test/revwalk.js b/test/revwalk.js
diff --git a/test/tests/convenient_hunk.js b/test/tests/convenient_hunk.js
diff --git a/test/tests/convenient_patch.js b/test/tests/convenient_patch.js