Merge pull request #12 from cameronjroe/master

Fixed broken generator with passing tests

Author: heldr

app/index.js

@@ -1,29 +1,42 @@
 var fs = require('fs');
 var path = require('path');
 var chalk = require('chalk');
+var yeoman = require('yeoman-generator');
+var util = require('util');
 
-var Generator = module.exports = function() {
-  var prompts = [];
-  var files   = this.expandFiles('**/*', { cwd: this.sourceRoot(), dot: true });
-  var ignores = [
-    '.git',
-    'LICENSE',
-    'README.md',
-  ];
+module.exports = yeoman.generators.Base.extend({
 
-  this.package = JSON.parse(this.readFileAsString(path.join(__dirname, '../package.json')));
+	constructor: function () {
+		yeoman.generators.Base.apply(this, arguments);
 
-  this.log.writeln('Generating from ' + chalk.cyan('jQuery Boilerplate') + ' v' + chalk.cyan(this.package.version) + '...');
+	},
 
-  files.forEach(function(file) {
-    if (ignores.indexOf(file) !== -1) {
-      return;
-    }
+	install: function () {
+		var prompts = [];
 
-    this.copy(file, file);
-  }, this);
+		this.name = 'jQuery Boilerplate';
 
-  this.config.save();
-};
+		this.files = this.expandFiles('**/*', { cwd: this.sourceRoot(), dot: true });
 
-Generator.name = "jQuery Boilerplate";
+		var ignores = [
+			'.git',
+			'LICENSE',
+			'README.md',
+		];
+
+		this.files.forEach(function(file) {
+			if (ignores.indexOf(file) !== -1) {
+				return;
+			}
+
+			this.copy(file, file);
+		}, this);
+
+		this.config.save();
+
+		this.package = JSON.parse(this.readFileAsString(path.resolve(__dirname, '../package.json')));
+
+		this.log.writeln('Generating from ' + chalk.cyan('jQuery Boilerplate') + ' v' + chalk.cyan(this.package.version) + '...');
+	}
+
+});

package.json

@@ -30,12 +30,8 @@
 	"peerDependencies": {
 		"yo": ">=1.0.0-rc.1.1"
 	},
-	"engines": {
-		"node": ">= 0.8.0",
-		"npm": ">=1.2.10"
-	},
 	"dependencies": {
-		"yeoman-generator": "~0.18.0",
+		"yeoman-generator": "~0.18.10",
 		"chalk": "~0.5.1"
 	},
 	"devDependencies": {

test/test.js

@@ -2,45 +2,44 @@
 'use strict';
 
 var path = require('path');
-var helpers = require('yeoman-generator').test;
+var yeoman = require('yeoman-generator');
+var helpers = yeoman.test;
+var assert = yeoman.assert;
 
 describe('jQuery Boilerplate generator test', function () {
-  beforeEach(function (done) {
-    helpers.testDirectory(path.join(__dirname, 'temp'), function (err) {
-      if (err) {
-        return done(err);
-      }
 
-      this.app = helpers.createGenerator('jquery-boilerplate:app', [
-        '../../app', [
-          helpers.createDummyGenerator(),
-          'mocha:app'
-        ]
-      ]);
-      done();
-    }.bind(this));
-  });
+	var runGen, options;
 
-  it('creates expected files', function (done) {
-    var expected = [
-      '.editorconfig',
-      '.gitignore',
-      '.jshintrc',
-      '.travis.yml',
-      'Gruntfile.js',
-      'boilerplate.jquery.json',
-      'demo/index.html',
-      'dist/jquery.boilerplate.js',
-      'dist/jquery.boilerplate.min.js',
-      'package.json',
-      'src/jquery.boilerplate.coffee',
-      'src/jquery.boilerplate.js'
-    ];
+	beforeEach(function () {
+		options = {
+			'skip-install': true
+		};
 
-    this.app.options['skip-install'] = true;
-    this.app.run({}, function () {
-      helpers.assertFiles(expected);
-      done();
-    });
-  });
+		runGen = helpers
+			.run(path.join(__dirname, '../app'))
+			.inDir(path.join(__dirname, './temp'))
+			.withGenerators(['../../app', [helpers.createDummyGenerator(), 'mocha:app']]);
+	});
+
+	it('creates expected files', function (done) {
+		var expected = [
+			'.editorconfig',
+			'.gitignore',
+			'.jshintrc',
+			'.travis.yml',
+			'Gruntfile.js',
+			'boilerplate.jquery.json',
+			'demo/index.html',
+			'dist/jquery.boilerplate.js',
+			'dist/jquery.boilerplate.min.js',
+			'package.json',
+			'src/jquery.boilerplate.coffee',
+			'src/jquery.boilerplate.js'
+		];
+
+		runGen.withOptions(options).on('end', function () {
+			assert.file(expected);
+			done();
+		});
+	});
 });