nodegit · implausible · Sep 28, 2018 · Sep 9, 2018 · Sep 9, 2018 · Sep 9, 2018
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,23 @@
 /generate/missing-tests.json
 /binding.gyp
 
+# Generated vendor files
+/vendor/openssl/
+/vendor/libssh2/Makefile
+/vendor/libssh2/config.status
+/vendor/libssh2/docs/Makefile
+/vendor/libssh2/example/.deps/
+/vendor/libssh2/example/Makefile
+/vendor/libssh2/example/libssh2_config.h
+/vendor/libssh2/example/stamp-h2
+/vendor/libssh2/libssh2.pc
+/vendor/libssh2/libtool
+/vendor/libssh2/src/.deps/
+/vendor/libssh2/src/Makefile
+/vendor/libssh2/src/libssh2_config.h
+/vendor/libssh2/src/stamp-h1
+/vendor/libssh2/tests/.deps/
+/vendor/libssh2/tests/Makefile
 
 *.log
 .DS_STORE

diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ env:
   - TARGET_ARCH="ia32"
 
 node_js:
-  - "9"
+  - "10"
   - "8"
   - "6"
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,8 +4,8 @@
 image: Visual Studio 2015
 
 platform:
-  - x86
   - x64
+  - x86
 
 # build version format
 version: "{build}"
@@ -26,9 +26,9 @@ environment:
   GYP_MSVS_VERSION: 2015
   matrix:
     # Node.js
-    - nodejs_version: "9"
-    - nodejs_version: "8"
     - nodejs_version: "6"
+    - nodejs_version: "8"
+    - nodejs_version: "10"
 
 matrix:
   fast_finish: true

diff --git a/examples/add-and-commit.js b/examples/add-and-commit.js
@@ -1,15 +1,9 @@
 var nodegit = require("../");
 var path = require("path");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
+var fse = require("fs-extra");
 var fileName = "newfile.txt";
 var fileContent = "hello world";
 var directoryName = "salad/toast/strangerinastrangeland/theresnowaythisexists";
