yeoman-generator 2.0.1 → 2.0.5

package/lib/actions/help.js

@@ -70,11 +70,11 @@ help.usage = function () {
   let args = '';
 
   if (this._arguments.length > 0) {
-    args = this._arguments.map(formatArg).join(' ');
+    args = this._arguments.map(formatArg).join(' ') + ' ';
   }
 
   name = name.replace(/^yeoman:/, '');
-  let out = `yo ${name} ${options} ${args}`;
+  let out = `yo ${name} ${args}${options}`;
 
   if (this.description) {
     out += '\n\n' + this.description;

package/lib/actions/install.js

@@ -46,6 +46,7 @@ install.runInstall = function (installer, paths, options, spawnOptions) {
 
     // Return early if we're skipping installation
     if (this.options.skipInstall) {
+      this.log('Skipping install command: ' + chalk.yellow(installer + ' ' + args.join(' ')));
       return resolve();
     }
 
@@ -53,9 +54,10 @@ install.runInstall = function (installer, paths, options, spawnOptions) {
       this.emit(`${installer}Install`, paths);
       this.spawnCommand(installer, args, spawnOptions)
         .on('error', err => {
-          console.log(chalk.red('Could not finish installation. \n') +
+          this.log(chalk.red('Could not finish installation. \n') +
             'Please install ' + installer + ' with ' +
-            chalk.yellow('npm install -g ' + installer) + ' and try again.'
+            chalk.yellow('npm install -g ' + installer) + ' and try again. \n' +
+            'If ' + installer + ' is already installed, try running the following command manually: ' + chalk.yellow(installer + ' ' + args.join(' '))
           );
           reject(err);
           done();
@@ -190,7 +192,7 @@ install.npmInstall = function (pkgs, options, spawnOptions) {
 };
 
 /**
- * Receives a list of `packages` and an `options` object to install through npm.
+ * Receives a list of `packages` and an `options` object to install through yarn.
  *
  * The installation will automatically run during the run loop `install` phase.
  *

package/lib/index.js

@@ -90,7 +90,7 @@ class Generator extends EventEmitter {
       default: false
     });
 
-    // Checks required paramaters
+    // Checks required parameters
     assert(this.options.env, 'You must provide the environment object. Use env#create() to create a new generator.');
     assert(this.options.resolved, 'You must provide the resolved path value. Use env#create() to create a new generator.');
     this.env = this.options.env;
@@ -481,7 +481,7 @@ class Generator extends EventEmitter {
     let generator;
     options = options || {};
 
-    // Pass down the default options so they're correclty mirrored down the chain.
+    // Pass down the default options so they're correctly mirrored down the chain.
     options = _.extend({
       skipInstall: this.options.skipInstall,
       'skip-install': this.options.skipInstall,

package/lib/util/prompt-suggestion.js

@@ -115,7 +115,9 @@ promptSuggestion.prefillQuestions = (store, questions) => {
 
     const storedValue = promptValues[question.name];
 
-    if (storedValue === undefined) {
+    if ((storedValue === undefined) || _.isFunction(question.choices)) {
+      // Do not override prompt default when question.choices is a function,
+      // since can't guarantee that the `storedValue` will even be in the returned choices
       return question;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-generator",
-  "version": "2.0.1",
+  "version": "2.0.5",
   "description": "Rails-inspired generator system that provides scaffolding for your apps",
   "license": "BSD-2-Clause",
   "repository": "yeoman/generator",
@@ -14,7 +14,6 @@
     "pretest": "xo",
     "test": "nyc mocha",
     "doc": "jsdoc -c jsdoc.json",
-    "prepublish": "nsp check",
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
   "files": [
@@ -34,46 +33,46 @@
     "app"
   ],
   "dependencies": {
-    "async": "^2.5.0",
-    "chalk": "^2.1.0",
+    "async": "^2.6.0",
+    "chalk": "^2.3.0",
     "cli-table": "^0.3.1",
-    "cross-spawn": "^5.1.0",
+    "cross-spawn": "^6.0.5",
     "dargs": "^5.1.0",
-    "dateformat": "^3.0.2",
+    "dateformat": "^3.0.3",
     "debug": "^3.1.0",
     "detect-conflict": "^1.0.0",
     "error": "^7.0.2",
     "find-up": "^2.1.0",
     "github-username": "^4.0.0",
-    "istextorbinary": "^2.1.0",
-    "lodash": "^4.11.1",
-    "make-dir": "^1.0.0",
-    "mem-fs-editor": "^3.0.0",
+    "istextorbinary": "^2.2.1",
+    "lodash": "^4.17.10",
+    "make-dir": "^1.1.0",
+    "mem-fs-editor": "^4.0.0",
     "minimist": "^1.2.0",
     "pretty-bytes": "^4.0.2",
     "read-chunk": "^2.1.0",
-    "read-pkg-up": "^2.0.0",
+    "read-pkg-up": "^3.0.0",
     "rimraf": "^2.6.2",
     "run-async": "^2.0.0",
-    "shelljs": "^0.7.8",
+    "shelljs": "^0.8.0",
     "text-table": "^0.2.0",
     "through2": "^2.0.0",
-    "yeoman-environment": "^2.0.3"
+    "yeoman-environment": "^2.0.5"
   },
   "devDependencies": {
     "coveralls": "^3.0.0",
-    "inquirer": "^3.3.0",
+    "inquirer": "^5.2.0",
     "jsdoc": "^3.5.5",
-    "mocha": "^3.5.3",
+    "mocha": "^5.1.1",
     "mockery": "^2.1.0",
-    "nock": "^9.0.22",
-    "nsp": "^2.8.1",
-    "nyc": "^11.2.1",
-    "proxyquire": "^1.8.0",
-    "sinon": "^4.0.0",
+    "nock": "^9.1.6",
+    "nsp": "^3.2.1",
+    "nyc": "^11.4.1",
+    "proxyquire": "^2.0.1",
+    "sinon": "^4.5.0",
     "tui-jsdoc-template": "^1.2.2",
-    "xo": "^0.18.1",
-    "yeoman-assert": "^3.1.0",
+    "xo": "^0.20.3",
+    "yeoman-assert": "^3.1.1",
     "yeoman-test": "^1.7.0"
   },
   "xo": {