Add yarnInstall method

Author: Borjagodoy

lib/actions/install.js

@@ -81,11 +81,13 @@ install.runInstall = function (installer, paths, options, cb) {
  * @param {Object} [options]
  * @param {Boolean} [options.npm=true] - whether to run `npm install`
  * @param {Boolean} [options.bower=true] - whether to run `bower install`
+ * @param {Boolean} [options.yarn=false] - whether to run `yarn install`
  * @param {Boolean} [options.skipMessage=false] - whether to log the used commands
  * @param {Function} [options.callback] - call once all commands have run
  */
 
 install.installDependencies = function (options) {
+  options = options || {};
   var commands = [];
   var msg = {
     commands: [],
@@ -101,28 +103,28 @@ install.installDependencies = function (options) {
     };
   }
 
-  options = _.defaults(options || {}, {
-    bower: true,
-    npm: true,
-    skipMessage: false,
-    callback: function () {}
-  });
-
-  if (options.npm) {
+  if (options.npm !== false) {
     msg.commands.push('npm install');
     commands.push(function (cb) {
       this.npmInstall(null, null, cb);
     }.bind(this));
   }
 
-  if (options.bower) {
+  if (options.yarn === true) {
+    msg.commands.push('yarn install');
+    commands.push(function (cb) {
+      this.yarnInstall(null, null, cb);
+    }.bind(this));
+  }
+
+  if (options.bower !== false) {
     msg.commands.push('bower install');
     commands.push(function (cb) {
       this.bowerInstall(null, null, cb);
     }.bind(this));
   }
 
-  assert(msg.commands.length, 'installDependencies needs at least one of `npm` or `bower` to run.');
+  assert(msg.commands.length, 'installDependencies needs at least one of `npm`, `bower` or `yarn` to run.');
 
   if (!options.skipMessage) {
     var tplValues = _.extend({
@@ -133,7 +135,7 @@ install.installDependencies = function (options) {
     this.log(msg.template(tplValues));
   }
 
-  async.parallel(commands, options.callback);
+  async.parallel(commands, options.callback || _.noop);
 };
 
 /**
@@ -163,3 +165,16 @@ install.bowerInstall = function install(cmpnt, options, cb) {
 install.npmInstall = function install(pkgs, options, cb) {
   return this.runInstall('npm', pkgs, options, cb);
 };
+/**
+ * Receives a list of `packages` and an `options` object to install through npm.
+ *
+ * The installation will automatically run during the run loop `install` phase.
+ *
+ * @param {String|Array} [pkgs] Packages to install
+ * @param {Object} [options] Options to pass to `child_process.spawn` when invoking npm.
+ * @param {Function} [cb]
+ */
+
+install.yarnInstall = function install(pkgs, options, cb) {
+  return this.runInstall('yarn', pkgs, options, cb);
+};

test/install.js

@@ -70,6 +70,14 @@ describe('generators.Base (actions/install mixin)', function () {
         }.bind(this));
       });
 
+      it('does not spawn anything with skipInstall', function (done) {
+        this.dummy.runInstall('yarn', ['install']);
+        this.dummy.run(function () {
+          sinon.assert.notCalled(this.spawnCommandStub);
+          done();
+        }.bind(this));
+      });
+
       it('call callback if skipInstall', function (done) {
         var spy = sinon.spy();
         this.dummy.runInstall('npm', ['install'], spy);
@@ -78,6 +86,15 @@ describe('generators.Base (actions/install mixin)', function () {
           done();
         });
       });
+
+      it('call callback if skipInstall', function (done) {
+        var spy = sinon.spy();
+        this.dummy.runInstall('yarn', ['install'], spy);
+        this.dummy.run(function () {
+          sinon.assert.calledOnce(spy);
+          done();
+        });
+      });
     });
   });
 
@@ -135,6 +152,33 @@ describe('generators.Base (actions/install mixin)', function () {
       this.dummy.run();
     });
   });
+  describe('#yarnInstall()', function () {
+    it('spawn an install process once per commands', function (done) {
+      this.dummy.yarnInstall();
+      this.dummy.yarnInstall();
+      this.dummy.run(function () {
+        sinon.assert.calledOnce(this.spawnCommandStub);
+        sinon.assert.calledWithExactly(this.spawnCommandStub, 'yarn', ['install'], {});
+        done();
+      }.bind(this));
+    });
+
+    it('run without callback', function (done) {
+      this.dummy.yarnInstall('yo', { save: true });
+      this.dummy.run(function () {
+        sinon.assert.calledOnce(this.spawnCommandStub);
+        done();
+      }.bind(this));
+    });
+
+    it('run with callback', function (done) {
+      this.dummy.yarnInstall('yo', { save: true }, function () {
+        sinon.assert.calledOnce(this.spawnCommandStub);
+        done();
+      }.bind(this));
+      this.dummy.run();
+    });
+  });
 
   describe('#installDependencies()', function () {
     it('spawn npm and bower', function (done) {
@@ -152,8 +196,13 @@ describe('generators.Base (actions/install mixin)', function () {
       this.dummy.run();
     });
 
-    it('accept and execute a function as its only argument', function (done) {
-      this.dummy.installDependencies(done);
+    it('spawn yarn', function (done) {
+      this.dummy.installDependencies({ yarn: true, npm: false, callback: function () {
+        sinon.assert.calledTwice(this.spawnCommandStub);
+        sinon.assert.calledWithExactly(this.spawnCommandStub, 'bower', ['install'], {});
+        sinon.assert.calledWithExactly(this.spawnCommandStub, 'yarn', ['install'], {});
+        done();
+      }.bind(this)});
       this.dummy.run();
     });
   });