npm cache by default (#940)

* fix: test on win32 * feat: adding cache-min Infinity as a default * fix: use os.EOL as per @SBoudrias suggestion * feat(npm): use a cache-min of a day and update tests
yeoman · Oct 23, 2016 · 2c34bde · 2c34bde
1 parent 61d5df1
commit 2c34bde
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/actions/install.js b/lib/actions/install.js
@@ -34,6 +34,11 @@ install.runInstall = function (installer, paths, options, cb) {
 
   var args = ['install'].concat(paths).concat(dargs(options));
 
+  // only for npm, use a minimum cache of one day
+  if (installer === 'npm') {
+    args = args.concat(['--cache-min', 24 * 60 * 60]);
+  }
+
   // Return early if we're skipping installation.
   if (this.options.skipInstall) {
     cb();

diff --git a/test/base.js b/test/base.js
@@ -14,6 +14,8 @@ var Promise = require('pinkie-promise');
 var yeoman = require('yeoman-environment');
 var userHome = require('user-home');
 
+var LF = require('os').EOL;
+
 mockery.enable({
   warnOnReplace: false,
   warnOnUnregistered: false
@@ -499,7 +501,7 @@ describe('generators.Base', function () {
       });
 
       testGen.run(function () {
-        assert.equal(fs.readFileSync(filepath, 'utf8'), 'var a = 1;\n');
+        assert.equal(fs.readFileSync(filepath, 'utf8'), 'var a = 1;' + LF);
         done();
       });
     });

diff --git a/test/install.js b/test/install.js
@@ -38,7 +38,7 @@ describe('generators.Base (actions/install mixin)', function () {
         }
       };
 
-      //args: installer, paths, options, cb
+      // args: installer, paths, options, cb
       this.dummy.runInstall('nestedScript', ['path1', 'path2'], spawnEnv, callbackSpy);
       this.dummy.run(function () {
         sinon.assert.calledWithExactly(
@@ -114,7 +114,7 @@ describe('generators.Base (actions/install mixin)', function () {
       this.dummy.npmInstall();
       this.dummy.run(function () {
         sinon.assert.calledOnce(this.spawnCommandStub);
-        sinon.assert.calledWithExactly(this.spawnCommandStub, 'npm', ['install'], {});
+        sinon.assert.calledWithExactly(this.spawnCommandStub, 'npm', ['install', '--cache-min', 86400], {});
         done();
       }.bind(this));
     });
@@ -141,7 +141,7 @@ describe('generators.Base (actions/install mixin)', function () {
       this.dummy.installDependencies(function () {
         sinon.assert.calledTwice(this.spawnCommandStub);
         sinon.assert.calledWithExactly(this.spawnCommandStub, 'bower', ['install'], {});
-        sinon.assert.calledWithExactly(this.spawnCommandStub, 'npm', ['install'], {});
+        sinon.assert.calledWithExactly(this.spawnCommandStub, 'npm', ['install', '--cache-min', 86400], {});
         done();
       }.bind(this));
       this.dummy.run();