fix: dont add quotes on node global bin path on Windows (#318)

pick from #317
cnpm · Dec 10, 2019 · eefec5c · eefec5c
1 parent c37b5dc
commit eefec5c
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 96 deletions.
diff --git a/lib/bin.js b/lib/bin.js
@@ -4,7 +4,7 @@ const chalk = require('chalk');
 const debug = require('debug')('npminstall:bin');
 const path = require('path');
 const fs = require('mz/fs');
-const cmdShim = require('cmd-shim');
+const cmdShim = require('cmd-shim-hotfix');
 const utils = require('./utils');
 
 module.exports = bin;

diff --git a/package.json b/package.json
@@ -15,9 +15,9 @@
     "npmupdate": "bin/update.js"
   },
   "scripts": {
-    "test": "mocha -r thunk-mocha -r intelli-espower-loader -t 200000 test/*.test.js",
-    "test-cov": "istanbul cover --report none --print none node_modules/mocha/bin/_mocha -- -r thunk-mocha -r intelli-espower-loader -t 200000 test/*.test.js && istanbul report text-summary json lcov",
-    "test-local": "npm_china=true local=true mocha -r thunk-mocha -r intelli-espower-loader -t 200000 test/*.test.js",
+    "test": "mocha -r thunk-mocha -t 200000 test/*.test.js",
+    "test-cov": "istanbul cover --report none --print none node_modules/mocha/bin/_mocha -- -r thunk-mocha -t 200000 test/*.test.js && istanbul report text-summary json lcov",
+    "test-local": "npm_china=true local=true mocha -r thunk-mocha -t 200000 test/*.test.js",
     "lint": "eslint . --fix",
     "ci": "npm run lint && npm run test-cov",
     "autod": "autod"
@@ -28,7 +28,7 @@
     "binary-mirror-config": "^1.19.0",
     "bytes": "^2.5.0",
     "chalk": "^1.1.3",
-    "cmd-shim": "^2.0.2",
+    "cmd-shim-hotfix": "^3.0.3",
     "co": "^4.6.0",
     "co-fs-extra": "^1.2.1",
     "co-parallel": "^1.0.0",
@@ -61,11 +61,9 @@
     "eslint": "3",
     "eslint-config-egg": "3",
     "http-proxy": "^1.16.2",
-    "intelli-espower-loader": "1",
     "istanbul": "*",
     "mm": "^2.2.1",
     "mocha": "3",
-    "power-assert": "1",
     "thunk-mocha": "1"
   },
   "homepage": "https://github.com/cnpm/npminstall",

diff --git a/test/all.js b/test/all.js
@@ -7,7 +7,7 @@ const semver = require('semver');
 const spawn = require('child_process').spawn;
 const npminstall = require('./npminstall');
 
