.eslintrc

@@ -43,21 +43,6 @@
       2,
       "single"
     ],
-    "space-after-keywords": [
-      2,
-      "always"
-    ],
-    "space-before-function-paren": [
-      2,
-      {
-        "anonymous": "always",
-        "named": "never"
-      }
-    ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
     "strict": [
       2,
       "global"
@@ -67,6 +52,7 @@
       "all"
     ],
     "eol-last": 2,
+    "keyword-spacing": 2,
     "key-spacing": [
       2,
       {
@@ -89,7 +75,6 @@
     ],
     "no-alert": 2,
     "no-caller": 2,
-    "no-empty-label": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
     "no-implied-eval": 2,
@@ -128,7 +113,6 @@
         "before": false,
         "after": true
       }
-    ],
-    "space-return-throw-case": 2
+    ]
   }
 }

.travis.yml

@@ -5,3 +5,4 @@ node_js:
   - v0.12
   - v4
   - v5
+  - v6

lib/actions/actions.js

@@ -6,23 +6,13 @@ var glob = require('glob');
 var istextorbinary = require('istextorbinary');
 var mkdirp = require('mkdirp');
 var readChunk = require('read-chunk');
-var xdgBasedir = require('xdg-basedir');
 
 /**
  * @mixin
  * @alias actions/actions
  */
 var actions = module.exports;
 
-/**
- * Stores and return the cache root for this class. The cache root is used to
- * `git clone` repositories from github by `.remote()` for example.
- */
-
-actions.cacheRoot = function cacheRoot() {
-  return path.join(xdgBasedir.cache, 'yeoman');
-};
-
 /**
  * Make some of the file API aware of our source/destination root paths.
  * `copy`, `template` (only when could be applied/required by legacy code),

lib/actions/install.js

@@ -124,7 +124,7 @@ install.installDependencies = function (options) {
     var tplValues = _.extend({
       skipInstall: false
     }, this.options, {
-      commands: chalk.yellow.bold(msg.commands.join(' & '))
+      commands: chalk.yellow.bold(msg.commands.join(' && '))
     });
     this.log(msg.template(tplValues));
   }

lib/actions/user.js

@@ -27,7 +27,7 @@ user.git.name = function () {
   }
 
   if (shell.which('git')) {
-    name = shell.exec('git config --get user.name', { silent: true }).output.trim();
+    name = shell.exec('git config --get user.name', { silent: true }).stdout.trim();
     nameCache[process.cwd()] = name;
   }
 
@@ -47,7 +47,7 @@ user.git.email = function () {
   }
 
   if (shell.which('git')) {
-    email = shell.exec('git config --get user.email', { silent: true }).output.trim();
+    email = shell.exec('git config --get user.email', { silent: true }).stdout.trim();
     emailCache[process.cwd()] = email;
   }
 

lib/base.js

@@ -192,14 +192,22 @@ util.inherits(Base, events.EventEmitter);
 
 // Mixin the actions modules
 _.extend(Base.prototype, require('./actions/actions'));
-_.extend(Base.prototype, require('./actions/fetch'));
 _.extend(Base.prototype, require('./actions/file'));
 _.extend(Base.prototype, require('./actions/install'));
-_.extend(Base.prototype, require('./actions/remote'));
-_.extend(Base.prototype, deprecate.object('this.<%= name %>() is deprecated. Use require("html-wiring").<%= name %>() instead.', wiring));
 _.extend(Base.prototype, require('./actions/help'));
 _.extend(Base.prototype, require('./actions/spawn_command'));
 
+// Deprecated modules and functions
+_.extend(Base.prototype, deprecate.object('this.<%= name %>() is deprecated. Use require("html-wiring").<%= name %>() instead.', wiring));
+var deprecatedRemote = function () {
+  deprecate.log('Remotes functions are deprecated. See https://github.com/yeoman/generator/issues/949 for update guide.');
+};
+Base.prototype.remote = deprecatedRemote;
+Base.prototype.remoteDir = deprecatedRemote;
+Base.prototype.fetch = deprecatedRemote;
+Base.prototype.extract = deprecatedRemote;
+Base.prototype.tarball = deprecatedRemote;
+
 Base.prototype.user = require('./actions/user');
 Base.prototype.invoke = deprecate(
   'generator#invoke() is deprecated. Use generator#composeWith() - see http://yeoman.io/authoring/composability.html',
@@ -223,24 +231,20 @@ Base.prototype.welcome = deprecate(
  * user's answers as defaults.
  *
  * @param  {array} questions  Array of question descriptor objects. See {@link https://github.com/SBoudrias/Inquirer.js/blob/master/README.md Documentation}
- * @param  {Function} callback  Receive a question object
- * @return {this}
+ * @return {Promise}
  */
 
