optional jade

Author: akella

generators/app/index.js

@@ -94,7 +94,6 @@ var ManGenerator = yeoman.generators.Base.extend({
     // Application files
     utils.generate.appfiles.bind(this)();
   },
-  // ,
 
   writing: {
     base: function () {
@@ -107,7 +106,10 @@ var ManGenerator = yeoman.generators.Base.extend({
       // Assets directories
       utils.generate.assets.bind(this)();
 
-      // // Template files
+      // sprites template
+      utils.generate.spritesmith.bind(this)();
+
+      // Template files
       // utils.generate.templateFiles.bind(this)();      
 
       // Styles
@@ -116,7 +118,11 @@ var ManGenerator = yeoman.generators.Base.extend({
       // JS
       utils.generate.js.bind(this)();
 
-      if (this.prompts.features.jade) {
+      if (this.prompts.iconfont) {
+        utils.generate.iconfont.bind(this)();
+      }
+
+      if (this.prompts.jade) {
         utils.generate.jade.bind(this)();
       } else{
         utils.generate.html.bind(this)();

generators/app/templates/_package.json

@@ -17,6 +17,12 @@
     "gulp-iconfont": "^5.0.0",
     "gulp-include": "^2.0.3",
     "gulp-notify": "^2.2.0",
+    <% if (jade) { %>
+      "gulp-jade": "^1.1.0",
+      "gulp-plumber": "*",
+    <% } %>
+
+    
     "gulp-postcss": "~6.0.0",
     "gulp-ruby-sass": "~2.0.3",
     "gulp-sourcemaps": "^1.5.2",

generators/app/templates/gulp/tasks/jade.js

@@ -1,10 +1,12 @@
+<% if (jade) { %>
 var gulp = require('gulp');
 var notify = require('gulp-notify');
 var plumber = require("gulp-plumber");
 var jade = require("gulp-jade");
 var config = require('../config');
 // var changed = require("gulp-changed");
 
+
 gulp.task('jade', function() {
     return gulp.src([
             config.src.jade + '/*.jade', 
@@ -30,4 +32,5 @@ gulp.task('jade-all', function() {
 gulp.task('jade:watch', function() {
     gulp.watch(config.src.jade + '/**/*.jade', ['jade']);
     gulp.watch([config.src.jade + '/_*.jade', config.src.jade + '/includes/*.jade'], ['jade-all']);
-});
+});
+<% } %>

generators/app/templates/gulp/tasks/watch.js

@@ -7,7 +7,7 @@ gulp.task('watch', [
     'sass:watch',
     'copy:watch',
     'html:watch',
-    'jade:watch',
+    <% if (jade) { %>'jade:watch', <% } %>
     'font:watch',
     'js:watch'
 ]);
@@ -17,4 +17,12 @@ gulp.task('delete', function (cb) {
     rimraf('./'+config.dest.root, cb);
 });
 gulp.task('default', ['server', 'watch'], function() {});
-gulp.task('build', ['html','font','sprite','copy','js','sass'], function() {});
+gulp.task('build', [
+	'html',
+	<% if (jade) { %>'jade',<% } %>
+	<% if (iconfont) { %>'font',<% } %>
+	'sprite',
+	'copy',
+	'js',
+	'sass'
+	], function() {});

generators/app/templates/src/img/svg/uEA01-sepa.svg renamed to generators/app/templates/src/img/svg/sepa.svg

@@ -2,7 +2,7 @@
 @import lib/mixins
 @import lib/reset
 @import lib/sprite
-@import lib/svgfont
+<% if (iconfont) { %>@import lib/svgfont <% } %>
 // @import lib/slick
 
 @import common

generators/app/templates/src/sass/style.sass

@@ -34,15 +34,15 @@ var generate = {
 
   appfiles: function () {
     helpers.copy.call(this, '_package.json', 'package.json', this.prompts);
+    console.log(this.prompts);
     // helpers.copy.call(this, '_bower.json', 'bower.json', this.prompts);
   },
 
   gulpModules: function () {
     helpers.copy.call(this, 'gulpfile.js', 'gulpfile.js', this.prompts);
     helpers.copy.call(this, 'gulp/config.js', 'gulp/config.js', this.prompts);
-    helpers.copy.call(this, 'gulp/helpers/_svgfont.sass', 'gulp/helpers/_svgfont.sass');
-    helpers.copy.call(this, 'gulp/helpers/icons.html', 'gulp/helpers/icons.html');
-    helpers.copy.call(this, 'gulp/helpers/sprite.template.mustache', 'gulp/helpers/sprite.template.mustache');
+    
+    
 
 
     var taskslist = ['sass','iconfont','copy', 'html','jade','spritesmith','watch', 'js','server'];
@@ -55,6 +55,15 @@ var generate = {
     }
   },
 
+  spritesmith: function () {
+    helpers.copy.call(this, 'gulp/helpers/sprite.template.mustache', 'gulp/helpers/sprite.template.mustache');
+  },
+
+  iconfont: function () {
+    helpers.copy.call(this, 'gulp/helpers/_svgfont.sass', 'gulp/helpers/_svgfont.sass');
+    helpers.copy.call(this, 'gulp/helpers/icons.html', 'gulp/helpers/icons.html');
+  },
+
   projectInfo: function () {
     // helpers.copy.call(this, '_index.html', 'index.html', this.prompts);
     helpers.copy.call(this, 'README.md', 'README.md', this.prompts);
@@ -63,8 +72,8 @@ var generate = {
   assets: function () {
     helpers.copy.call(this, 'src/.keep', 'src/fonts/.keep');
     helpers.copy.call(this, 'src/.keep', 'src/img/.keep');
-    helpers.copy.call(this, 'src/.keep', 'src/img/icons/.keep');
-    helpers.copy.call(this, 'src/.keep', 'src/img/svg/.keep');
+    helpers.copy.call(this, 'src/img/icons/coderiver.png', 'src/img/icons/coderiver.png');
+    helpers.copy.call(this, 'src/img/svg/sepa.svg', 'src/img/svg/sepa.svg');
   },
 
   // templateFiles: function () {

generators/app/utils/generate.js

@@ -12,6 +12,12 @@ module.exports = {
     name: 'jade',
     message: 'Do we need Jade?',
     default: false
+  },
+  {
+    type: 'confirm',
+    name: 'iconfont',
+    message: 'Create iconfont from SVG?',
+    default: true
   }],
 
   update: [{

generators/app/utils/prompts.js

@@ -6,8 +6,8 @@ module.exports = function (answers) {
   this.prompts                  = {};
   this.prompts.projectName      = answers.projectName;
   this.prompts.spritesmith      = answers.spritesmith;
-  this.prompts.bootstrap        = answers.bootstrap;
-  // this.prompts.cssPreprocessor  = answers.cssPreprocessor;
+  this.prompts.jade             = answers.jade;
+  this.prompts.iconfont         = answers.iconfont;
   // this.prompts.cssPrefix        = answers.cssPreprocessor === 'scss' ? '_' : '';
   this.prompts.features         = {};