Merge branch 'master' of github.com:yeoman/generator-angular into merge_upstream

Conflicts:
	CHANGELOG.md
	app/index.js
	package.json
	readme.md
	route/index.js
	templates/coffeescript-min/app.coffee
	templates/coffeescript/app.coffee
	templates/common/Gruntfile.js
	templates/javascript-min/app.js
	templates/javascript/app.js
	view/index.js

Author: DaftMonk

app/index.js

@@ -1,9 +1,11 @@
 'use strict';
+var fs = require('fs');
 var path = require('path');
 var util = require('util');
 var angularUtils = require('../util.js');
-var spawn = require('child_process').spawn;
 var yeoman = require('yeoman-generator');
+var chalk = require('chalk');
+var wiredep = require('wiredep');
 
 
 var Generator = module.exports = function Generator(args, options) {
@@ -81,7 +83,10 @@ var Generator = module.exports = function Generator(args, options) {
   });
 
   this.on('end', function () {
-    this.installDependencies({ skipInstall: this.options['skip-install'] });
+    this.installDependencies({
+      skipInstall: this.options['skip-install'],
+      callback: this._injectDependencies.bind(this)
+    });
 
     var enabledComponents = [];
 
@@ -112,14 +117,50 @@ var Generator = module.exports = function Generator(args, options) {
         ].concat(enabledComponents)
       }
     });
+
   });
 
-  this.pkg = JSON.parse(this.readFileAsString(path.join(__dirname, '../package.json')));
+  this.pkg = require('../package.json');
 };
 
 util.inherits(Generator, yeoman.generators.Base);
 