-Base.prototype.prompt = function (questions, callback) {
+Base.prototype.prompt = function (questions) {
   questions = promptSuggestion.prefillQuestions(this._globalConfig, questions);
 
-  this.env.adapter.prompt(questions, function (answers) {
+  return this.env.adapter.prompt(questions).then(function (answers) {
     if (!this.options['skip-cache']) {
       promptSuggestion.storeAnswers(this._globalConfig, questions, answers);
     }
 
-    if (_.isFunction(callback)) {
-      callback(answers);
-    }
+    return answers;
   }.bind(this));
 
-  return this;
 };
 
 /**
@@ -427,29 +431,22 @@ Base.prototype.run = function run(cb) {
       debug('Running ' + methodName);
       self.emit('method:' + methodName);
 
-      runAsync(
-        function () {
-          self.async = function () {
-            return this.async();
-          }.bind(this);
-
-          return method.apply(self, self.args);
-        },
-        // runAsync return a promise which wraps first function.
-        // So ensure the callback function never throw an error.
-        function (err) {
-          if (err) {
-            debug('An error occured while running ' + methodName, err);
-            if (self.listeners('error').length > 0) {
-              self.emit('error', err);
-            }
-            cb(err);
-            return;
-          }
-
-          completed();
-        }
-      )();
+      runAsync(function () {
+        self.async = function () {
+          return this.async();
+        }.bind(this);
+
+        return method.apply(self, self.args);
+      })().then(completed).catch(function (err) {
+        debug('An error occured while running ' + methodName, err);
+
+        // Ensure we emit the error event outside the promise context so it won't be
+        // swallowed when there's no listeners.
+        setImmediate(function () {
+          self.emit('error', err);
+          cb(err);
+        });
+      });
     });
   }
 
@@ -504,7 +501,7 @@ Base.prototype.run = function run(cb) {
     this.runHooks();
   });
 
-  _.invoke(this._composedWith, 'run');
+  _.invokeMap(this._composedWith, 'run');
   return this;
 };
 

lib/util/prompt-suggestion.js

@@ -58,7 +58,7 @@ var getListDefault = function (question, defaultValue) {
  * @private
  */
 var storeListAnswer = function (question, answer) {
-  var choiceValues = _.pluck(question.choices, 'value');
+  var choiceValues = _.map(question.choices, 'value');
   var choiceIndex = choiceValues.indexOf(answer);
 
   // Check if answer is not equal to default value

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-generator",
-  "version": "0.22.6",
+  "version": "0.24.1",
   "description": "Rails-inspired generator system that provides scaffolding for your apps",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -32,41 +32,38 @@
     "prepublish": "gulp prepublish"
   },
   "dependencies": {
-    "async": "^1.4.2",
+    "async": "^2.0.0",
     "chalk": "^1.0.0",
     "class-extend": "^0.1.0",
     "cli-table": "^0.3.1",
-    "cross-spawn": "^2.0.0",
+    "cross-spawn": "^4.0.0",
     "dargs": "^4.0.0",
     "dateformat": "^1.0.11",
     "debug": "^2.1.0",
     "detect-conflict": "^1.0.0",
-    "download": "^4.1.2",
     "error": "^7.0.2",
     "find-up": "^1.0.0",
     "github-username": "^2.0.0",
-    "glob": "^6.0.1",
+    "glob": "^7.0.3",
     "gruntfile-editor": "^1.0.0",
     "html-wiring": "^1.0.0",
-    "inquirer": "^0.11.0",
-    "istextorbinary": "^1.0.2",
-    "lodash": "^3.5.0",
+    "istextorbinary": "^2.1.0",
+    "lodash": "^4.11.1",
     "mem-fs-editor": "^2.0.0",
     "mkdirp": "^0.5.0",
     "nopt": "^3.0.0",
     "path-exists": "^2.0.0",
     "path-is-absolute": "^1.0.0",
-    "pretty-bytes": "^2.0.1",
-    "read-chunk": "^1.0.1",
+    "pretty-bytes": "^3.0.1",
+    "read-chunk": "^1.0.0",
     "read-pkg-up": "^1.0.1",
     "rimraf": "^2.2.0",
     "run-async": "^2.0.0",
-    "shelljs": "^0.5.0",
+    "shelljs": "^0.7.0",
     "text-table": "^0.2.0",
     "through2": "^2.0.0",
     "underscore.string": "^3.0.3",
     "user-home": "^2.0.0",
-    "xdg-basedir": "^2.0.0",
     "yeoman-assert": "^2.0.0",
     "yeoman-environment": "^1.1.0",
     "yeoman-test": "^1.0.0",
@@ -75,15 +72,16 @@
   "devDependencies": {
     "gulp": "^3.6.0",
     "gulp-coveralls": "^0.1.0",
-    "gulp-eslint": "^1.0.0",
+    "gulp-eslint": "^2.0.0",
     "gulp-exclude-gitignore": "^1.0.0",
-    "gulp-istanbul": "^0.10.0",
+    "gulp-istanbul": "^1.0.0",
     "gulp-mocha": "^2.0.0",
     "gulp-nsp": "^2.1.0",
     "gulp-plumber": "^1.0.0",
+    "inquirer": "^1.0.2",
     "jsdoc": "^3.3.0-beta1",
     "mockery": "^1.4.0",
-    "nock": "^3.3.2",
+    "nock": "^8.0.0",
     "pinkie-promise": "^2.0.0",
     "proxyquire": "^1.0.0",
     "sinon": "^1.9.1"

test/actions.js

@@ -46,12 +46,6 @@ describe('generators.Base (actions/actions)', function () {
     });
   });
 
-  describe('#cacheRoot()', function () {
-    it('returns the cache root where yeoman stores all temp files', function () {
-      assert(/yeoman$/.test(this.dummy.cacheRoot()));
-    });
-  });
-
   describe('#copy()', function () {
     beforeEach(function (done) {
       this.dummy.copy(path.join(__dirname, 'fixtures/foo.js'), 'write/to/bar.js');

test/base.js

@@ -319,23 +319,6 @@ describe('generators.Base', function () {
       this.testGen.on('error', sinon.spy());
       this.testGen.run(function (err) {
         assert.equal(err, error);
-        sinon.assert.notCalled(spy);
-        done();
-      });
-    });
-
-    it('stop queue processing once an error is thrown and "error" event has no listeners', function (done) {
-      var error = new Error();
-      var spy = sinon.spy();
-
-      this.TestGenerator.prototype.throwing = function () {
-        throw error;
-      };
-      this.TestGenerator.prototype.afterError = spy;
-
-      this.testGen.run(function (err) {
-        assert.equal(err, error);
-        sinon.assert.notCalled(spy);
         done();
       });
     });
@@ -788,6 +771,7 @@ describe('generators.Base', function () {
       // generator before the base one is ran.
       setTimeout(function () {
         this.dummy.run(function () {
+          sinon.assert.callOrder(runSpy, this.spy);
           assert(this.spy.calledAfter(runSpy));
           done();
         }.bind(this));

test/conflicter.js

@@ -123,7 +123,7 @@ describe('Conflicter', function () {
         contents: null
       }, function () {
         assert.equal(
-          _.where(spy.firstCall.args[0][0].choices, { value: 'diff' }).length,
+          _.filter(spy.firstCall.args[0][0].choices, { value: 'diff' }).length,
           0
         );
         done();