Merge branch 'master' into add-decorator-generator

Author: robinboehm

app/USAGE

@@ -6,12 +6,12 @@ Example:
 
     This will create:
         Gruntfile.js
-        component.json
+        bower.json
 
         app/index.html
         app/scripts/your-app-name-here.js
         app/scripts/controllers/main.js
-        app/components/angular/angular.js
+        app/bower_components/angular/angular.js
         app/styles/main.css
         app/views/main.html
 

app/index.js

@@ -69,28 +69,43 @@ var Generator = module.exports = function Generator(args, options) {
 
 util.inherits(Generator, yeoman.generators.NamedBase);
 
-Generator.prototype.askFor = function askFor() {
+Generator.prototype.askForBootstrap = function askForBootstrap() {
   var cb = this.async();
 
-  var prompts = [{
+  this.prompt({
     name: 'bootstrap',
     message: 'Would you like to include Twitter Bootstrap?',
-    default: 'Y/n',
+    default: true,
     warning: 'Yes: All Twitter Bootstrap files will be placed into the styles directory.'
-  }, {
+  }, function (err, props) {
+    if (err) {
+      return this.emit('error', err);
+    }
+
+    this.bootstrap = props.bootstrap;
+
+    cb();
+  }.bind(this));
+};
+
+Generator.prototype.askForCompass = function askForCompass() {
+  if (!this.bootstrap) {
+    return;
+  }
+
+  var cb = this.async();
+
+  this.prompt({
     name: 'compassBootstrap',
     message: 'If so, would you like to use Twitter Bootstrap for Compass (as opposed to vanilla CSS)?',
-    default: 'Y/n',
+    default: true,
     warning: 'Yes: All Twitter Bootstrap files will be placed into the styles directory.'
-  }];
-
-  this.prompt(prompts, function (err, props) {
+  }, function (err, props) {
     if (err) {
       return this.emit('error', err);
     }
 
-    this.bootstrap = (/y/i).test(props.bootstrap);
-    this.compassBootstrap = (/y/i).test(props.compassBootstrap);
+    this.compassBootstrap = props.compassBootstrap;
 
     cb();
   }.bind(this));
@@ -102,17 +117,17 @@ Generator.prototype.askForModules = function askForModules() {
   var prompts = [{
     name: 'resourceModule',
     message: 'Would you like to include angular-resource.js?',
-    default: 'Y/n',
+    default: true,
     warning: 'Yes: angular-resource added to bower.json'
   }, {
     name: 'cookiesModule',
     message: 'Would you like to include angular-cookies.js?',
-    default: 'Y/n',
+    default: true,
     warning: 'Yes: angular-cookies added to bower.json'
   }, {
     name: 'sanitizeModule',
     message: 'Would you like to include angular-sanitize.js?',
-    default: 'Y/n',
+    default: true,
     warning: 'Yes: angular-sanitize added to bower.json'
   }];
 
@@ -121,9 +136,9 @@ Generator.prototype.askForModules = function askForModules() {
       return this.emit('error', err);
     }
 
-    this.resourceModule = (/y/i).test(props.resourceModule);
-    this.cookiesModule = (/y/i).test(props.cookiesModule);
-    this.sanitizeModule = (/y/i).test(props.sanitizeModule);
+    this.resourceModule = props.resourceModule;
+    this.cookiesModule = props.cookiesModule;
+    this.sanitizeModule = props.sanitizeModule;
 
     cb();
   }.bind(this));

package.json

@@ -22,10 +22,10 @@
     "test": "mocha"
   },
   "dependencies": {
-    "yeoman-generator": "~0.10.5"
+    "yeoman-generator": "~0.11.0"
   },
   "peerDependencies": {
-    "generator-karma": "~0.2.0"
+    "generator-karma": "~0.3.0"
   },
   "devDependencies": {
     "mocha": "~1.9.0",

templates/coffeescript-min/directive.coffee

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('<%= _.camelize(appname) %>App')
-  .directive('<%= _.camelize(name) %>', [() ->
+  .directive '<%= _.camelize(name) %>', [->
     template: '<div></div>'
     restrict: 'E'
     link: (scope, element, attrs) ->

templates/coffeescript-min/spec/directive.coffee

@@ -8,4 +8,4 @@ describe 'Directive: <%= _.camelize(name) %>', () ->
   it 'should make hidden element visible', inject ($rootScope, $compile) ->
     element = angular.element '<<%= _.dasherize(name) %>></<%= _.dasherize(name) %>>'
     element = $compile(element) $rootScope
-    expect(element text()).toBe 'this is the <%= _.camelize(name) %> directive'
+    expect(element.text()).toBe 'this is the <%= _.camelize(name) %> directive'

templates/common/Gruntfile.js

@@ -1,5 +1,6 @@
 'use strict';
-var lrSnippet = require('grunt-contrib-livereload/lib/utils').livereloadSnippet;
+var LIVERELOAD_PORT = 35729;
+var lrSnippet = require('connect-livereload')({ port: LIVERELOAD_PORT });
 var mountFolder = function (connect, dir) {
   return connect.static(require('path').resolve(dir));
 };
@@ -21,6 +22,9 @@ module.exports = function (grunt) {
   grunt.initConfig({
     yeoman: yeomanConfig,
     watch: {
+      options: {
+        nospawn: true
+      },
       coffee: {
         files: ['<%%= yeoman.app %>/scripts/{,*/}*.coffee'],
         tasks: ['coffee:dist']
@@ -34,13 +38,15 @@ module.exports = function (grunt) {
         tasks: ['compass']
       },
       livereload: {
+        options: {
+          livereload: LIVERELOAD_PORT
+        },
         files: [
           '<%%= yeoman.app %>/{,*/}*.html',
           '{.tmp,<%%= yeoman.app %>}/styles/{,*/}*.css',
           '{.tmp,<%%= yeoman.app %>}/scripts/{,*/}*.js',
           '<%%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
-        ],
-        tasks: ['livereload']
+        ]
       }
     },
     connect: {
@@ -131,7 +137,7 @@ module.exports = function (grunt) {
         imagesDir: '<%%= yeoman.app %>/images',
         javascriptsDir: '<%%= yeoman.app %>/scripts',
         fontsDir: '<%%= yeoman.app %>/styles/fonts',
-        importPath: '<%%= yeoman.app %>/components',
+        importPath: '<%%= yeoman.app %>/bower_components',
         relativeAssets: true
       },
       dist: {},
@@ -251,7 +257,7 @@ module.exports = function (grunt) {
           src: [
             '*.{ico,txt}',
             '.htaccess',
-            'components/**/*',
+            'bower_components/**/*',
             'images/{,*/}*.{gif,webp}',
             'styles/fonts/*'
           ]
@@ -260,13 +266,10 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.renameTask('regarde', 'watch');
-
   grunt.registerTask('server', [
     'clean:server',
     'coffee:dist',
     'compass:server',
-    'livereload-start',
     'connect:livereload',
     'open',
     'watch'
@@ -287,10 +290,10 @@ module.exports = function (grunt) {
     'coffee',
     'compass:dist',
     'useminPrepare',
+    'concat',
     'imagemin',
     'cssmin',
     'htmlmin',
-    'concat',
     'copy',
     'cdnify',
     'ngmin',

templates/common/gitignore

@@ -2,4 +2,4 @@ node_modules
 dist
 .tmp
 .sass-cache
-app/components
+app/bower_components

templates/common/index.html

@@ -21,17 +21,17 @@
     <![endif]-->
 
     <!--[if lt IE 9]>
-      <script src="components/es5-shim/es5-shim.js"></script>
-      <script src="components/json3/lib/json3.min.js"></script>
+      <script src="bower_components/es5-shim/es5-shim.js"></script>
+      <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
 
     <!-- Add your site or application content here -->
     <div class="container" ng-view></div>
 
-    <script src="components/angular/angular.js"></script><% if (resourceModule) { %>
-    <script src="components/angular-resource/angular-resource.js"></script><% } %><% if (cookiesModule) { %>
-    <script src="components/angular-cookies/angular-cookies.js"></script><% } %><% if (sanitizeModule) { %>
-    <script src="components/angular-sanitize/angular-sanitize.js"></script><% } %>
+    <script src="bower_components/angular/angular.js"></script><% if (resourceModule) { %>
+    <script src="bower_components/angular-resource/angular-resource.js"></script><% } %><% if (cookiesModule) { %>
+    <script src="bower_components/angular-cookies/angular-cookies.js"></script><% } %><% if (sanitizeModule) { %>
+    <script src="bower_components/angular-sanitize/angular-sanitize.js"></script><% } %>
 
     <!-- build:js scripts/scripts.js -->
     <script src="scripts/app.js"></script>

templates/common/package.json

@@ -4,26 +4,26 @@
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.1",
-    "grunt-contrib-copy": "~0.4.0",
-    "grunt-contrib-concat": "~0.1.3",
-    "grunt-contrib-coffee": "~0.6.4",
+    "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-concat": "~0.2.0",
+    "grunt-contrib-coffee": "~0.7.0",
     "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-compass": "~0.1.3",
-    "grunt-contrib-jshint": "~0.3.0",
-    "grunt-contrib-cssmin": "~0.5.0",
-    "grunt-contrib-connect": "~0.2.0",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-htmlmin": "~0.1.1",
-    "grunt-contrib-imagemin": "~0.1.2",
-    "grunt-contrib-livereload": "~0.1.2",
-    "grunt-bower-requirejs": "~0.4.1",
-    "grunt-usemin": "~0.1.10",
-    "grunt-regarde": "~0.1.1",
+    "grunt-contrib-compass": "~0.2.0",
+    "grunt-contrib-jshint": "~0.4.3",
+    "grunt-contrib-cssmin": "~0.6.0",
+    "grunt-contrib-connect": "~0.3.0",
+    "grunt-contrib-clean": "~0.4.1",
+    "grunt-contrib-htmlmin": "~0.1.3",
+    "grunt-contrib-imagemin": "~0.1.4",
+    "grunt-contrib-watch": "~0.4.0",
+    "grunt-bower-requirejs": "~0.4.2",
+    "grunt-usemin": "~0.1.11",
     "grunt-rev": "~0.1.0",
-    "grunt-karma": "~0.3.0",
+    "grunt-karma": "~0.4.3",
     "grunt-open": "~0.2.0",
-    "matchdep": "~0.1.1",
-    "grunt-google-cdn": "~0.1.1",
+    "matchdep": "~0.1.2",
+    "connect-livereload": "~0.1.0",
+    "grunt-google-cdn": "~0.2.0",
     "grunt-ngmin": "~0.0.2"
   },
   "engines": {

templates/common/root/.bowerrc

@@ -1,3 +1,3 @@
 {
-    "directory": "app/components"
+    "directory": "app/bower_components"
 }