Bump yeoman-generator to v1.0 (#249)

* Use yarn

* Bump to yeoman-generator 1.0

.travis.yml

@@ -2,5 +2,7 @@ sudo: false
 language: node_js
 node_js:
   - 4
-  - 5
   - 6
+  - node
+cache:
+  yarn: true

README.md

@@ -65,12 +65,10 @@ $ npm publish
 First of all, make sure you're comfortable with [Yeoman composability](http://yeoman.io/authoring/composability.html) feature. Then in your own generator:
 
 ```js
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   default: function () {
-    this.composeWith('node:app', {
-      options: {/* provide the options you want */}
-    }, {
-      local: require.resolve('generator-node/generators/app')
+    this.composeWith(require.resolve('generator-node/generators/app'), {
+      /* provide the options you want */
     });
   }
 });

generators/app/index.js

@@ -1,27 +1,27 @@
 'use strict';
 var _ = require('lodash');
 var extend = _.merge;
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 var parseAuthor = require('parse-author');
 var githubUsername = require('github-username');
 var path = require('path');
 var askName = require('inquirer-npm-name');
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('travis', {
       type: Boolean,
       required: false,
-      defaults: true,
+      default: true,
       desc: 'Include travis config'
     });
 
     this.option('boilerplate', {
       type: Boolean,
       required: false,
-      defaults: true,
+      default: true,
       desc: 'Include boilerplate files'
     });
 
@@ -34,7 +34,7 @@ module.exports = generators.Base.extend({
     this.option('cli', {
       type: Boolean,
       required: false,
-      defaults: false,
+      default: false,
       desc: 'Add a CLI'
     });
 
@@ -47,14 +47,14 @@ module.exports = generators.Base.extend({
     this.option('gulp', {
       type: Boolean,
       required: false,
-      defaults: true,
+      default: true,
       desc: 'Include or not a gulpfile.js'
     });
 
     this.option('license', {
       type: Boolean,
       required: false,
-      defaults: true,
+      default: true,
       desc: 'Include a license'
     });
 
@@ -73,7 +73,7 @@ module.exports = generators.Base.extend({
     this.option('projectRoot', {
       type: String,
       required: false,
-      defaults: 'lib',
+      default: 'lib',
       desc: 'Relative path to the project code root'
     });
 
@@ -237,91 +237,59 @@ module.exports = generators.Base.extend({
 
   default: function () {
     if (this.options.travis) {
-      this.composeWith('travis', {}, {
-        local: require.resolve('generator-travis/generators/app')
-      });
+      this.composeWith(require.resolve('generator-travis/generators/app'));
     }
 
-    this.composeWith('node:editorconfig', {}, {
-      local: require.resolve('../editorconfig')
-    });
+    this.composeWith(require.resolve('../editorconfig'));
 
-    this.composeWith('node:eslint', {
-      options: {
-        es2015: this.props.babel
-      }
-    }, {
-      local: require.resolve('../eslint')
+    this.composeWith(require.resolve('../eslint'), {
+      es2015: this.props.babel
     });
 
-    this.composeWith('node:git', {
-      options: {
-        name: this.props.name,
-        githubAccount: this.props.githubAccount
-      }
-    }, {
-      local: require.resolve('../git')
+    this.composeWith(require.resolve('../git'), {
+      name: this.props.name,
+      githubAccount: this.props.githubAccount
     });
 
     if (this.options.gulp) {
-      this.composeWith('node:gulp', {
-        options: {
-          coveralls: this.props.includeCoveralls,
-          babel: this.props.babel,
-          projectRoot: this.options.projectRoot,
-          cli: this.options.cli
-        }
-      }, {
-        local: require.resolve('../gulp')
+      this.composeWith(require.resolve('../gulp'), {
+        coveralls: this.props.includeCoveralls,
+        babel: this.props.babel,
+        projectRoot: this.options.projectRoot,
+        cli: this.options.cli
       });
     }
 
     if (this.options.boilerplate) {
-      this.composeWith('node:boilerplate', {
-        options: {
-          name: this.props.name,
-          babel: this.props.babel
-        }
-      }, {
-        local: require.resolve('../boilerplate')
+      this.composeWith(require.resolve('../boilerplate'), {
+        name: this.props.name,
+        babel: this.props.babel
       });
     }
 
     if (this.options.cli) {
-      this.composeWith('node:cli', {
-        options: {
-          babel: this.props.babel
-        }
-      }, {
-        local: require.resolve('../cli')
+      this.composeWith(require.resolve('../cli'), {
+        babel: this.props.babel
       });
     }
 
     if (this.options.license && !this.pkg.license) {
-      this.composeWith('license', {
-        options: {
-          name: this.props.authorName,
-          email: this.props.authorEmail,
-          website: this.props.authorUrl
-        }
-      }, {
-        local: require.resolve('generator-license/app')
+      this.composeWith(require.resolve('generator-license/app'), {
+        name: this.props.authorName,
+        email: this.props.authorEmail,
+        website: this.props.authorUrl
       });
     }
 
     if (!this.fs.exists(this.destinationPath('README.md'))) {
-      this.composeWith('node:readme', {
-        options: {
-          name: this.props.name,
-          description: this.props.description,
-          githubAccount: this.props.githubAccount,
-          authorName: this.props.authorName,
-          authorUrl: this.props.authorUrl,
-          coveralls: this.props.includeCoveralls,
-          content: this.options.readme
-        }
-      }, {
-        local: require.resolve('../readme')
+      this.composeWith(require.resolve('../readme'), {
+        name: this.props.name,
+        description: this.props.description,
+        githubAccount: this.props.githubAccount,
+        authorName: this.props.authorName,
+        authorUrl: this.props.authorUrl,
+        coveralls: this.props.includeCoveralls,
+        content: this.options.readme
       });
     }
   },

generators/boilerplate/index.js

@@ -1,26 +1,27 @@
 'use strict';
 var _ = require('lodash');
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('generateInto', {
       type: String,
       required: false,
-      defaults: '',
+      default: '',
       desc: 'Relocate the location of the generated files.'
     });
 
     this.option('name', {
+      type: String,
       required: true,
       desc: 'The new module name.'
     });
 
     this.option('babel', {
       required: false,
-      defaults: false,
+      default: false,
       desc: 'Compile ES2015 using Babel'
     });
   },

generators/cli/index.js

@@ -1,11 +1,11 @@
 'use strict';
 var _ = require('lodash');
 var extend = _.merge;
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('generateInto', {
       type: String,

generators/editorconfig/index.js

@@ -1,9 +1,9 @@
 'use strict';
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('generateInto', {
       type: String,

generators/eslint/index.js

@@ -1,10 +1,10 @@
 'use strict';
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 var extend = require('lodash').merge;
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('generateInto', {
       type: String,

generators/git/index.js

@@ -1,10 +1,10 @@
 'use strict';
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 var originUrl = require('git-remote-origin-url');
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('generateInto', {
       type: String,

generators/gulp/index.js

@@ -1,11 +1,11 @@
 'use strict';
 var path = require('path');
 var extend = require('lodash').merge;
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('generateInto', {
       type: String,

generators/readme/index.js

@@ -1,10 +1,10 @@
 'use strict';
 var _ = require('lodash');
-var generators = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 
-module.exports = generators.Base.extend({
+module.exports = Generator.extend({
   constructor: function () {
-    generators.Base.apply(this, arguments);
+    Generator.apply(this, arguments);
 
     this.option('generateInto', {
       type: String,

package.json

@@ -25,7 +25,7 @@
     "inquirer-npm-name": "^2.0.0",
     "lodash": "^4.3.0",
     "parse-author": "^1.0.0",
-    "yeoman-generator": "^0.24.1"
+    "yeoman-generator": "^1.0.1"
   },
   "devDependencies": {
     "eslint": "^3.8.1",

test/app.js

@@ -41,11 +41,11 @@ describe('node:app', function () {
         authorName: 'The Yeoman Team',
         authorEmail: 'hi@yeoman.io',
         authorUrl: 'http://yeoman.io',
-        keywords: ['foo', 'bar']
+        keywords: ['foo', 'bar'],
+        babel: true
       };
       return helpers.run(path.join(__dirname, '../generators/app'))
-        .withPrompts(this.answers)
-        .toPromise();
+        .withPrompts(this.answers);
     });
 
     it('creates files', function () {
@@ -108,8 +108,7 @@ describe('node:app', function () {
         .on('ready', function (gen) {
           gen.fs.writeJSON(gen.destinationPath('package.json'), this.pkg);
           gen.fs.write(gen.destinationPath('README.md'), 'foo');
-        }.bind(this))
-        .toPromise();
+        }.bind(this));
     });
 
     it('extends package.json keys with missing ones', function () {
@@ -125,8 +124,7 @@ describe('node:app', function () {
   describe('--no-travis', function () {
     before(function () {
       return helpers.run(path.join(__dirname, '../generators/app'))
-        .withOptions({travis: false})
-        .toPromise();
+        .withOptions({travis: false});
     });
 
     it('skip .travis.yml', function () {
@@ -137,8 +135,7 @@ describe('node:app', function () {
   describe('--no-babel', function () {
     before(function () {
       return helpers.run(path.join(__dirname, '../generators/app'))
-        .withOptions({babel: false})
-        .toPromise();
+        .withOptions({babel: false});
     });
 
     it('skip .bablerc', function () {
@@ -156,8 +153,7 @@ describe('node:app', function () {
   describe('--projectRoot', function () {
     before(function () {
       return helpers.run(path.join(__dirname, '../generators/app'))
-        .withOptions({projectRoot: 'generators', babel: false})
-        .toPromise();
+        .withOptions({projectRoot: 'generators', babel: false});
     });
 
     it('include the raw files', function () {