+Generator.prototype.welcome = function welcome() {
+  // welcome message
+  if (!this.options['skip-welcome-message']) {
+    console.log(this.yeoman);
+    console.log(
+      'Out of the box I include Bootstrap and some AngularJS recommended modules.\n'
+    );
+
+    // Deprecation notice for minsafe
+    if (this.options.minsafe) {
+      console.warn(
+        '\n** The --minsafe flag is being deprecated in 0.7.0 and removed in ' +
+        '0.8.0. For more information, see ' +
+        'https://github.com/yeoman/generator-angular#minification-safe. **\n'
+      );
+    }
+  }
+};
+
+Generator.prototype.askForCompass = function askForCompass() {
+  var cb = this.async();
+
+  this.prompt([{
+    type: 'confirm',
+    name: 'compass',
+    message: 'Would you like to use Sass (with Compass)?',
+    default: true
+  }], function (props) {
+    this.compass = props.compass;
+
+    cb();
+  }.bind(this));
+};
+
 Generator.prototype.askForBootstrap = function askForBootstrap() {
+  var compass = this.compass;
   var cb = this.async();
 
   this.prompt([{
@@ -130,10 +171,10 @@ Generator.prototype.askForBootstrap = function askForBootstrap() {
   }, {
     type: 'confirm',
     name: 'compassBootstrap',
-    message: 'Would you like to use the SCSS version of Twitter Bootstrap with the Compass CSS Authoring Framework?',
+    message: 'Would you like to use the Sass version of Twitter Bootstrap?',
     default: true,
     when: function (props) {
-      return props.bootstrap;
+      return props.bootstrap && compass;
     }
   }], function (props) {
     this.bootstrap = props.bootstrap;
@@ -190,6 +231,7 @@ Generator.prototype.askForModules = function askForModules() {
     }
     if (this.routeModule) {
       angMods.push("'ngRoute'");
+      this.env.options.ngRoute = true;
     }
 
     if (angMods.length) {
@@ -216,6 +258,7 @@ Generator.prototype.askForMongo = function askForMongo() {
 };
 
 Generator.prototype.readIndex = function readIndex() {
+  this.ngRoute = this.env.options.ngRoute;
   this.jade = this.env.options.jade;
 
   if(this.jade) {
@@ -225,26 +268,18 @@ Generator.prototype.readIndex = function readIndex() {
   }
 };
 
-// Waiting a more flexible solution for #138
 Generator.prototype.bootstrapFiles = function bootstrapFiles() {
-  var sass = this.compassBootstrap;
-  var files = [];
-  var source = 'styles/' + ( sass ? 's' : '' ) + 'css/';
+  var sass = this.compass;
+  var mainFile = 'main.' + (sass ? 's' : '') + 'css';
 
   if (this.bootstrap && !sass) {
-    files.push('bootstrap.css');
     this.copy('fonts/glyphicons-halflings-regular.eot', 'app/fonts/glyphicons-halflings-regular.eot');
     this.copy('fonts/glyphicons-halflings-regular.ttf', 'app/fonts/glyphicons-halflings-regular.ttf');
     this.copy('fonts/glyphicons-halflings-regular.svg', 'app/fonts/glyphicons-halflings-regular.svg');
     this.copy('fonts/glyphicons-halflings-regular.woff', 'app/fonts/glyphicons-halflings-regular.woff');
   }
 
-  files.push('main.' + (sass ? 's' : '') + 'css');
-
-  files.forEach(function (file) {
-    this.copy(source + file, 'app/styles/' + file);
-  }.bind(this));
-
+  this.copy('styles/' + mainFile, 'app/styles/' + mainFile);
   var appendOptions = {
     html: this.indexFile,
     fileType: 'css',
@@ -262,75 +297,6 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {
   }
 };
 
-Generator.prototype.bootstrapJS = function bootstrapJS() {
-  if (!this.bootstrap) {
-    return;  // Skip if disabled.
-  }
-
-  // Wire Twitter Bootstrap plugins
-  var appendOptions = {
-    html: this.indexFile,
-    fileType: 'js',
-    optimizedPath: 'scripts/plugins.js',
-    sourceFileList: [
-      'bower_components/sass-bootstrap/js/affix.js',
-      'bower_components/sass-bootstrap/js/alert.js',
-      'bower_components/sass-bootstrap/js/button.js',
-      'bower_components/sass-bootstrap/js/carousel.js',
-      'bower_components/sass-bootstrap/js/transition.js',
-      'bower_components/sass-bootstrap/js/collapse.js',
-      'bower_components/sass-bootstrap/js/dropdown.js',
-      'bower_components/sass-bootstrap/js/modal.js',
-      'bower_components/sass-bootstrap/js/scrollspy.js',
-      'bower_components/sass-bootstrap/js/tab.js',
-      'bower_components/sass-bootstrap/js/tooltip.js',
-      'bower_components/sass-bootstrap/js/popover.js'
-    ],
-    searchPath: 'app'
-  };
-
-  if (this.jade) {
-    this.indexFile = appendFilesToJade(appendOptions);
-  } else {
-    this.indexFile = this.appendFiles(appendOptions);
-  }
-};
-
-Generator.prototype.extraModules = function extraModules() {
-  var modules = [];
-  if (this.resourceModule) {
-    modules.push('bower_components/angular-resource/angular-resource.js');
-  }
-
-  if (this.cookiesModule) {
-    modules.push('bower_components/angular-cookies/angular-cookies.js');
-  }
-
-  if (this.sanitizeModule) {
-    modules.push('bower_components/angular-sanitize/angular-sanitize.js');
-  }
-
-  if (this.routeModule) {
-    modules.push('bower_components/angular-route/angular-route.js');
-  }
-  
-  if (modules.length) {
-    var appendOptions = {
-      html: this.indexFile,
-      fileType: 'js',
-      optimizedPath: 'scripts/modules.js',
-      sourceFileList: modules,
-      searchPath: 'app'
-    };
-
-    if (this.jade) {
-      this.indexFile = appendFilesToJade(appendOptions);
-    } else {
-      this.indexFile = this.appendFiles(appendOptions);
-    }
-  }
-};
-
 function generateJadeBlock(blockType, optimizedPath, filesBlock, searchPath, prefix) {
   var blockStart, blockEnd;
   var blockSearchPath = '';
@@ -452,6 +418,27 @@ Generator.prototype.imageFiles = function () {
   this.directory('images', 'app/images', true);
 };
 
+Generator.prototype._injectDependencies = function _injectDependencies() {
+  var howToInstall =
+    '\nAfter running `npm install & bower install`, inject your front end dependencies into' +
+    '\nyour HTML by running:' +
+    '\n' +
+    chalk.yellow.bold('\n  grunt bower-install');
+
+  if (this.options['skip-install']) {
+    console.log(howToInstall);
+  } else {
+    wiredep({
+      directory: 'app/bower_components',
+      bowerJson: JSON.parse(fs.readFileSync('./bower.json')),
+      ignorePath: 'app/',
+      htmlFile: 'app/index.html',
+      cssPattern: '<link rel="stylesheet" href="{{filePath}}">'
+    });
+  }
+};
+};
+
 Generator.prototype.serverFiles = function () {
   this.template('../../templates/express/server.js', 'server.js');
   this.template('../../templates/express/api.js', 'lib/controllers/api.js');