Renamed index->nodegit, fixed signature issue.

tbranyen · tbranyen · commit 331cd65bcfcc · 2014-06-29T13:08:27.000-04:00
- Missing `dup` property in the `return` for the `git_commit_author` method.
- Renamed index.js -&gt; nodegit.js for consistency.
diff --git a/binding.gyp b/binding.gyp
@@ -9,14 +9,16 @@
 
       "sources": [
         # Maintained.
-        "src/base.cc",
+        "src/nodegit.cc",
         "src/wrapper.cc",
         "src/functions/copy.cc",
 
         # Generated files.
         "src/blob.cc",
+        "src/clone.cc",
         "src/commit.cc",
         "src/config.cc",
+        #"src/diff.cc",
         "src/index.cc",
         "src/object.cc",
         "src/odb.cc",
@@ -30,6 +32,7 @@
         "src/time.cc",
         "src/trace.cc",
         "src/tree.cc",
+        "src/treebuilder.cc",
         "src/tree_entry.cc",
       ],
 
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -53,7 +53,7 @@
   },
 
   "clone": {
-    "ignore": true,
+    "ignore": false,
     "cType": null
   },
 
@@ -90,12 +90,18 @@
 
       "git_commit_author": {
         "ignore": false,
-        "args": [{ "isSelf": true }]
+        "args": [{ "isSelf": true }],
+        "return": {
+          "copy": "git_signature_dup"
+        }
       },
 
       "git_commit_committer": {
         "ignore": false,
-        "args": [{ "isSelf": true }]
+        "args": [{ "isSelf": true }],
+        "return": {
+          "copy": "git_signature_dup"
+        }
       },
 
       "git_commit_parentcount": {
@@ -139,6 +145,44 @@
     }
   },
 
+  "diff_options": {
+    "ignore": false,
+
+    "isStruct": true,
+    "cType": "git_diff_options",
+
+    "dependencies": [
+      "../include/diff.h",
+      "../include/types.h"
+    ],
+
+    "fields": [
+      {
+        "name": "filename",
+        "structType": "char",
+        "structName": "filename[1]",
+        "cType": "char *"
+      }, {
+        "name": "attr",
+        "cType": "uint16_t"
+      },
+      {
+        "name": "oid",
+        "cType": "git_oid"
+      },
+      {
+        "name": "filename_len",
+        "cType": "size_t"
+      },
+      {
+        "name": "filename",
+        "structType": "char",
+        "structName": "filename[1]",
+        "cType": "char *"
+      }
+    ]
+  },
+
   "errors": {
     "ignore": true,
     "cType": null
@@ -277,7 +321,7 @@
   },
 
   "remote": {
-    "ignore": true
+    "ignore": false
   },
 
   "repository": {
@@ -360,6 +404,16 @@
       "../include/time.h"
     ],
 
+    "functions": {
+      "git_signature_new": {
+        "ignore": false,
+        "isAsync": false,
+        "isConstructorMethod": true,
+        "jsFunctionName": "create",
+        "cppFunctionName": "Create"
+      }
+    },
+
     "fields": [
       {
         "name": "name",
@@ -438,7 +492,7 @@
   },
 
   "transport": {
-    "ignore": true
+    "ignore": false
   },
 
   "tree": {
diff --git a/generate/types.json b/generate/types.json
@@ -616,8 +616,8 @@
     "js": "blobs"
   },
   "const git_diff_options *": {
-    "js": "DiffOptions",
-    "cpp": "GitDiffOptions"
+    "cpp": "GitDiffOptions",
+    "js": "DiffOptions"
   },
   "git_diff_blob_to_buffer": {
     "cpp": "BlobToBuffer",
@@ -2137,8 +2137,8 @@
     "js": "repository"
   },
   "git_signature_new": {
-    "cpp": "New2",
-    "js": "new2"
+    "cpp": "Create",
+    "js": "create"
   },
   "git_signature **": {
     "cpp": "GitSignature",
@@ -7493,12 +7493,12 @@
     "js": "Signature"
   },
   "git_signature_new *": {
-    "cpp": "New2",
-    "js": "new2"
+    "cpp": "Create",
+    "js": "create"
   },
   "const git_signature_new *": {
-    "cpp": "New2",
-    "js": "new2"
+    "cpp": "Create",
+    "js": "create"
   },
   "git_signature_now *": {
     "cpp": "Now",
@@ -8967,5 +8967,21 @@
   "const git_reference__alloc_symbolic *": {
     "cpp": "AllocSymbolic",
     "js": "allocSymbolic"
+  },
+  "git_diff_options": {
+    "cpp": "GitDiffOptions",
+    "js": "DiffOptions"
+  },
+  "git_diff_options **": {
+    "cpp": "GitDiffOptions",
+    "js": "DiffOptions"
+  },
+  "git_diff_options *": {
+    "cpp": "GitDiffOptions",
+    "js": "DiffOptions"
+  },
+  "const git_diff_options **": {
+    "cpp": "GitDiffOptions",
+    "js": "DiffOptions"
   }
 }
diff --git a/index.js b/index.js
diff --git a/lib/nodegit.js b/lib/nodegit.js
@@ -0,0 +1,32 @@
+var rawApi;
+
+// Attempt to load the production release first, if it fails fall back to the
+// debug release.
+try {
+  rawApi = require('../build/Release/nodegit');
+}
+catch (e) {
+  rawApi = require('../build/Debug/nodegit');
+}
+
+// Set the exports prototype to the raw API.
+exports.__proto__ = rawApi;
+
+// Import extensions
+require('./commit.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');
+
+// Set version
+exports.version = require('../package').version;
+
+// Initialize threads
+exports.Threads.threadsInit();
diff --git a/lib/tree.js b/lib/tree.js
@@ -4,9 +4,10 @@ var TreeEntry = require('./tree_entry');
 var events = require('events');
 var path = require('path');
 
-var oldEntryByIndex = Tree.prototype.entryByindex,
-    oldEntryByName = Tree.prototype.entryByname,
-    oldGetEntry = Tree.prototype.entryBypath;
+var oldBuilder = Tree.prototype.builder;
+var oldEntryByIndex = Tree.prototype.entryByindex;
+var oldEntryByName = Tree.prototype.entryByname;
+var oldGetEntry = Tree.prototype.entryBypath;
 
 // Backwards compatibility.
 Object.defineProperties(Tree.prototype, {
@@ -144,7 +145,6 @@ Tree.prototype.path = function(blobsOnly) {
  * Make builder. This is helpful for modifying trees.
  * @return {TreeBuilder}
  */
-var oldBuilder = Tree.prototype.builder;
 Tree.prototype.builder = function() {
   var builder = oldBuilder.call(this);
   builder.root = builder;
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
       "name": "Nick Kallen"
     }
   ],
-  "main": "index.js",
+  "main": "lib/nodegit.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/tbranyen/nodegit.git"
diff --git a/src/base.cc b/src/base.cc
diff --git a/test/commit.js b/test/commit.js

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"name": "Nick Kallen"`
`25`	`25`	`}`
`26`	`26`	`],`
`27`		`- "main": "index.js",`
	`27`	`+ "main": "lib/nodegit.js",`
`28`	`28`	`"repository": {`
`29`	`29`	`"type": "git",`
`30`	`30`	`"url": "git://github.com/tbranyen/nodegit.git"`