nodegit · joshaber · Nov 11, 2015 · Nov 11, 2015 · Nov 11, 2015 · Nov 11, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ env:
     - export NODE_VERSION="0.12"
     - export NODE_VERSION="4.1"
     - export NODE_VERSION="5.0"
+    - export ELECTRON_VERSION="0.34.3" NODE_VERSION="4.2"
 matrix:
   fast_finish: true
 before_install:
@@ -48,6 +49,9 @@ os:
   - linux
   - osx
 script:
+  - if [ -n "$ELECTRON_VERSION" ]; then
+      npm install electron-prebuilt@$ELECTRON_VERSION;
+    fi
   - if [ $TRAVIS_OS_NAME == "linux" ] && [ $NODE_VERSION == "0.12" ]; then
       npm test && npm run cov && npm run coveralls;
     else
@@ -58,8 +62,8 @@ after_success:
       npm install -g node-pre-gyp
       npm install -g aws-sdk
       node lifecycleScripts/clean
-      node-pre-gyp package
-      node-pre-gyp publish
+      node lifecycleScripts/package
+      node lifecycleScripts/publish
     fi
 notifications:
   slack:

diff --git a/appveyor.yml b/appveyor.yml
@@ -27,23 +27,26 @@ environment:
   GIT_SSH: c:\projects\nodegit\vendor\plink.exe
   GYP_MSVS_VERSION: 2013
   matrix:
+    # Electron
+    - nodejs_version: "4.2"
+      ELECTRON_VERSION: "0.34.3"
     # Node.js
     - nodejs_version: "0.12"
-    # Node.js
     - nodejs_version: "4.1"
     - nodejs_version: "5.0"
 
 matrix:
-  fast_finish: true
+  fast_finish: false
 
 # Get the latest stable version of Node 0.STABLE.latest
 install:
   - ps: Install-Product node $env:nodejs_version
   - ps: Start-Process c:\projects\nodegit\vendor\pageant.exe c:\projects\nodegit\vendor\private.ppk
   - cmd: npm install -g node-gyp
-  - npm install
+  - cmd: npm install
 
 test_script:
+  - IF DEFINED ELECTRON_VERSION npm install electron-prebuilt@%ELECTRON_VERSION%
   - node --version
   - npm --version
   - cmd: npm test
@@ -52,8 +55,8 @@ on_success:
   - IF %APPVEYOR_REPO_TAG%==true npm install -g node-pre-gyp
   - IF %APPVEYOR_REPO_TAG%==true npm install -g aws-sdk
   - IF %APPVEYOR_REPO_TAG%==true node lifecycleScripts\clean
-  - IF %APPVEYOR_REPO_TAG%==true node-pre-gyp package
-  - IF %APPVEYOR_REPO_TAG%==true node-pre-gyp publish
+  - IF %APPVEYOR_REPO_TAG%==true node lifecycleScripts\package
+  - IF %APPVEYOR_REPO_TAG%==true node lifecycleScripts\publish
 
 build: off
 

diff --git a/lifecycleScripts/build.js b/lifecycleScripts/build.js
@@ -0,0 +1,32 @@
+var path = require("path");
+var objectAssign = require("lodash.assign");
+
+var exec = require("./exec");
+var findNodePreGyp = require("./findNodePreGyp");
+
+module.exports = function build(action, targetInfo) {
+  var opts = {
+    cwd: ".",
+    maxBuffer: Number.MAX_VALUE,
+    env: objectAssign({}, process.env)
+  };
+
+  var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
+  var distUrl = "";
+
+  if (targetInfo.target === "electron") {
+    var home = process.platform == "win32" ?
+            process.env.USERPROFILE : process.env.HOME;
+    opts.env.HOME = path.join(home, ".electron-gyp");
+
+    distUrl = "--dist-url=https://atom.io/download/atom-shell";
+  }
+
+  var npg = findNodePreGyp();
+  var cmd = [npg, action, debug, distUrl, "--build-from-source"]
+    .concat(targetInfo.args)
+    .join(" ")
+    .trim();
+
+  return exec(cmd, opts);
+};
diff --git a/lifecycleScripts/determineTarget.js b/lifecycleScripts/determineTarget.js
@@ -0,0 +1,25 @@
+var whichNativeNodish = require("which-native-nodish");
+
+module.exports = function determineTarget(action) {
+  return whichNativeNodish("..")
+    .then(function(results) {
+      var nwVersion = results.nwVersion || process.env.NWJS_VERSION || null;
+      var asVersion = results.asVersion || process.env.ELECTRON_VERSION || null;
+      var args = [];
+      var target = null;
+      if (nwVersion) {
+        target = "node-webkit";
+        args.push("--target=" + nwVersion);
+      } else if (asVersion) {
+        target = "electron";
+        args.push("--target=" + asVersion);
+      }
+
+      if (target) {
+        args.push("--runtime=" + target);
+      }
+
+      target = target || "node";
+      return {target: target, args: args};
+    });
+};
diff --git a/lifecycleScripts/exec.js b/lifecycleScripts/exec.js
@@ -0,0 +1,5 @@
+var promisify = require("promisify-node");
+
+module.exports = promisify(function(command, opts, callback) {
+  return require("child_process").exec(command, opts, callback);
+});
diff --git a/lifecycleScripts/findNodePreGyp.js b/lifecycleScripts/findNodePreGyp.js
@@ -0,0 +1,6 @@
+var path = require("path");
+
+module.exports = function findNodePreGyp() {
+  var npg = path.resolve(".", "node_modules", ".bin", "node-pre-gyp");
+  return npg.replace(/\s/g, "\\$&");
+};
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -1,49 +1,44 @@
-var promisify = require("promisify-node");
-var path = require("path");
 var fs = require("fs");
