nodegit · johnhaley81 · Oct 23, 2014 · Jul 11, 2014 · Jul 13, 2014 · Oct 7, 2014
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,12 @@
 /node_modules/
 /vendor/libgit2/
+/vendor/libssh2/
+/vendor/http_parser/
 /build/
 /coverage/
 /test/repos/
+/src/
+/include/
 
 /vendor/Release
 /vendor/*.vcxproj
@@ -12,12 +16,4 @@
 /generate/idefs.json
 /binding.gyp
 
-/src/*
-!/src/functions/copy.cc
-!/src/wrapper.cc
-
-/include/*
-!/include/functions/copy.h
-!/include/wrapper.h
-
 *.log
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,18 @@
+# Install GCC 4.8 for C++11 support.
+before_install:
+  - "sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test"
+  - "sudo apt-get -qq update"
+  - "sudo apt-get -qq install g++-4.8"
+  - "export CXX='g++-4.8'"
+  - "export JOBS=4"
+# This is a random private key used purely for testing.
+before_script:
+ - echo -e "Host *\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+ - echo -e "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkTcgXnHuqR0gbwegnr9Zxz4hTkjjV/SpgJNPJz7mo/HKNbx0rqjj1P0yGR053R9GSFFim2ut4NK9DPPUkQdyucw+DoLkYRHJmlJ4BNa9NTCD0sl+eSXO2969kZojCYSOgbmkCJx8mdgTwhzdgE/jhBrsY0hPE6pRTlU+H68/zeNdJUAIJf0LLXOm3hpTKLA19VICltl/j9VvBJpgRHdBylXEyL8HokYpjkQQk1ZXj3m7Nlo8yDdg4VcljOJWC+Xh8kxRMfK5x/VRVsYKCQXN5QlzKeqf7USRDUS/7mFoPUBW+d4kwKtGxRsWuIL2yeqzifZUTOgsh9+ZWAWxWffQZ your_email@example.com" > ~/.ssh/id_rsa.pub
+ - echo -e "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA5E3IF5x7qkdIG8HoJ6/Wcc+IU5I41f0qYCTTyc+5qPxyjW8d\nK6o49T9MhkdOd0fRkhRYptrreDSvQzz1JEHcrnMPg6C5GERyZpSeATWvTUwg9LJf\nnklztvevZGaIwmEjoG5pAicfJnYE8Ic3YBP44Qa7GNITxOqUU5VPh+vP83jXSVAC\nCX9Cy1zpt4aUyiwNfVSApbZf4/VbwSaYER3QcpVxMi/B6JGKY5EEJNWV495uzZaP\nMg3YOFXJYziVgvl4fJMUTHyucf1UVbGCgkFzeUJcynqn+1EkQ1Ev+5haD1AVvneJ\nMCrRsUbFriC9snqs4n2VEzoLIffmVgFsVn30GQIDAQABAoIBAQDPQm2sQbti0mN8\nD4Uawl8D40v30n8WhUa7EbPTOmlqKAQ2sfDhex9KRbTLEmEBmImA/Eee8o9iCTIy\n8Fv8Fm6pUHt9G6Pti/XvemwW3Q3QNpSUkHqN0FDkgecQVqVBEb6uHo3mDm4RFINX\neOmkp30BjIK9/blEw1D0sFALLOEUPaDdPMwiXtFgqfrFSgpDET3TvQIwZ2LxxTm0\ncNmP3sCSlZHJNkZI4hBEWaaXR+V5/+C1qblDCo5blAWTcX3UzqrwUUJgFi6VnBuh\n7S9Q6+CEIU+4JRyWQNmY8YgZFaAp6IOr/kyfPxTP1+UEVVgcLn3WDYwfG9og0tmz\nfzlruAgBAoGBAPfz73Pey86tNZEanhJhbX8gVjzy2hvyhT0paHg0q/H6c1VWOtUH\nOwZ3Ns2xAZqJhlDqCHnQYSCZDly042U/theP4N8zo1APb4Yg4qdmXF9QE1+2M03r\nkS6138gU/CSCLf8pCYa6pA/GmsaXxloeJGLvT4fzOZRsVav80/92XHRhAoGBAOu2\nmKh4Gr1EjgN9QNbk9cQTSFDtlBEqO/0pTepvL73UvNp/BAn4iYZFU4WnklFVBSWc\nL84Sc732xU12TAbTTUsa6E7W29pS8u7zVTxlIdQIIU5pzDyU1pNNk2kpxzte5p3Y\nPDtniPFsoYLWoH0LpsKL93t2pLAj+IOkE6f3XBq5AoGAIKaYo5N1FxQr952frx/x\nQUpK0N/R5Ng8v18SiLG26rhmM5iVSrQXC7TrHI7wfR8a9tC6qP/NqnM9NuwC/bQ0\nEEo7/GhaWxKNRwZRkmWiSFLNGk9t1hbtGU+N1lUdFtmloPIQdRNiw0kN3JTj474Q\nYI7O1EItFORnK6yxZfR6HEECgYEA1CT7MGUoa8APsMRCXyaiq15Pb8bjxK8mXquW\nHLEFXuzhLCW1FORDoj0y9s/iuKC0iS0ROX8R/J7k5NrbgikbH8WP36UxKkYNr1IC\nHOFImPTYRSKjVsL+fIUNb1DSp3S6SsYbL7v3XJJQqtlQiDq8U8x1aQFXJ9C4EoLR\nzhKrKsECgYBtU/TSF/TATZY5XtrN9O+HX1Fbz70Ci8XgvioheVI2fezOcXPRzDcC\nOYPaCMNKA5E8gHdg4s0TN7uDvKTJ+KhSg2V7gZ39A28dHrJaRX7Nz4k6t2uEBjX9\na1JidpAIbJ+3w7+hj6L299tVZvS+Y/6Dz/uuEQGXfJg/l/5CCvQPsA==\n-----END RSA PRIVATE KEY-----" > ~/.ssh/id_rsa
+ - chmod 600 ~/.ssh/id_rsa*
+ - eval `ssh-agent -s`
+ - ssh-add ~/.ssh/id_rsa
 language: node_js
 node_js:
   - "0.10"
@@ -7,3 +22,4 @@ git:
 branches:
   only:
     - master
+
diff --git a/appveyor.yml b/appveyor.yml
@@ -20,6 +20,8 @@ install:
   - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
   - cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
   - cmd: SET PATH=c:\python27;%PATH%
+  - cmd: SET JOBS=4
+  - cmd: ssh-agent -s
   - cmd: npm install -g node-gyp
   - npm install --msvs_version=2013
 

diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -117,19 +117,76 @@
       },
 
       "git_checkout_init_options": {
-        "ignore": false
+        "ignore": true
       }
     }
   },
 
   "checkout_options": {
     "isStruct": true,
     "cType": "git_checkout_options",
+    "dependencies": [
+      "../include/strarray.h",
+      "../include/functions/copy.h",
+      "../include/checkout_options.h",
+      "../include/tree.h"
+    ],
     "fields": []
   },
 
   "clone": {
-    "cType": null
+    "cType": null,
+    "trim": false,
+
+    "dependencies": [
+      "../include/signature.h",
+      "../include/checkout_options.h",
+      "../include/repository.h",
+      "../include/remote.h"
+    ],
+
+    "functions": {
+      "git_clone": {
+        "ignore": false,
+        "isConstructorMethod": true,
+        "args": [{}, {}, {}, { "isOptional": true }]
+      },
+
+      "git_clone_into": {
+        "ignore": false,
+        "isConstructorMethod": true,
+        "args": [{}, {}, { "isOptional": true }]
+      }
+    }
+  },
+
+  "clone_options": {
+    "cType": "git_clone_options",
+    "isStruct": true,
+    "dependencies": [
+      "../include/checkout_options.h",
+      "../include/remote_callbacks.h"
+    ],
+
+    "fields": [{
+      "name": "version",
+      "cType": "int"
+    }, {
+      "name": "remote_callbacks",
+      "cType": "git_remote_callbacks"
+    }, {
+      "name": "bare",
+      "cType": "int"
+    }, {
+      "name": "ignore_cert_errors",
+      "cType": "int"
+    }, {
+      "name": "remote_name",
+      "cType": "const char *"
+    }, {
+      "name": "checkout_branch",
+      "cType": "const char *"
+    }]
   },
 
   "commit": {
@@ -223,6 +280,19 @@
   "config": {
   },
 
+  "cred": {
+    "isStruct": true,
+    "cType": "git_cred",
+    "functions": {
+      "git_cred_ssh_key_from_agent": {
+        "ignore": false,
+        "isPrototypeMethod": false,
+        "args": [{ "isSelf": false }],
+        "isAsync": false
+      }
+    }
+  },
+
   "cred_helpers": {
   },
 
@@ -627,6 +697,53 @@
     }
   },
 
+  "remote_callbacks": {
+    "isStruct": true,
+    "cType": "git_remote_callbacks",
+    "dependencies": [
+      "../include/cred.h"
+    ],
+    "fields": [{
+      "name": "version",
+      "cType": "int"
+    }, {
+      "name": "credentials",
+      "cType": "git_cred_acquire_cb",
+      "isFunction": true,
+      "args": [
+        {
+          "name": "cred",
+          "cType": "git_cred **",
+          "isReturn": true
+        },
+        {
+          "name": "url",
+          "cType": "const char *"
+        },
+        {
+          "name": "username_from_url",
+          "cType": "const char *"
+        },
+        {
+          "name": "allowed_types",
+          "cType": "unsigned int"
+        },
+        {
+          "name": "payload",
+          "cType": "void *"
+        }
+      ],
+      "returnType": "int",
+      "returnNoResults": 1,
+      "returnSuccess": 0,
+      "returnError": -1
+    }, {
+      "name": "payload",
+      "cType": "void *",
+      "payloadFor": "*"
+    }]
+  },
+
   "repository": {
     "dependencies": [
       "../include/functions/copy.h",
@@ -822,6 +939,15 @@
   },
 
   "transport": {
+    "cType": null,
+    "trim": false,
+
+    "functions": {
+      "git_cred_ssh_key_from_agent": {
+        "ignore": false,
+        "isConstructorMethod": true
+      }
+    }
   },
 
   "tree": {

diff --git a/generate/filters/payload_for.js b/generate/filters/payload_for.js
@@ -0,0 +1,14 @@
+module.exports = function(fields, payloadForField) {
+  fields = fields || [];
+
+  var result = fields.filter(function (field) {
+    return field.payloadFor && (field.payloadFor === payloadForField || field.payloadFor === "*");
+  });
+
+  if (result.length > 0) {
+    return result[0].name;
+  }
+  else {
+    return "";
+  }
+};
diff --git a/generate/filters/title_case.js b/generate/filters/title_case.js
@@ -0,0 +1,9 @@
+module.exports = function(str) {
+  return str.split(/_|\//).map(function(val, index) {
+    if (val.length) {
+      return val[0].toUpperCase() + val.slice(1);
+    }
+
+    return val;
+  }).join("");
+};
diff --git a/generate/index.js b/generate/index.js
@@ -18,19 +18,23 @@ var partials = {
   doc: file.read("partials/doc.cc"),
   fields: file.read("partials/fields.cc"),
   guardArguments: file.read("partials/guard_arguments.cc"),
-  syncFunction: file.read("partials/sync_function.cc")
+  syncFunction: file.read("partials/sync_function.cc"),
+  fieldAccessors: file.read("partials/field_accessors.cc")
 };
 
 var templates = {
-  class: file.read("templates/class.cc"),
-  header: file.read("templates/header.h"),
+  class_content: file.read("templates/class_content.cc"),
+  struct_content: file.read("templates/struct_content.cc"),
+  class_header: file.read("templates/class_header.h"),
+  struct_header: file.read("templates/struct_header.h"),
   binding: file.read("templates/binding.gyp"),
   nodegit: file.read("templates/nodegit.cc")
 };
 
 var filters = {
   upper: require("./filters/upper"),
   replace: require("./filters/replace"),
+  titleCase: require("./filters/title_case"),
   or: require("./filters/or"),
   and: require("./filters/and"),
   defaultValue: require("./filters/default_value"),
@@ -41,6 +45,7 @@ var filters = {
   isPointer: require("./filters/is_pointer"),
   isDoublePointer: require("./filters/is_double_pointer"),
   unPointer: require("./filters/un_pointer"),
+  payloadFor: require("./filters/payload_for"),
   hasReturnType: require("./filters/has_return_type"),
   hasReturns: require("./filters/has_returns"),
   returnsCount: require("./filters/returns_count"),
@@ -60,7 +65,8 @@ Object.keys(templates).forEach(function(template) {
 
 // Attach all partials to select templates.
 Object.keys(partials).forEach(function(partial) {
- templates.class.registerPartial(partial, combyne(partials[partial]));
+  templates.class_content.registerPartial(partial, combyne(partials[partial]));
+  templates.struct_content.registerPartial(partial, combyne(partials[partial]));
 });
 
 
@@ -88,7 +94,13 @@ fse.remove(path.resolve(__dirname, "../src")).then(function() {
 
   // Write out all the classes.
   enabled.forEach(function(idef) {
-    file.write("../src/" + idef.name + ".cc", templates.class.render(idef));
-    file.write("../include/" + idef.name + ".h", templates.header.render(idef));
+    if (idef.hasConstructor) {
+      file.write("../src/" + idef.name + ".cc", templates.struct_content.render(idef));
+      file.write("../include/" + idef.name + ".h", templates.struct_header.render(idef));
+    }
+    else {
+      file.write("../src/" + idef.name + ".cc", templates.class_content.render(idef));
+      file.write("../include/" + idef.name + ".h", templates.class_header.render(idef));
+    }
   });
 });
diff --git a/generate/partials/async_function.cc b/generate/partials/async_function.cc
@@ -1,15 +1,17 @@
+
 {%partial doc .%}
 NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
   NanScope();
   {%partial guardArguments .%}
-
   if (args.Length() == {{args|jsArgsCount}} || !args[{{args|jsArgsCount}}]->IsFunction()) {
     return NanThrowError("Callback is required and must be a Function.");
   }
 
   {{ cppFunctionName }}Baton* baton = new {{ cppFunctionName }}Baton;
+
   baton->error_code = GIT_OK;
   baton->error = NULL;
+
   {%each args|argsInfo as arg %}
     {%if not arg.isReturn %}
       {%if arg.isSelf %}
@@ -72,6 +74,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::Execute() {
 
 void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
   TryCatch try_catch;
+
   if (baton->error_code == GIT_OK) {
     {%if not .|returnsCount %}
     Handle<Value> result = NanUndefined();

diff --git a/generate/partials/convert_from_v8.cc b/generate/partials/convert_from_v8.cc
@@ -1,32 +1,39 @@
 {%if not isPayload %}
   {{ cType }} from_{{ name }};
   {%if isOptional %}
-    if (args[{{ jsArg }}]->Is{{ cppClassName|cppToV8 }}()) {
+
+  if (args[{{ jsArg }}]->Is{{ cppClassName|cppToV8 }}()) {
   {%endif%}
   {%if cppClassName == 'String' %}
-      String::Utf8Value {{ name }}(args[{{ jsArg }}]->ToString());
-      from_{{ name }} = ({{ cType }}) strdup(*{{ name }});
+
+  String::Utf8Value {{ name }}(args[{{ jsArg }}]->ToString());
+  from_{{ name }} = ({{ cType }}) strdup(*{{ name }});
   {%elsif cppClassName == 'Array' %}
-      Array *tmp_{{ name }} = Array::Cast(*args[{{ jsArg }}]);
-      from_{{ name }} = ({{ cType }})malloc(tmp_{{ name }}->Length() * sizeof({{ cType|replace '**' '*' }}));
+
+  Array *tmp_{{ name }} = Array::Cast(*args[{{ jsArg }}]);
+  from_{{ name }} = ({{ cType }})malloc(tmp_{{ name }}->Length() * sizeof({{ cType|replace '**' '*' }}));
       for (unsigned int i = 0; i < tmp_{{ name }}->Length(); i++) {
     {%--
       // FIXME: should recursively call convertFromv8.
     --%}
-        from_{{ name }}[i] = ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(tmp_{{ name }}->Get(NanNew<Number>(static_cast<double>(i)))->ToObject())->GetValue();
+      from_{{ name }}[i] = ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(tmp_{{ name }}->Get(NanNew<Number>(static_cast<double>(i)))->ToObject())->GetValue();
       }
   {%elsif cppClassName == 'Function' %}
   {%elsif cppClassName == 'Buffer' %}
-      from_{{ name }} = Buffer::Data(args[{{ jsArg }}]->ToObject());
+
+  from_{{ name }} = Buffer::Data(args[{{ jsArg }}]->ToObject());
   {%elsif cppClassName|isV8Value %}
-      from_{{ name }} = ({{ cType }}) {{ additionalCast }} {{ cast }} args[{{ jsArg }}]->To{{ cppClassName }}()->Value();
+
+  from_{{ name }} = ({{ cType }}) {{ additionalCast }} {{ cast }} args[{{ jsArg }}]->To{{ cppClassName }}()->Value();
   {%else%}
-      from_{{ name }} = ObjectWrap::Unwrap<{{ cppClassName }}>(args[{{ jsArg }}]->ToObject())->GetValue();
+    from_{{ name }} = ObjectWrap::Unwrap<{{ cppClassName }}>(args[{{ jsArg }}]->ToObject())->GetValue();
   {%endif%}
 
   {%if isOptional %}
-    } else {
-      from_{{ name }} = 0;
-    }
+  }
+  else {
+    from_{{ name }} = 0;
+  }
+
   {%endif%}
 {%endif%}