-// ensureDir is an alias to mkdirp, which has the callback with a weird name
-// and in the 3rd position of 4 (the 4th being used for recursion). We have to
-// force promisify it, because promisify-node won't detect it on its
-// own and assumes sync
-fse.ensureDir = promisify(fse.ensureDir);
 
 /**
  * This example creates a certain file `newfile.txt`, adds it to the git

diff --git a/examples/clone.js b/examples/clone.js
@@ -1,6 +1,5 @@
 var nodegit = require("../");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
+var fse = require("fs-extra");
 var path = "/tmp/nodegit-clone-demo";
 
 fse.remove(path).then(function() {

diff --git a/examples/cloneFromGithubWith2Factor.js b/examples/cloneFromGithubWith2Factor.js
@@ -1,6 +1,5 @@
 var nodegit = require("../");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
+var fse = require("fs-extra");
 var path = "/tmp/nodegit-github-2factor-demo";
 
 var token = "{Your GitHub user token}";

diff --git a/examples/create-new-repo.js b/examples/create-new-repo.js
@@ -1,13 +1,10 @@
 var nodegit = require("../");
 var path = require("path");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
+var fse = require("fs-extra");
 var fileName = "newfile.txt";
 var fileContent = "hello world";
 var repoDir = "../../newRepo";
 
-fse.ensureDir = promisify(fse.ensureDir);
-
 var repository;
 var index;
 

diff --git a/examples/index-add-and-remove.js b/examples/index-add-and-remove.js
@@ -1,7 +1,6 @@
 var nodegit = require("../");
 var path = require("path");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
+var fse = require("fs-extra");
 
 nodegit.Repository.open(path.resolve(__dirname, "../.git"))
   .then(function(repo) {

diff --git a/examples/merge-cleanly.js b/examples/merge-cleanly.js
@@ -1,8 +1,6 @@
 var nodegit = require("../");
 var path = require("path");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
-fse.ensureDir = promisify(fse.ensureDir);
+var fse = require("fs-extra");
 
 var ourFileName = "ourNewFile.txt";
 var ourFileContent = "I like Toll Roads. I have an EZ-Pass!";

diff --git a/examples/merge-with-conflicts.js b/examples/merge-with-conflicts.js
@@ -1,8 +1,6 @@
 var nodegit = require("../");
 var path = require("path");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
-fse.ensureDir = promisify(fse.ensureDir);
+var fse = require("fs-extra");
 
 var repoDir = "../../newRepo";
 var fileName = "newFile.txt";

diff --git a/examples/push.js b/examples/push.js
@@ -1,8 +1,6 @@
 var nodegit = require("../");
 var path = require("path");
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
-fse.ensureDir = promisify(fse.ensureDir);
+var fse = require("fs-extra");
 
 var fileName = "newFile.txt";
 var fileContent = "hello world";

diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -1,6 +1,5 @@
 const path = require("path");
-const promisify = require("promisify-node");
-const fse = promisify(require("fs-extra"));
+const fse = require("fs-extra");
 const os = require('os');
 const exec = require('../../utils/execPromise');
 const utils = require("./utils");

diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -1,8 +1,70 @@
 {
+  "conditions": [
+    ["(OS=='win' and node_root_dir.split('\\\\')[-1].startswith('iojs')) or (OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs'))", {
+      "conditions": [
+        ["OS=='win'", {
+          "variables": {
+            "is_electron%": "1",
+            "openssl_include_dir%": "<(module_root_dir)\\vendor\\openssl"
+          }
+        }, {
+          "variables": {
+            "is_electron%": "1",
+            "openssl_include_dir%": "<(module_root_dir)/vendor/openssl"
+          }
+        }]
+      ],
+    }, {
+      "conditions": [
+        ["OS=='win'", {
+          "variables": {
+            "is_electron%": "0",
+            "openssl_include_dir%": "<(node_root_dir)\\include\\node"
+          }
+        }, {
+          "variables": {
+            "is_electron%": "0",
+            "openssl_include_dir%": "<(node_root_dir)/include/node"
+          }
+        }]
+      ]
+    }]
+  ],
+
   "targets": [
+    {
+      "target_name": "acquireOpenSSL",
+        "conditions": [
+        ["<(is_electron) == 1", {
+          "actions": [{
+            "action_name": "acquire",
+            "action": ["node", "utils/acquireOpenSSL.js"],
+            "inputs": ["vendor/openssl_distributions.json"],
+            "outputs": ["vendor/openssl"],
+            "message": "Acquiring OpensSL binaries and headers"
+          }]
+        }]
+      ]
+    },
+    {
+      "target_name": "configureLibssh2",
+      "actions": [{
+        "action_name": "configure",
+        "action": ["node", "utils/configureLibssh2.js", "<(openssl_include_dir)", "<(is_electron)"],
+        "inputs": [""],
+        "outputs": [""]
+      }],
+      "hard_dependencies": [
+        "acquireOpenSSL"
+      ]
+    },
     {
       "target_name": "nodegit",
 
+      "hard_dependencies": [
+        "configureLibssh2"
+      ],
+
       "dependencies": [
         "vendor/libgit2.gyp:libgit2"
       ],
@@ -35,7 +97,6 @@
       "include_dirs": [
         "vendor/libv8-convert",
         "vendor/libssh2/include",
-        "vendor/openssl/openssl/include",
         "<!(node -e \"require('nan')\")"
       ],
 
@@ -59,6 +120,17 @@
         ],
         [
           "OS=='mac'", {
+            "conditions": [
+              ["node_root_dir.split('/')[-1].startswith('iojs')", {
+                "include_dirs": [
+                  "vendor/openssl/include"
+                ],
+                "libraries": [
+                  "<(module_root_dir)/vendor/openssl/lib/libcrypto.a",
+                  "<(module_root_dir)/vendor/openssl/lib/libssl.a"
+                ]
+              }]
+            ],
             "xcode_settings": {
               "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
               "MACOSX_DEPLOYMENT_TARGET": "10.7",
@@ -74,6 +146,15 @@
         ],
         [
           "OS=='win'", {
+            "conditions": [
+              ["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
+                "include_dirs": ["vendor/openssl/include"],
+                "libraries": [
+                  "<(module_root_dir)/vendor/openssl/lib/libcrypto.lib",
+                  "<(module_root_dir)/vendor/openssl/lib/libssl.lib"
+                ]
+              }]
+            ],
             "defines": [
               "_HAS_EXCEPTIONS=1"
             ],
@@ -88,18 +169,27 @@
                   "/FORCE:MULTIPLE"
                 ]
               }
-            }
+            },
+            "libraries": [
+              "winhttp.lib",
+              "crypt32.lib",
+              "rpcrt4.lib"
+            ]
           }
         ],
         [
           "OS=='linux' or OS=='mac'", {
             "libraries": [
-              "-lcurl"
+              "<!(curl-config --libs)"
             ]
           }
         ],
         [
           "OS=='linux' or OS.endswith('bsd')", {
+            "libraries": [
+              "-lcrypto",
+              "-lssl"
+            ],
             "cflags": [
               "-std=c++11"
             ]

diff --git a/generate/templates/templates/nodegit.cc b/generate/templates/templates/nodegit.cc
@@ -70,7 +70,7 @@ void LockMasterSetStatus(const FunctionCallbackInfo<Value>& info) {
 
   // convert the first argument to Status
   if(info.Length() >= 0 && info[0]->IsNumber()) {
-    v8::Local<v8::Int32> value = info[0]->ToInt32();
+    v8::Local<v8::Int32> value = info[0]->ToInt32(v8::Isolate::GetCurrent());
     LockMaster::Status status = static_cast<LockMaster::Status>(value->Value());
     if(status >= LockMaster::Disabled && status <= LockMaster::Enabled) {
       LockMaster::SetStatus(status);
@@ -105,8 +105,8 @@ void OpenSSL_LockingCallback(int mode, int type, const char *, int) {
   }
 }
 
-unsigned long OpenSSL_IDCallback() {
-  return (unsigned long)uv_thread_self();
+void OpenSSL_IDCallback(CRYPTO_THREADID *id) {
+  CRYPTO_THREADID_set_numeric(id, (unsigned long)uv_thread_self());
 }
 
 void OpenSSL_ThreadSetup() {
@@ -117,7 +117,7 @@ void OpenSSL_ThreadSetup() {
   }
 
   CRYPTO_set_locking_callback(OpenSSL_LockingCallback);
-  CRYPTO_set_id_callback(OpenSSL_IDCallback);
+  CRYPTO_THREADID_set_callback(OpenSSL_IDCallback);
 }
 
 ThreadPool libgit2ThreadPool(10, uv_default_loop());

diff --git a/lib/repository.js b/lib/repository.js
@@ -1,5 +1,4 @@
-var promisify = require("promisify-node");
-var fse = promisify(require("fs-extra"));
+var fse = require("fs-extra");
 var fp = require("lodash/fp");
 var NodeGit = require("../");
 var Blob = NodeGit.Blob;

diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js
@@ -2,7 +2,6 @@ var path = require("path");
 var local = path.join.bind(path, __dirname);
 
 var exec = require(local("../utils/execPromise"));
-var configure = require(local("configureLibssh2"));
 var buildFlags = require(local("../utils/buildFlags"));
 
 module.exports = function prepareForBuild() {
@@ -17,9 +16,6 @@ module.exports = function prepareForBuild() {
 
       return Promise.resolve();
     })
-    .then(function() {
-      return configure();
-    })
     .then(function() {
       if (buildFlags.isGitRepo) {
         var submodules = require(local("submodules"));
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ env: @@
       - TARGET_ARCH="ia32"
     node_js:
-      - "9"
+      - "10"
       - "8"
       - "6"
@@ Expand Down @@