+var path = require("path");
 
-var whichNativeNodish = require("which-native-nodish");
+var determineTarget = require("./determineTarget");
 var prepareForBuild = require("./prepareForBuild");
-
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
-var nwVersion = null;
-var asVersion = null;
+var build = require("./build");
+var exec = require("./exec");
 
 var local = path.join.bind(path, __dirname);
 
-return whichNativeNodish("..")
-  .then(function(results) {
-    nwVersion = results.nwVersion;
-    asVersion = results.asVersion;
-  })
-  .then(function() {
+var buildAction = "rebuild";
+
+return determineTarget()
+  .then(function(targetInfo) {
     if (fs.existsSync(local("../.didntcomefromthenpmregistry"))) {
-      return prepareAndBuild();
+      return prepareAndBuild(buildAction, targetInfo);
     }
     if (process.env.BUILD_DEBUG) {
       console.info("[nodegit] Doing a debug build, no fetching allowed.");
-      return prepareAndBuild();
+      return prepareAndBuild(buildAction, targetInfo);
     }
     if (process.env.BUILD_ONLY) {
       console.info("[nodegit] BUILD_ONLY is set to true, no fetching allowed.");
-      return prepareAndBuild();
-    }
-    var args = [];
-    if (asVersion) {
-      args.push("--runtime=electron");
-      args.push("--target=" + asVersion);
-    } else if (nwVersion) {
-      args.push("--runtime=node-webkit");
-      args.push("--target=" + nwVersion);
+      return prepareAndBuild(buildAction, targetInfo);
     }
-    return installPrebuilt(args);
+    return installPrebuilt(targetInfo);
+  })
+  .then(function() {
+    console.info("[nodegit] Compilation complete.");
+    console.info("[nodegit] Completed installation successfully.");
+    process.exitCode = 0;
+  },
+  function(err, stderr) {
+    console.error(err);
+    console.error(stderr);
+    process.exitCode = 13;
   });
 
-function installPrebuilt(args) {
+function installPrebuilt(targetInfo) {
   console.info("[nodegit] Fetching binary from S3.");
-  var installArguments = args.join(" ");
+  var installArguments = targetInfo.args.join(" ");
   return exec("node-pre-gyp install " + installArguments)
     .then(
       function() {
@@ -53,71 +48,19 @@ function installPrebuilt(args) {
         console.info("[nodegit] Failed to install prebuilt binary, " +
           "building manually.");
         console.error(err);
-        return prepareAndBuild();
+        return prepareAndBuild(buildAction, targetInfo);
       }
     );
 }
 
-
-function prepareAndBuild() {
+function prepareAndBuild(action, targetInfo) {
   console.info("[nodegit] Regenerating and configuring code");
   return prepareForBuild()
     .then(function() {
-      return build();
+      console.info("[nodegit] Everything is ready to go, " +
+                   "attempting compilation.");
+      console.info("[nodegit] Building native " +
+                   targetInfo.target + " module.");
+      return build(buildAction, targetInfo);
     });
 }
-
-function build() {
-  console.info("[nodegit] Everything is ready to go, attempting compilation");
-  if (nwVersion) {
-    console.info("[nodegit] Building native node-webkit module.");
-  }
-  else {
-    console.info("[nodegit] Building native node module.");
-  }
-
-  var opts = {
-    cwd: ".",
-    maxBuffer: Number.MAX_VALUE,
-    env: process.env
-  };
-
-  var target = "";
-  var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
-  var builder = "node-gyp";
-  var distUrl = "";
-
-  if (asVersion) {
-    var home = process.platform == "win32" ?
-            process.env.USERPROFILE : process.env.HOME;
-
-    opts.env.HOME = path.join(home, ".atom-shell-gyp");
-
-    target = "--target=" + asVersion;
-
-    distUrl = "--dist-url=https://gh-contractor-zcbenz.s3." +
-      "amazonaws.com/atom-shell/dist";
-  }
-  else if (nwVersion) {
-    builder = "nw-gyp";
-    target = "--target=" + nwVersion;
-  }
-
-  builder = path.resolve(".", "node_modules", ".bin", builder);
-  builder = builder.replace(/\s/g, "\\$&");
-  var cmd = [builder, "rebuild", target, debug, distUrl]
-    .join(" ").trim();
-
-  return exec(cmd, opts)
-    .then(function() {
-        console.info("[nodegit] Compilation complete.");
-        console.info("[nodegit] Completed installation successfully.");
-        process.exitCode = 0;
-      },
-      function(err, stderr) {
-        console.error(err);
-        console.error(stderr);
-        process.exitCode = 13;
-      }
-    );
-}
diff --git a/lifecycleScripts/package.js b/lifecycleScripts/package.js
@@ -0,0 +1,19 @@
+var determineTarget = require("./determineTarget");
+var build = require("./build");
+
+return determineTarget()
+  .then(function(targetInfo) {
+    console.info("[nodegit] Packaging native " +
+                 targetInfo.target + " module.");
+    return build("package", targetInfo);
+  })
+  .then(function() {
+    console.info("[nodegit] Packaging complete.");
+    console.info("[nodegit] Completed packaging successfully.");
+    process.exitCode = 0;
+  },
+  function(err, stderr) {
+    console.error(err);
+    console.error(stderr);
+    process.exitCode = 13;
+  });
diff --git a/lifecycleScripts/publish.js b/lifecycleScripts/publish.js
@@ -0,0 +1,20 @@
+var exec = require("./exec");
+var determineTarget = require("./determineTarget");
+var findNodePreGyp = require("./findNodePreGyp");
+
+return determineTarget()
+  .then(function(targetInfo) {
+    var npg = findNodePreGyp();
+    console.info("[nodegit] Publishing native " +
+                 targetInfo.target + " module.");
+    return exec(npg + " publish " + targetInfo.args);
+  })
+  .then(function() {
+    console.info("[nodegit] Publishing completed successfully.");
+    process.exitCode = 0;
+  },
+  function(err, stderr) {
+    console.error(err);
+    console.error(stderr);
+    process.exitCode = 13;
+  });
diff --git a/lifecycleScripts/runTests.js b/lifecycleScripts/runTests.js
@@ -0,0 +1,41 @@
+var spawn = require("child_process").spawn;
+var Promise = require("nodegit-promise");
+var path = require("path");
+var objectAssign = require("lodash.assign");
+
+var determineTarget = require("./determineTarget");
+
+return determineTarget()
+  .then(function(targetInfo) {
+    var opts = {
+      cwd: ".",
+      maxBuffer: Number.MAX_VALUE,
+      env: objectAssign({}, process.env),
+      stdio: "inherit",
+      stderr: "inherit",
+    };
+    var binaryName = "node";
+    var args = ["--expose-gc", "test"];
+
+    if (targetInfo.target === "electron" && process.platform !== "linux") {
+      binaryName = path.resolve("node_modules", ".bin", "electron");
+
+      if (process.platform === "win32") {
+        binaryName += ".cmd";
+      }
+
+      opts.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE = "1";
+    }
+
+    return new Promise(function(resolve, reject) {
+      var task = spawn(binaryName, args, opts);
+      task.on("exit", function(code) {
+        if (code === 0) {
+          resolve();
+        } else {
+          reject(code);
+        }
+        process.exit(code);
+      });
+    });
+  });
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
   ],
   "dependencies": {
     "fs-extra": "^0.24.0",
+    "lodash.assign": "^3.2.0",
     "node-pre-gyp": "^0.6.15",
     "nodegit-promise": "^3.0.3",
     "npm": "^3.3.3",
@@ -82,7 +83,7 @@
     "cov": "npm run cppcov && npm run filtercov && npm run mergecov",
     "mocha": "mocha test/runner test/tests",
     "mochaDebug": "mocha --debug-brk test/runner test/tests",
-    "test": "npm run lint && node --expose-gc test",
+    "test": "npm run lint && node lifecycleScripts/runTests",
     "generateJson": "node generate/scripts/generateJson",
     "generateNativeCode": "node generate/scripts/generateNativeCode",
     "generateMissingTests": "node generate/scripts/generateMissingTests",