Bump inquirer (#429)

Author: SBoudrias

lib/routes/clear-config.js

@@ -48,15 +48,15 @@ module.exports = function (app) {
     });
   }
 
-  inquirer.prompt([{
+  return inquirer.prompt([{
     name: 'whatNext',
     type: 'list',
     message: 'Which store would you like to clear?',
     choices: _.flatten([
       generatorList,
       defaultChoices
     ])
-  }], function (answer) {
+  }]).then(function (answer) {
     app.insight.track('yoyo', 'clearGlobalConfig', answer);
 
     if (answer.whatNext === 'home') {

lib/routes/help.js

@@ -5,7 +5,7 @@ var opn = require('opn');
 module.exports = function (app) {
   app.insight.track('yoyo', 'help');
 
-  inquirer.prompt([{
+  return inquirer.prompt([{
     name: 'whereTo',
     type: 'list',
     message: 'Here are a few helpful resources.\n' +
@@ -23,7 +23,7 @@ module.exports = function (app) {
       name: 'Take me back home, Yo!',
       value: 'home'
     }]
-  }], function (answer) {
+  }]).then(function (answer) {
     app.insight.track('yoyo', 'help', answer);
 
     if (answer.whereTo === 'home') {

lib/routes/home.js

@@ -53,10 +53,10 @@ module.exports = function (app) {
 
   app.insight.track('yoyo', 'home');
 
-  fullname().then(function (name) {
+  return fullname().then(function (name) {
     var allo = name ? '\'Allo ' + name.split(' ')[0] + '! ' : '\'Allo! ';
 
-    inquirer.prompt([{
+    return inquirer.prompt([{
       name: 'whatNext',
       type: 'list',
       message: allo + 'What would you like to do?',
@@ -67,7 +67,7 @@ module.exports = function (app) {
         defaultChoices,
         new inquirer.Separator()
       ])
-    }], function (answer) {
+    }]).then(function (answer) {
       if (answer.whatNext.method === 'run') {
         app.navigate('run', answer.whatNext.generator);
         return;

lib/routes/install.js

@@ -1,8 +1,10 @@
 'use strict';
+var _ = require('lodash');
 var async = require('async');
 var chalk = require('chalk');
 var inquirer = require('inquirer');
 var spawn = require('cross-spawn');
+var Promise = require('pinkie-promise');
 var sortOn = require('sort-on');
 var figures = require('figures');
 var npmKeyword = require('npm-keyword');
@@ -32,49 +34,28 @@ var OFFICIAL_GENERATORS = [
 module.exports = function (app) {
   app.insight.track('yoyo', 'install');
 
-  inquirer.prompt([{
+  return inquirer.prompt([{
     name: 'searchTerm',
     message: 'Search npm for generators:'
-  }], function (answers) {
-    searchNpm(app, answers.searchTerm, function (err) {
-      if (err) {
-        throw err;
-      }
-    });
+  }]).then(function (answers) {
+    return searchNpm(app, answers.searchTerm);
   });
 };
 
-var getAllGenerators = (function () {
-  var allGenerators;
-
-  return function (cb) {
-    if (allGenerators) {
-      return cb(null, allGenerators);
-    }
-
-    npmKeyword('yeoman-generator').then(function (packages) {
-      cb(null, packages.map(function (el) {
-        el.match = function (term) {
-          return (el.name + ' ' + el.description).indexOf(term) >= 0;
-        };
+function generatorMatchTerm(generator, term) {
+  return (generator.name + ' ' + generator.description).indexOf(term) >= 0;
+}
 
-        return el;
-      }));
-    }).catch(cb);
-  };
-})();
+var getAllGenerators = _.memoize(function () {
+  return npmKeyword('yeoman-generator');
+});
 
 function searchMatchingGenerators(app, term, cb) {
   got('yeoman.io/blacklist.json', {json: true}, function (err, data) {
     var blacklist = err ? [] : data;
     var installedGenerators = app.env.getGeneratorNames();
 
-    getAllGenerators(function (err2, allGenerators) {
-      if (err2) {
-        cb(err2);
-        return;
-      }
-
+    getAllGenerators().then(function (allGenerators) {
       cb(null, allGenerators.filter(function (generator) {
         if (blacklist.indexOf(generator.name) !== -1) {
           return false;
@@ -84,9 +65,9 @@ function searchMatchingGenerators(app, term, cb) {
           return false;
         }
 
-        return generator.match(term);
+        return generatorMatchTerm(generator, term);
       }));
-    });
+    }, cb);
   });
 }
 
@@ -105,23 +86,28 @@ function fetchGeneratorInfo(generator, cb) {
   }).catch(cb);
 }
 
-function searchNpm(app, term, cb) {
-  searchMatchingGenerators(app, term, function (err, matches) {
-    if (err) {
-      cb(err);
-      return;
-    }
-
-    async.map(matches, fetchGeneratorInfo, function (err2, choices) {
-      if (err2) {
-        cb(err2);
+function searchNpm(app, term) {
+  var promise = new Promise(function (resolve, reject) {
+    searchMatchingGenerators(app, term, function (err, matches) {
+      if (err) {
+        reject(err);
         return;
       }
 
-      promptInstallOptions(app, sortOn(choices, ['official', 'name']));
-      cb();
+      async.map(matches, fetchGeneratorInfo, function (err2, choices) {
+        if (err2) {
+          reject(err2);
+          return;
+        }
+
+        resolve(choices);
+      });
     });
   });
+
+  return promise.then(function (choices) {
+    return promptInstallOptions(app, sortOn(choices, ['official', 'name']));
+  });
 }
 
 function promptInstallOptions(app, choices) {
@@ -144,7 +130,7 @@ function promptInstallOptions(app, choices) {
     }])
   }];
 
-  inquirer.prompt(resultsPrompt, function (answer) {
+  return inquirer.prompt(resultsPrompt).then(function (answer) {
     if (answer.toInstall === 'home' || answer.toInstall === 'install') {
       return app.navigate(answer.toInstall);
     }

lib/routes/update.js

@@ -23,7 +23,7 @@ function updateGenerators(app, pkgs) {
 
 module.exports = function (app) {
   app.insight.track('yoyo', 'update');
-  inquirer.prompt([{
+  return inquirer.prompt([{
     name: 'generators',
     message: 'Generators to update',
     type: 'checkbox',
@@ -36,7 +36,7 @@ module.exports = function (app) {
         checked: true
       };
     })
-  }], function (answer) {
+  }]).then(function (answer) {
     updateGenerators(app, answer.generators);
   });
 };

package.json

@@ -50,14 +50,15 @@
     "fullname": "^2.0.0",
     "got": "^5.0.0",
     "humanize-string": "^1.0.0",
-    "inquirer": "^0.11.0",
+    "inquirer": "^1.0.2",
     "insight": "^0.7.0",
     "lodash": "^3.2.0",
     "meow": "^3.0.0",
     "npm-keyword": "^4.1.0",
     "opn": "^3.0.2",
     "package-json": "^2.1.0",
     "parse-help": "^0.1.1",
+    "pinkie-promise": "^2.0.1",
     "read-pkg-up": "^1.0.1",
     "repeating": "^2.0.0",
     "root-check": "^1.0.0",
@@ -77,7 +78,7 @@
     "gulp-coveralls": "^0.1.0",
     "gulp-eslint": "^2.0.0",
     "gulp-exclude-gitignore": "^1.0.0",
-    "gulp-istanbul": "^0.10.4",
+    "gulp-istanbul": "^1.0.0",
     "gulp-mocha": "^2.0.0",
     "gulp-nsp": "^2.1.0",
     "gulp-plumber": "^1.0.0",

test/cli.js

@@ -53,11 +53,16 @@ describe('bin', function () {
   });
 
   it('should return the version', function (cb) {
-    var cp = execFile('node', [path.join(__dirname, '../', pkg.bin.yo), '--version', '--no-insight', '--no-update-notifier']);
+    var cp = execFile('node', [
+      path.join(__dirname, '../', pkg.bin.yo),
+      '--version',
+      '--no-insight',
+      '--no-update-notifier'
+    ]);
     var expected = pkg.version;
 
     cp.stdout.on('data', function (data) {
-      assert.equal(data.replace(/\r\n|\n/g, ''), expected);
+      assert.equal(data.toString().replace(/\r\n|\n/g, ''), expected);
       cb();
     });
   });

test/route-clear-config.js

@@ -3,6 +3,7 @@ var assert = require('assert');
 var proxyquire = require('proxyquire');
 var sinon = require('sinon');
 var _ = require('lodash');
+var Promise = require('pinkie-promise');
 var inquirer = require('inquirer');
 var Router = require('../lib/router');
 var helpers = require('./helpers');
@@ -56,56 +57,59 @@ describe('clear config route', function () {
   });
 
   it('allow returning home', function () {
-    this.sandbox.stub(inquirer, 'prompt', function (arg, cb) {
-      cb({whereTo: 'home'});
-    });
-    this.router.navigate('clearConfig');
-    sinon.assert.calledOnce(this.homeRoute);
+    this.sandbox.stub(inquirer, 'prompt').returns(Promise.resolve({whatNext: 'home'}));
+    return this.router.navigate('clearConfig').then(function () {
+      sinon.assert.calledOnce(this.homeRoute);
+    }.bind(this));
   });
 
   it('track page and answer', function () {
-    this.sandbox.stub(inquirer, 'prompt', function (arg, cb) {
-      cb({whatNext: 'generator-angular:0.0.0'});
-    });
-    this.router.navigate('clearConfig');
-    sinon.assert.calledWith(this.insight.track, 'yoyo', 'clearGlobalConfig');
-    sinon.assert.calledWith(this.insight.track, 'yoyo', 'clearGlobalConfig', {whatNext: 'generator-angular:0.0.0'});
+    this.sandbox.stub(inquirer, 'prompt').returns(
+      Promise.resolve({whatNext: 'generator-angular:0.0.0'})
+    );
+    return this.router.navigate('clearConfig').then(function () {
+      sinon.assert.calledWith(this.insight.track, 'yoyo', 'clearGlobalConfig');
+      sinon.assert.calledWith(
+        this.insight.track,
+        'yoyo',
+        'clearGlobalConfig',
+        {whatNext: 'generator-angular:0.0.0'}
+      );
+    }.bind(this));
   });
 
   it('allows clearing a generator and return user to home screen', function () {
-    this.sandbox.stub(inquirer, 'prompt', function (arg, cb) {
-      cb({whatNext: 'foo'});
-    });
-    this.router.navigate('clearConfig');
-    sinon.assert.calledOnce(this.globalConfig.remove);
-    sinon.assert.calledWith(this.globalConfig.remove, 'foo');
-    sinon.assert.calledOnce(this.homeRoute);
+    this.sandbox.stub(inquirer, 'prompt').returns(Promise.resolve({whatNext: 'foo'}));
+    this.router.navigate('clearConfig').then(function () {
+      sinon.assert.calledOnce(this.globalConfig.remove);
+      sinon.assert.calledWith(this.globalConfig.remove, 'foo');
+      sinon.assert.calledOnce(this.homeRoute);
+    }.bind(this));
   });
 
   it('allows clearing all generators and return user to home screen', function () {
-    this.sandbox.stub(inquirer, 'prompt', function (arg, cb) {
-      cb({whatNext: '*'});
-    });
-    this.router.navigate('clearConfig');
-    sinon.assert.calledOnce(this.globalConfig.removeAll);
-    sinon.assert.calledOnce(this.homeRoute);
+    this.sandbox.stub(inquirer, 'prompt').returns(Promise.resolve({whatNext: '*'}));
+    return this.router.navigate('clearConfig').then(function () {
+      sinon.assert.calledOnce(this.globalConfig.removeAll);
+      sinon.assert.calledOnce(this.homeRoute);
+    }.bind(this));
   });
 
   it('shows generator with global config entry', function () {
     var choices = [];
 
-    this.sandbox.stub(inquirer, 'prompt', function (arg, cb) {
+    this.sandbox.stub(inquirer, 'prompt', function (arg) {
       choices = arg[0].choices;
-      cb({whatNext: 'foo'});
+      return Promise.resolve({whatNext: 'foo'});
     });
-    this.router.navigate('clearConfig');
-
-    // Clear all generators entry is present
-    assert.ok(_.find(choices, {value: '*'}));
+    return this.router.navigate('clearConfig').then(function () {
+      // Clear all generators entry is present
+      assert.ok(_.find(choices, {value: '*'}));
 
-    assert.ok(_.find(choices, {value: 'generator-unicorn'}));
-    assert.ok(_.find(choices, {value: 'generator-phoenix'}));
-    assert.ok(_.find(choices, {name: 'Unicorn'}));
-    assert.ok(_.find(choices, {name: 'phoenix\u001b[31m (not installed anymore)\u001b[39m'}));
+      assert.ok(_.find(choices, {value: 'generator-unicorn'}));
+      assert.ok(_.find(choices, {value: 'generator-phoenix'}));
+      assert.ok(_.find(choices, {name: 'Unicorn'}));
+      assert.ok(_.find(choices, {name: 'phoenix\u001b[31m (not installed anymore)\u001b[39m'}));
+    });
   });
 });