Merge pull request #10 from hariadi/develop

v0.2.6

Author: hariadi

app/index.js

@@ -10,6 +10,7 @@ var MetalsmithGenerator = yeoman.generators.Base.extend({
     this.on('end', function () {
       this.installDependencies({
         skipInstall: this.options['skip-install'] || this.options.s,
+        bower: false,
         callback: function () {
           this.spawnCommand('make', ['build']);
         }.bind(this)
@@ -64,7 +65,7 @@ var MetalsmithGenerator = yeoman.generators.Base.extend({
       type    : 'input',
       name    : 'msAuthor',
       message : 'Author name',
-      default : this.user.git.username || 'Metal Smith'
+      default : this.user.git.name() || 'Metal Smith'
     }, {
       type    : 'input',
       name    : 'msGithubUser',

app/templates/_package.json

@@ -16,8 +16,8 @@
     "metalsmith-templates": "^0.5.2",
     "<%= templateEngine %>": "<%= metalsmith.engine[templateEngine] %>",<% } %><% if(markdown){ %>
     "metalsmith-markdown": "^0.2.1",<% } %><% if(permalinks){ %>
-    "metalsmith-permalinks": "^0.3.2",<% } %><% if(collections){ %>
-    "metalsmith-collections": "^0.4.1",<% } %>
-    "metalsmith": "^0.9.0"
+    "metalsmith-permalinks": "^0.4.0",<% } %><% if(collections){ %>
+    "metalsmith-collections": "^0.6.0",<% } %>
+    "metalsmith": "^0.10.0"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-metalsmith",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "homepage": "https://github.com/hariadi/generator-metalsmith",
   "description": "Yeoman generator for Metalsmith",
   "author": {
@@ -16,7 +16,6 @@
   "bugs": {
     "url": "https://github.com/hariadi/generator-metalsmith/issues"
   },
-
   "engines": {
     "node": ">=0.10.0"
   },
@@ -27,7 +26,7 @@
     "app"
   ],
   "dependencies": {
-    "yeoman-generator": "~0.16.0"
+    "yeoman-generator": "^0.17.5"
   },
   "devDependencies": {
     "mocha": "*"

test/test-creation.js

@@ -1,24 +1,42 @@
 /*global describe, beforeEach, it */
 'use strict';
+
 var path = require('path');
+var assert = require('yeoman-generator').assert;
 var helpers = require('yeoman-generator').test;
 
 describe('metalsmith generator', function () {
-  beforeEach(function (done) {
-    helpers.testDirectory(path.join(__dirname, 'temp'), function (err) {
-      if (err) {
-        return done(err);
-      }
 
-      this.app = helpers.createGenerator('metalsmith:app', [
-        '../../app'
-      ]);
-      done();
-    }.bind(this));
+  before(function (done) {
+    helpers.run(path.join(__dirname, '../app'))
+      .inDir(path.join(__dirname, './temp'))
+      .withOptions({
+        'skip-install-message': true,
+        'skip-install': true,
+        'skip-welcome-message': true,
+        'skip-message': true
+      })
+      .withPrompt({
+        msTitle: 'Metalsmith Blog',
+        msDesc: 'My Metalsmith-Powered Site',
+        msAuthor: 'Metal Smith',
+        msGithubUser: 'metalsmith',
+        msPlugins: [
+          'metalsmith-ignore',
+          'metalsmith-drafts',
+          'metalsmith-templates',
+          'metalsmith-markdown',
+          'metalsmith-permalinks',
+          'metalsmith-collections'
+        ],
+        templateEngine: 'swig',
+        permalinksPattern: ':title',
+      })
+      .on('end', done);
   });
 
-  it('creates expected files', function (done) {
-    var expected = [
+  it('creates files', function () {
+    assert.file([
       '_layouts/post.html',
       '_posts/2012-08-20-first-post.md',
       '_posts/2012-08-23-second-post.md',
@@ -29,28 +47,7 @@ describe('metalsmith generator', function () {
       'metalsmith.json',
       'Makefile',
       'README.md'
-    ];
-
-    helpers.mockPrompt(this.app, {
-      msTitle: 'Metalsmith Blog',
-      msDesc: 'My Metalsmith-Powered Site',
-      msAuthor: 'Metal Smith',
-      msGithubUser: 'metalsmith',
-      msPlugins: [
-        'metalsmith-ignore',
-        'metalsmith-drafts',
-        'metalsmith-templates',
-        'metalsmith-markdown',
-        'metalsmith-permalinks',
-        'metalsmith-collections'
-      ],
-      templateEngine: 'swig',
-      permalinksPattern: ':title',
-    });
-    this.app.options['skip-install'] = true;
-    this.app.run({}, function () {
-      helpers.assertFile(expected);
-      done();
-    });
+    ]);
   });
+
 });