-if (semver.satisfies(process.version, '< 6.0.0')) {
+if (semver.satisfies(process.version, '< 8.0.0')) {
   process.exit(0);
 }
 

diff --git a/test/bigPackage.test.js b/test/bigPackage.test.js
@@ -2,37 +2,40 @@
 
 const path = require('path');
 const rimraf = require('rimraf');
+const semver = require('semver');
 const npminstall = require('./npminstall');
 
-describe('test/bigPackage.test.js', () => {
-  function testcase(name) {
-    describe(name, () => {
-      const root = path.join(__dirname, 'fixtures', name);
+if (semver.satisfies(process.version, '>= 6.0.0')) {
+  describe('test/bigPackage.test.js', () => {
+    function testcase(name) {
+      describe(name, () => {
+        const root = path.join(__dirname, 'fixtures', name);
 
-      function cleanup() {
-        rimraf.sync(path.join(root, 'node_modules'));
-      }
+        function cleanup() {
+          rimraf.sync(path.join(root, 'node_modules'));
+        }
 
-      beforeEach(cleanup);
-      afterEach(cleanup);
+        beforeEach(cleanup);
+        afterEach(cleanup);
 
-      it('should install success', function* () {
-        yield npminstall({
-          root,
-          trace: true,
+        it('should install success', function* () {
+          yield npminstall({
+            root,
+            trace: true,
+          });
         });
       });
-    });
-  }
+    }
+
+    if (process.platform !== 'win32') {
+      [
+        'spmtest',
+        'spmwebpacktest',
+      ].forEach(testcase);
+    }
 
-  if (process.platform !== 'win32') {
     [
-      'spmtest',
-      'spmwebpacktest',
+      'standardtest',
     ].forEach(testcase);
-  }
-
-  [
-    'standardtest',
-  ].forEach(testcase);
-});
+  });
+}
diff --git a/test/bundleDependencies.test.js b/test/bundleDependencies.test.js
@@ -59,7 +59,7 @@ describe('test/bundleDependencies.test.js', () => {
     });
     const bins = yield fs.readdir(path.join(tmp, 'node_modules/sqlite3/node_modules/.bin'));
     if (process.platform === 'win32') {
-      assert.deepEqual(bins, [ 'node-pre-gyp', 'node-pre-gyp.cmd' ]);
+      assert.deepEqual(bins, [ 'node-pre-gyp', 'node-pre-gyp.cmd', 'node-pre-gyp.ps1' ]);
     } else {
       assert.deepEqual(bins, [ 'node-pre-gyp' ]);
     }

diff --git a/test/concurrency-install.test.js b/test/concurrency-install.test.js
@@ -2,34 +2,37 @@
 
 const path = require('path');
 const rimraf = require('rimraf');
+const semver = require('semver');
 const npminstall = require('./npminstall');
 
-describe('test/concurrency-install.test.js', () => {
-  const root1 = path.join(__dirname, 'fixtures', 'concurrency1');
-  const root2 = path.join(__dirname, 'fixtures', 'concurrency2');
-  const cacheDir = path.join(__dirname, 'fixtures', '.tmp');
+if (semver.satisfies(process.version, '>= 6.0.0')) {
+  describe('test/concurrency-install.test.js', () => {
+    const root1 = path.join(__dirname, 'fixtures', 'concurrency1');
+    const root2 = path.join(__dirname, 'fixtures', 'concurrency2');
+    const cacheDir = path.join(__dirname, 'fixtures', '.tmp');
 
-  function cleanup() {
-    rimraf.sync(cacheDir);
-    rimraf.sync(path.join(root1, 'node_modules'));
-    rimraf.sync(path.join(root2, 'node_modules'));
-  }
+    function cleanup() {
+      rimraf.sync(cacheDir);
+      rimraf.sync(path.join(root1, 'node_modules'));
+      rimraf.sync(path.join(root2, 'node_modules'));
+    }
 
-  beforeEach(cleanup);
-  afterEach(cleanup);
+    beforeEach(cleanup);
+    afterEach(cleanup);
 
-  it('should concurrency install success', function* () {
-    yield [
-      npminstall({
-        root: root1,
-        cacheDir,
-        detail: true,
-      }),
-      npminstall({
-        root: root2,
-        cacheDir,
-        detail: true,
-      }),
-    ];
+    it('should concurrency install success', function* () {
+      yield [
+        npminstall({
+          root: root1,
+          cacheDir,
+          detail: true,
+        }),
+        npminstall({
+          root: root2,
+          cacheDir,
+          detail: true,
+        }),
+      ];
+    });
   });
-});
+}
diff --git a/test/installScopeRegistry.test.js b/test/installScopeRegistry.test.js
@@ -8,7 +8,9 @@ const helper = require('./helper');
 const npminstall = require('./npminstall');
 
 describe('test/installScopeRegistry.test.js', () => {
-  const [ tmp, cleanup ] = helper.tmp();
+  const items = helper.tmp();
+  const tmp = items[0];
+  const cleanup = items[1];
   let mockCnpmrc;
 
   before(() => {

diff --git a/test/proxy.test.js b/test/proxy.test.js
@@ -5,45 +5,48 @@ const rimraf = require('rimraf');
 const mkdirp = require('mkdirp');
 const mm = require('mm');
 const coffee = require('coffee');
-const proxy = require('./fixtures/reverse-proxy');
+const semver = require('semver');
 
-const npminstallBin = path.join(__dirname, '../bin/install.js');
+if (semver.satisfies(process.version, '>= 6.0.0')) {
+  const proxy = require('./fixtures/reverse-proxy');
+  const npminstallBin = path.join(__dirname, '../bin/install.js');
 
-describe('test/proxy.test.js', () => {
-  let port;
-  let proxyUrl;
-  before(done => {
-    proxy.listen(0, () => {
-      port = proxy.address().port;
-      proxyUrl = 'http://127.0.0.1:' + port;
-      console.log('proxy: %s', proxyUrl);
-      done();
+  describe('test/proxy.test.js', () => {
+    let port;
+    let proxyUrl;
+    before(done => {
+      proxy.listen(0, () => {
+        port = proxy.address().port;
+        proxyUrl = 'http://127.0.0.1:' + port;
+        console.log('proxy: %s', proxyUrl);
+        done();
+      });
     });
-  });
-  after(() => proxy.close());
+    after(() => proxy.close());
 
-  const tmp = path.join(__dirname, 'fixtures', 'tmp');
+    const tmp = path.join(__dirname, 'fixtures', 'tmp');
 
-  function cleanup() {
-    rimraf.sync(tmp);
-  }
+    function cleanup() {
+      rimraf.sync(tmp);
+    }
 
-  beforeEach(() => {
-    cleanup();
-    mkdirp.sync(tmp);
-  });
-  afterEach(cleanup);
-  afterEach(mm.restore);
+    beforeEach(() => {
+      cleanup();
+      mkdirp.sync(tmp);
+    });
+    afterEach(cleanup);
+    afterEach(mm.restore);
 
-  it('should install from proxy', () => {
-    return coffee.fork(npminstallBin, [
-      '--proxy', proxyUrl,
-      'koa', 'pedding',
-    ], {
-      cwd: tmp,
-    })
-      .debug()
-      .expect('code', 0)
-      .end();
+    it('should install from proxy', () => {
+      return coffee.fork(npminstallBin, [
+        '--proxy', proxyUrl,
+        'koa', 'pedding',
+      ], {
+        cwd: tmp,
+      })
+        .debug()
+        .expect('code', 0)
+        .end();
+    });
   });
-});
+}
diff --git a/test/uninstallGlobal.test.js b/test/uninstallGlobal.test.js
@@ -36,9 +36,7 @@ describe('test/uninstallGlobal.test.js', () => {
           'mocha',
         ])
           .debug()
-          .expect('stdout', /- mocha@\d+\.\d+\.\d+ \.\/test\/fixtures\/tmp\/lib\/node_modules\/mocha/)
-          .expect('stdout', /- mocha@\d+\.\d+\.\d+ \.\/test\/fixtures\/tmp\/bin\/mocha/)
-          .expect('stdout', /- mocha@\d+\.\d+\.\d+ \.\/test\/fixtures\/tmp\/bin\/_mocha/)
+          .expect('stdout', /- mocha@\d+\.\d+\.\d+/)
           .expect('code', 0)
           .end(done);
       });