Update Bootstrap v3.0 and lots of thing. #1

.gitignore

@@ -2,6 +2,4 @@ node_modules/
 temp/
 *.sublime-project
 *.sublime-workspace
-src/
-Gruntfile.js
 .jshintrc

Gruntfile.js

@@ -0,0 +1,37 @@
+/*
+ * generator-assemble
+ * http://github.com/hariadi/generator-assemble
+ *
+ * Copyright (c) 2012 Hariadi Hinta
+ * Licensed under the MIT license.
+ */
+
+'use strict';
+
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+
+    jshint: {
+      all_files: [
+        'Gruntfile.js',
+        'test/*'
+      ],
+      options: {
+        jshintrc: '.jshintrc',
+      }
+    },
+
+    clean: ['test/temp/**']
+
+  });
+
+  // These plugins provide necessary tasks.
+  grunt.loadNpmTasks("grunt-contrib-jshint");
+  grunt.loadNpmTasks('grunt-contrib-clean');
+
+  // By default, lint and run all tests.
+  grunt.registerTask('default', ['jshint']);
+
+};

app/index.js

@@ -3,14 +3,14 @@ var util = require('util');
 var path = require('path');
 var yeoman = require('yeoman-generator');
 
-var separator = '\n=====================================\n';
+var separator = '\n===============================================\n';
 
 var AssembleGenerator = module.exports = function AssembleGenerator(args, options, config) {
   yeoman.generators.Base.apply(this, arguments);
-  
+
   this.gruntFile = this.readFileAsString(path.join(this.sourceRoot(), 'Gruntfile.js'));
   this.pkg = JSON.parse(this.readFileAsString(path.join(__dirname, '../package.json')));
-  
+
   this.on('end', function () {
     this.installDependencies({ skipInstall: options['skip-install'] });
   });
@@ -21,7 +21,7 @@ util.inherits(AssembleGenerator, yeoman.generators.NamedBase);
 
 AssembleGenerator.prototype.askFor = function askFor() {
   var cb = this.async();
-  
+
   if(!this.options.silent){
 
     var assembleInfo = 'This task will create one or more files in the\n' +
@@ -31,15 +31,15 @@ AssembleGenerator.prototype.askFor = function askFor() {
     '\n     _-----_' +
     '\n    |       |' +
     '\n    |'+'--(o)--'.red+'|   .--------------------------.' +
-    '\n   `---------´  |    '+'Welcome to Yeoman,'.yellow.bold+'    |' +
-    '\n    '+'( '.yellow+'_'+'´U`'.yellow+'_'+' )'.yellow+'   |   '+'ladies and gentlemen!'.yellow.bold+'  |' +
+    '\n   `---------´  |    '+'Welcome to Yeoman,'.yellow.bold+'    |' +
+    '\n    '+'( '.yellow+'_'+'´U`'.yellow+'_'+' )'.yellow+'   |   '+'ladies and gentlemen!'.yellow.bold+'  |' +
     '\n    /___A___\\   \'__________________________\'' +
     '\n     |  ~  |'.yellow +
     '\n   __'+'\'.___.\''.yellow+'__' +'       '+'Assemble Generators'.yellow.bold+
-    '\n ´   '+'`  |'.red+'° '+'´ Y'.red+' `\n' + separator.yellow + '\n'+ assembleInfo +'\n'.red.bold + separator.yellow;
+    '\n ´   '+'`  |'.red+'° '+'´ Y'.red+' `\n' + separator.yellow + '\n'+ assembleInfo +'\n'.red.bold + separator.yellow;
     console.log(welcome);
   }
-  
+
   var prompts = [{
     name: 'includeReadMe',
     message: 'Would you like to include Assemble README configuration?',
@@ -52,6 +52,40 @@ AssembleGenerator.prototype.askFor = function askFor() {
     warning: 'Yes: Sitemap config and files will be placed into the project directory.'
   }];
 
+  this.files = this.expandFiles('**/*', { cwd: this.sourceRoot(), dot: true });
+
+  this.dotfiles = [
+    'editorconfig',
+    'gitattributes',
+    'gitignore',
+    'jshint'
+  ];
+
+  this._files = [ '_package.json' ];
+
+  this.readmefiles = [
+    'AUTHORS',
+    'CHANGELOG',
+    'ROADMAP',
+    'src/templates/readme.md.hbs',
+    'src/templates/partials/readme/contributing.md.hbs',
+    'src/templates/partials/readme/options.md.hbs',
+    'src/templates/partials/readme/documentation.md.hbs',
+    'src/templates/partials/readme/footer.md.hbs',
+    'src/templates/partials/readme/getting-started.md.hbs'
+  ];
+
+  this.sitemapfiles = [
+    'src/data/sitemap.json',
+    'src/templates/sitemap.hbs'
+  ];
+
+  this.gruntfiles = [ 'Gruntfile.js' ];
+
+  this.ignores = this.dotfiles.concat(this._files, this.readmefiles, this.sitemapfiles, this.gruntfiles);
+
+  //console.log('src/templates/partials/readme/contributing.md.hbs'.indexOf('/readme/'));
+
   this.prompt(prompts, function (err, props) {
     if (err) {
       return this.emit('error', err);
@@ -64,80 +98,21 @@ AssembleGenerator.prototype.askFor = function askFor() {
 };
 
 AssembleGenerator.prototype.app = function app() {
-  this.mkdir('dist');
-  this.mkdir('config');
-  this.mkdir('helper');
-  this.mkdir('src');
-  this.mkdir('src/content');
-  this.mkdir('src/data');
-  this.mkdir('src/templates');
-  this.mkdir('src/templates/layouts');
-  this.mkdir('src/templates/pages');
-  this.mkdir('src/templates/partials');
-  if (this.includeReadMe) {
-    this.mkdir('src/templates/partials/readme');
-  }
-};
+  var files = this.files;
+  files.forEach(function(file) {
 
-AssembleGenerator.prototype.config = function config() {
-  this.copy('config/global.yml', 'config/global.yml');
-  this.copy('config/site.yml', 'config/site.yml');
-
-  if (this.includeReadMe) {
-    this.copy('config/readme.yml', 'config/readme.yml');
-    this.copy('AUTHORS', 'AUTHORS');
-    this.copy('CHANGELOG', 'CHANGELOG');
-    this.copy('ROADMAP', 'ROADMAP');
-    this.copy('src/templates/readme.md', 'src/templates/readme.md.hbs');
-    this.copy('src/templates/partials/readme/contributing.md', 'src/templates/partials/readme/contributing.md.hbs');
-    this.copy('src/templates/partials/readme/documentation.md', 'src/templates/partials/readme/documentation.md.hbs');
-    this.copy('src/templates/partials/readme/footer.md', 'src/templates/partials/readme/footer.md.hbs');
-    this.copy('src/templates/partials/readme/getting-started.md', 'src/templates/partials/readme/getting-started.md.hbs');
-  }
-  if (this.includeSitemap) {
-    this.copy('config/sitemap.yml', 'config/sitemap.yml');
-    this.copy('src/data/sitemap.json', 'src/data/sitemap.json');
-    this.copy('src/templates/sitemap.hbs', 'src/templates/sitemap.hbs');
-  }
-};
+      if (!this.includeSitemap && this.readmefiles.indexOf(file) !== -1) {
+        return;
+      }
 
-AssembleGenerator.prototype.basic = function basic() {
-  this.copy('src/content/code.md', 'src/content/code.md');
-  this.copy('src/content/links.md', 'src/content/links.md');
-  this.copy('src/data/alert.json', 'src/data/alert.json');
-  this.copy('src/data/button.json', 'src/data/button.json');
-  this.copy('src/templates/layouts/default.hbs', 'src/templates/layouts/default.hbs');
-  this.copy('src/templates/pages/basic.hbs', 'src/templates/pages/basic.hbs');
-  this.copy('src/templates/pages/index.hbs', 'src/templates/pages/index.hbs');
-  this.copy('src/templates/pages/markdown.hbs', 'src/templates/pages/markdown.hbs');
-  this.copy('src/templates/pages/partials.hbs', 'src/templates/pages/partials.hbs');
-  this.copy('src/templates/partials/alert.hbs', 'src/templates/partials/alert.hbs');
-  this.copy('src/templates/partials/button.hbs', 'src/templates/partials/button.hbs');
-  this.copy('src/templates/partials/nav.hbs', 'src/templates/partials/nav.hbs');
-};
+      if (!this.includeSitemap && this.sitemapfiles.indexOf(file) !== -1) {
+        return;
+      }
 
-AssembleGenerator.prototype.helper = function helper() {
-  this.copy('helper/helper.js', 'helper/helper.js');
-};
+    this.copy(file, file);
 
-AssembleGenerator.prototype.git = function git() {
-  this.copy('gitignore', '.gitignore');
-  this.copy('gitattributes', '.gitattributes');
+  }, this);
 };
 
-AssembleGenerator.prototype.packageJSON = function packageJSON() {
-  this.template('_package.json', 'package.json');
-};
 
-AssembleGenerator.prototype.writeGruntFile = function writeGruntFile() {
-  this.copy('Gruntfile.js', 'Gruntfile.js');
-};
-
-AssembleGenerator.prototype.jshint = function jshint() {
-  this.copy('jshintrc', '.jshintrc');
-};
 
-AssembleGenerator.prototype.common = function common() {
-  this.copy('common/favicon.ico', 'dist/favicon.ico');
-  this.copy('common/robots.txt', 'dist/robots.txt');
-};

app/templates/.editorconfig

@@ -0,0 +1,14 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[Makefile]
+indent_style = tab

app/templates/AUTHORS

@@ -1,3 +1 @@
 Hariadi Hinta (http://github.com/hariadi)
-Brian Woodward (http://github.com/doowb)
-Jon Schlinkert (http://github.com/jonschlinkert)

app/templates/CHANGELOG

@@ -1,7 +1,7 @@
 v0.2.1:
   date: "2013-06-12"
   changes:
-    - Completely refactored. New custom helpers, examples and documentation.
+    - Update Assemble example basic, custom helpers, examples and documentation.
     - Update repo description.
 v0.1.1:
   date: "2013-03-01"

app/templates/Gruntfile.js

@@ -1,9 +1,9 @@
 /*
  * Generated on <%= (new Date).toISOString().split('T')[0] %>
  * <%= pkg.name %> <%= pkg.version %>
- * https://github.com/hariadi/generator-assemble
+ * <%= pkg.homepage %>
  *
- * Copyright (c) 2013 Hariadi Hinta
+ * Copyright (c) <%= (new Date).getFullYear() %> <%= pkg.author.name %>
  * Licensed under the MIT license.
  */
 
@@ -23,48 +23,69 @@ module.exports = function(grunt) {
 
     assemble: {
       // Global configuration
-      options: grunt.file.readYAML('config/global.yml'),
+      options: {
+        assets: 'dist/assets',
+        data: 'src/data/*.{json,yml}',
+        partials: [
+          'src/templates/partials/{,*/}*.hbs',
+          'src/content/*.hbs'
+        ],
+        registerFunctions: function(engine) {
+          var helpers = require('./helper/helpers');
+          engine.engine.registerFunctions(helpers);
+        }
+      },
 
       site: {
-        options: grunt.file.readYAML('config/site.yml'),
-        src:  'src/templates/pages/{,*/}*.hbs',
-        dest: 'dist/'
+        options: {
+          flatten: true,
+          layout: 'src/templates/layouts/default.hbs'
+        },
+        files: [
+          {
+            expand: true,
+            cwd: 'src/templates/pages',
+            src: ['*.hbs', '!index.hbs'],
+            dest: 'dist/'
+          },
+          {
+            expand: true,
+            cwd: 'src/templates/pages',
+            src: ['index.hbs'],
+            dest: './' }
+        ]
       }<% if (includeReadMe) { %>,
 
       readme: {
-        options: grunt.file.readYAML('config/readme.yml'),
+         options: {
+          flatten: true,
+          partials: 'src/templates/partials/readme/{,*/}*.hbs',
+          data: './package.json',
+          ext: ''
+        },
         src:  'src/templates/readme.md.hbs',
         dest: 'dist/'
       }<% } %><% if (includeSitemap) { %>,
 
       sitemap: {
-        options: grunt.file.readYAML('config/sitemap.yml'),
+        options: {
+          component: {
+            name: 'generator-assemble',
+            description: 'Yeoman generator for Assemble'
+          },
+          ext: '.xml',
+          data: 'src/sitemap.json',
+          flatten: true
+        },
         files: {
           'dist/sitemap.xml': ['src/templates/sitemap.hbs']
         }
-      }<% } %>,
-
-      helpers: {
-        options: {
-          flatten: true,
-          registerFunctions: function(engine) {
-            var helpers = require('./helper/custom-helpers');
-            engine.engine.registerFunctions(helpers);
-          }
-        },
-        files: [
-          { expand: true, cwd: 'src/templates/custom-helpers', src: ['helpers.hbs'], dest: 'dist/' }
-        ]
-      }
+      }<% } %>
     },
 
     // Before generating any new files,
     // remove any previously-created files.
-    clean: {
-      dest: {
-        pages: ['dist/{,*/}*.html']
-      }
-    }
+    clean: ['dist/**/*.{html,xml}']
 
   });
 

app/templates/LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Jon Schlinkert
+Copyright (c) <%= (new Date).getFullYear() %> <%= pkg.author.name %>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation