Update to the yeoman-generator 0.16 extend inheritance method

Use Mocha spec reporter and repository short form in package.json
Update assert function

Author: corburn

app/index.js

@@ -1,46 +1,23 @@
 'use strict';
-
 var grunt = require('grunt');
-var path = require('path');
-var util = require('util');
 var yeoman = require('yeoman-generator');
 
-/**
- * Generator constructor
- *
- * @api public
- */
-
-function Generator() {
-  yeoman.generators.Base.apply(this, arguments);
-  this.pkg = JSON.parse(this.readFileAsString(path.join(__dirname, '../package.json')));
-}
-
-/**
- * Inherit from `yeoman.generators.Base`
- */
-
-util.inherits(Generator, yeoman.generators.Base);
+var GruntfileGenerator = yeoman.generators.Base.extend({
+  initializing: function () {
+    this.pkg = require('../package.json');
+  },
 
-/**
- * Prompts for information
- *
- * @api public
- */
+  prompting: function () {
+    var done = this.async();
 
-Generator.prototype.askFor = function () {
-  var self = this;
-  var cb = this.async();
+    this.log(this.yeoman);
+    this.log('This template tries to guess file and directory paths, but ' +
+                'you will most likely need to edit the generated Gruntfile.js file before ' +
+                'running grunt. _If you run grunt after generating the Gruntfile, and ' +
+                'it exits with errors, edit the file!_');
 
-  console.log(this.yeoman);
-  console.log('This template tries to guess file and directory paths, but ' +
-  'you will most likely need to edit the generated Gruntfile.js file before ' +
-  'running grunt. _If you run grunt after generating the Gruntfile, and ' +
-  'it exits with errors, edit the file!_');
 
-
-  var prompts = [
-    {
+    var prompts = [{
       type: 'checkbox',
       name: 'features',
       message: 'What more would you like?',
@@ -57,62 +34,53 @@ Generator.prototype.askFor = function () {
         value: 'packageJSON',
         checked: false
       }]
-    }
-  ];
+    }];
 
-  function prefer(arr, preferred) {
-    for (var i = 0; i < preferred.length; i++) {
-      if (arr.indexOf(preferred[i]) !== -1) {
-        return preferred[i];
+    function prefer(arr, preferred) {
+      for (var i = 0; i < preferred.length; ++i) {
+        if (arr.indexOf(preferred[i]) !== -1) {
+          return preferred[i];
+        }
       }
+      return preferred[0];
     }
 
-    return preferred[0];
-  }
-
-  var dirs = grunt.file.expand({ filter: 'isDirectory' }, '*').map(function (d) {
-    return d.slice(0, -1);
-  });
-
-  this.jquery = grunt.file.expand({ filter: 'isFile' }, '**/jquery*.js').length > 0;
-  this.libDir = prefer(dirs, ['lib', 'src']);
-  this.testDir = prefer(dirs, ['test', 'tests', 'unit', 'spec']);
+    var dirs = grunt.file.expand({ filter: 'isDirectory' }, '*').map(function (d) {
+      return d.slice(0, -1);
+    });
 
-  this.prompt(prompts, function (answers) {
-    var features = answers.features;
-
-    function hasFeature(feat) {
-      return features.indexOf(feat) !== -1;
-    }
+    this.jquery = grunt.file.expand({ filter: 'isFile' }, '**/jquery*.js').length > 0;
+    this.libDir = prefer(dirs, ['lib', 'src']);
+    this.testDir = prefer(dirs, ['test', 'tests', 'unit', 'spec']);
 
-    self.dom = hasFeature('dom');
-    self.minConcat = hasFeature('minConcat');
-    self.packageJSON = hasFeature('packageJSON');
+    this.prompt(prompts, function (answers) {
+      var features = answers.features;
 
-    self.testTask = hasFeature('dom') ? 'qunit' : 'nodeunit';
+      function hasFeature(feat) {
+        return features.indexOf(feat) !== -1;
+      }
 
-    self.fileName = hasFeature('packageJSON') ? '<%= pkg.name %>' : 'FILE_NAME';
+      this.dom = hasFeature('dom');
+      this.minConcat = hasFeature('minConcat');
+      this.packageJSON = hasFeature('packageJSON');
+      this.testTask = hasFeature('dom') ? 'qunit' : 'nodeunit';
+      this.fileName = hasFeature('packageJSON') ? '<%= pkg.name %>' : 'FILE_NAME';
 
-    cb();
-  });
-};
+      done();
+    }.bind(this));
+  },
 
-/**
- * Generate the project files
- *
- * @api public
- */
+  configuring: function () {
+    this.config.save();
+  },
 
-Generator.prototype.projectfiles = function () {
-  if (!this.packageJSON) {
-    this.template('package.json');
+  writing: function () {
+    if (!this.packageJSON) {
+      this.template('package.json');
+    }
+    this.template('gruntfile.js');
   }
-  this.template('gruntfile.js');
-};
-
-/**
- * Module exports
- */
+});
 
-module.exports = Generator;
+module.exports = GruntfileGenerator;
 

package.json

@@ -22,12 +22,9 @@
   "files": [
     "app"
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/yeoman/generator-gruntfile.git"
-  },
+  "repository": "yeoman/generator-gruntfile",
   "scripts": {
-    "test": "mocha"
+    "test": "mocha --reporter spec"
   },
   "dependencies": {
     "yeoman-generator": "~0.16.0",
@@ -40,8 +37,7 @@
     "yo": ">=1.0.0"
   },
   "engines": {
-    "node": ">=0.10.0",
-    "npm": ">=1.2.10"
+    "node": ">=0.10.0"
   },
   "licenses": [
     {

test/test.js

@@ -26,7 +26,7 @@ describe('gruntfile:app', function () {
     });
 
     generator.run({}, function () {
-      helpers.assertFiles(expected);
+      helpers.assertFile(expected);
       cb();
     });
   });