Move some subgenerators to a boilerplate generator

Moved the git, editorconfig, jscs and jshint subgenerator into a boilerplate generator instead because I like that approach better.
sondr3 · May 17, 2015 · 420aac0 · 420aac0
1 parent 0667750
commit 420aac0
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 177 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -61,20 +61,8 @@ module.exports = generators.Base.extend({
   },
 
   default: function() {
-    this.composeWith('jekyllized:editorconfig', {}, {
-      local: require.resolve('../editorconfig')
-    });
-
-    this.composeWith('jekyllized:jshint', {}, {
-      local: require.resolve('../jshint')
-    });
-
-    this.composeWith('jekyllized:jscs', {}, {
-      local: require.resolve('../jscs')
-    });
-
-    this.composeWith('jekyllized:git', {}, {
-      local: require.resolve('../git')
+    this.composeWith('jekyllized:boilerplate', {}, {
+      local: require.resolve('../boilerplate')
     });
 
     this.composeWith('jekyllized:gulp', {}, {

diff --git a/generators/editorconfig/index.js b/generators/editorconfig/index.js
diff --git a/generators/editorconfig/templates/editorconfig b/generators/editorconfig/templates/editorconfig
diff --git a/generators/git/index.js b/generators/git/index.js
diff --git a/generators/git/templates/gitattributes b/generators/git/templates/gitattributes
diff --git a/generators/git/templates/gitignore b/generators/git/templates/gitignore
diff --git a/generators/jscs/index.js b/generators/jscs/index.js
diff --git a/generators/jscs/templates/jscsrc b/generators/jscs/templates/jscsrc
diff --git a/generators/jshint/index.js b/generators/jshint/index.js
diff --git a/generators/jshint/templates/jshintrc b/generators/jshint/templates/jshintrc
diff --git a/test/app.js b/test/app.js
@@ -43,7 +43,8 @@ describe('jekyllized:app', function() {
         '.jscsrc',
         '.gitignore',
         '.gitattributes',
-        'package.json'
+        'package.json',
+        'gulpfile.js'
       ]);
     });
 

diff --git a/test/editorconfig.js b/test/editorconfig.js
@@ -6,7 +6,7 @@ var helpers = require('yeoman-generator').test;
 
 describe('jekyllized:editorconfig', function() {
   before(function(done) {
-    helpers.run(path.join(__dirname, '../generators/editorconfig'))
+    helpers.run(path.join(__dirname, '../generators/boilerplate'))
       .on('end', done);
   });
 

diff --git a/test/git.js b/test/git.js
@@ -6,7 +6,7 @@ var helpers = require('yeoman-generator').test;
 
 describe('jekyllized:git', function() {
   before(function(done) {
-    helpers.run(path.join(__dirname, '../generators/git'))
+    helpers.run(path.join(__dirname, '../generators/boilerplate'))
       .on('end', done);
   });
 

diff --git a/test/gulp.js b/test/gulp.js
@@ -8,9 +8,10 @@ describe('jekyllized:gulp', function() {
   describe('without any uploading', function() {
     before(function(done) {
       this.answers = {
-        uploading: 'noUploadg'
+        uploading: 'noUpload'
       };
       helpers.run(path.join(__dirname, '../generators/gulp'))
+        .inDir(path.join(__dirname, 'tmp/gulp'))
         .withPrompts(this.answers)
         .on('end', done);
     });

diff --git a/test/jscs.js b/test/jscs.js
@@ -6,7 +6,7 @@ var helpers = require('yeoman-generator').test;
 
 describe('jekyllized:jscs', function() {
   before(function(done) {
-    helpers.run(path.join(__dirname, '../generators/app'))
+    helpers.run(path.join(__dirname, '../generators/boilerplate'))
       .on('end', done);
   });
 

diff --git a/test/jshint.js b/test/jshint.js
@@ -6,7 +6,7 @@ var helpers = require('yeoman-generator').test;
 
 describe('jekyllized:jshint', function() {
   before(function(done) {
-    helpers.run(path.join(__dirname, '../generators/jshint'))
+    helpers.run(path.join(__dirname, '../generators/boilerplate'))
       .on('end', done);
   });