Fix test for windows. Add https://ci.appveyor.com as windows CI.

appveyor.yml

@@ -0,0 +1,23 @@
+# Test against this version of Node.js
+environment:
+  matrix:
+    - nodejs_version: "Stable"
+    - nodejs_version: "LTS"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of Node.js or io.js
+  - ps: Install-Product node $env:nodejs_version
+  # install modules
+  - npm install
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  # run tests
+  - npm test
+
+# Don't actually build.
+build: off

lib/index.js

@@ -100,16 +100,7 @@ function bump(manifest, type, options) {
  */
 function runNpmScriptIfExists(pkgScripts, script) {
   if (pkgScripts && pkgScripts[script]) {
-    try {
-      exec('npm', ['run', script], {skipCustomErrorLog: true});
-    } catch (ex) {
-      //windows fallback, until https://github.com/libuv/libuv/pull/358 is fixed
-      if (ex.code === 'ENOENT') {
-        exec('npm.cmd', ['run', script]);
-      } else {
-        throw ex;
-      }
-    }
+    exec('npm', ['run', script]);
   }
 }
 
@@ -206,7 +197,11 @@ function exec(command, args, opts) {
   opts = opts || {};
   var skipCustomErrorLog = opts.skipCustomErrorLog;
   delete opts.skipCustomErrorLog;
-  var result = spawnSync(command, args, opts);
+  //use which to make sure that node spawn can find correct executable, at the moment this is used as
+  //a windows fallback, until https://github.com/libuv/libuv/pull/358 is fixed
+  var which = require('npm-which')(process.cwd());
+  var pathToCommand = which.sync(command);
+  var result = spawnSync(pathToCommand, args, opts);
   if (result.status || result.error) {
     if (!skipCustomErrorLog) {
       console.error(

package.json

@@ -24,7 +24,7 @@
   "scripts": {
     "lint": "jshint . --verbose && jscs . --verbose",
     "build": "npm run lint",
-    "test": "mocha --bail --recursive tests/fixtures tests/specs",
+    "test": "mocha --bail --recursive --timeout 3000 tests/fixtures tests/specs",
     "upgrade": "npm-check -u",
     "bump": "node bin/bump.js --prompt --tag --push --all",
     "release": "npm run upgrade && npm run build && npm test && npm run bump && npm publish",
@@ -42,6 +42,7 @@
     "lodash": "^4.16.4",
     "mocha": "^3.1.1",
     "npm-check": "^5.4.0",
+    "npm-which": "^3.0.1",
     "sinon": "^1.17.6"
   },
   "dependencies": {
@@ -62,4 +63,4 @@
   "bin": {
     "bump": "bin/bump.js"
   }
-}
+}

tests/fixtures/.tmp/git.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\bin\git" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\bin\git" %*
+)

tests/fixtures/bin/git.cmd

@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\git" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\git" %*
+)

tests/fixtures/helper.js

@@ -21,8 +21,12 @@ beforeEach(function() {
     fs.mkdirSync(tmpPath)
   }
   else {
-    // Make sure the .tmp directory is empty
+    // Make sure the .tmp directory is empty, except for git.cmd,
+    // which is a hack to make appveyor build work (has some issues with PATH modification)
     fs.readdirSync(tmpPath).forEach(function(file) {
+      if (file === 'git.cmd') {
+        return;
+      }
       fs.unlinkSync(path.join(tmpPath, file));
     });
   }
@@ -58,7 +62,15 @@ function bump(args, initialJSON, finalJSON) {
   // Modify the PATH environment variable so bump will execute our fake `git`
   var binPath = path.join(__dirname, 'bin');
   fs.chmodSync(path.join(binPath, 'git'), '0777');
-  var env = _.clone(process.env);
+  var env = _.reduce(process.env, function (memo, value, key) {
+    //in windows, environment variables are case insensitive and can be defined as Path, path, ...
+    //since in code below we're relying on PATH to be uppercase, make sure it is cloned as uppercase
+    if (/^path$/i.test(key)) {
+      memo.PATH = value;
+    }
+    memo[key] = value;
+    return memo;
+  }, {});
   env.PATH = binPath + path.delimiter + env.PATH;
 
   // Run bump