fix(gen): fix more appPath, other changes

Views and decorators weren't using appPath correctly. The code is ugly
and not DRY at all but will be cleaned up later. gitIgnore also needed
some appPath love.

Moved the gitignore creation to the package section of app/index.js

Also did more work with tests, cleaning them up and testing more things.
They are going to have to have a full rewrite so it makes me sad doing
these small changes.

.gitignore

@@ -1,3 +1,3 @@
 .DS_Store
 node_modules
-test/temp
+test/tmp

app/index.js

@@ -37,6 +37,7 @@ var Generator = module.exports = function Generator(args, options) {
       } catch (e) {}
     }
     this.env.options.appPath = this.env.options.appPath || 'app';
+    this.options.appPath = this.env.options.appPath;
   }
 
   this.appPath = this.env.options.appPath;
@@ -268,6 +269,7 @@ Generator.prototype.packageFiles = function packageFiles() {
   this.coffee = this.env.options.coffee;
   this.template('root/_bower.json', 'bower.json');
   this.template('root/_bowerrc', '.bowerrc');
+  this.template('root/gitignore', '.gitignore');
   this.template('root/_package.json', 'package.json');
   this.template('root/_Gruntfile.js', 'Gruntfile.js');
 };

common/index.js

@@ -17,7 +17,6 @@ Generator.prototype.setupEnv = function setupEnv() {
   this.copy('.editorconfig');
   this.copy('.gitattributes');
   this.copy('.jshintrc');
-  this.copy('gitignore', '.gitignore');
   this.directory('test');
 
   this.sourceRoot(join(__dirname, '../templates/common'));

decorator/index.js

@@ -2,14 +2,27 @@
 var util = require('util');
 var ScriptBase = require('../script-base.js');
 var fs = require('fs');
+var path = require('path');
 
 function buildRelativePath(fileName){
-  return 'decorators/' + fileName + "Decorator";
+  return path.join('decorators', fileName + "Decorator");
 }
 
 var Generator = module.exports = function Generator(args, options) {
   ScriptBase.apply(this, arguments);
   this.fileName = this.name;
+
+  if (typeof this.env.options.appPath === 'undefined') {
+    this.env.options.appPath = this.options.appPath;
+
+    if (!this.env.options.appPath) {
+      try {
+        this.env.options.appPath = require(path.join(process.cwd(), 'bower.json')).appPath;
+      } catch (e) {}
+    }
+    this.env.options.appPath = this.env.options.appPath || 'app';
+    this.options.appPath = this.env.options.appPath;
+  }
 };
 
 util.inherits(Generator, ScriptBase);
@@ -18,8 +31,10 @@ Generator.prototype.askForOverwrite = function askForOverwrite() {
   var cb = this.async();
 
   // TODO: Any yeoman.util function to handle this?
-  var fileExists = fs.existsSync(this.env.cwd + '/app/scripts/' + buildRelativePath(this.fileName) + ".js");
-  if (fileExists) {
+  if (fs.existsSync(path.join(
+    this.env.cwd, this.env.options.appPath,
+    'scripts', buildRelativePath(this.fileName) + ".js"
+  ))) {
     var prompts = [{
       type: 'confirm',
       name: 'overwriteDecorator',
@@ -62,6 +77,9 @@ Generator.prototype.askForNewName = function askForNewName() {
 };
 
 Generator.prototype.createDecoratorFiles = function createDecoratorFiles() {
-  this.appTemplate('decorator', 'scripts/' + buildRelativePath(this.fileName));
+  this.appTemplate(
+    'decorator',
+    path.join('scripts', buildRelativePath(this.fileName))
+  );
   this.addScriptToIndex(buildRelativePath(this.fileName));
 };

script-base.js

@@ -28,6 +28,7 @@ var Generator = module.exports = function Generator() {
       } catch (e) {}
     }
     this.env.options.appPath = this.env.options.appPath || 'app';
+    this.options.appPath = this.env.options.appPath;
   }
 
   if (typeof this.env.options.testPath === 'undefined') {

templates/common/root/gitignore

@@ -2,4 +2,4 @@ node_modules
 dist
 .tmp
 .sass-cache
-app/bower_components
+<%= appPath %>/bower_components

test/test-appname-substitution.js

@@ -1,11 +1,7 @@
 /*global describe, before, it, beforeEach */
 'use strict';
 
-var fs = require('fs');
-var assert = require('assert');
 var path = require('path');
-var util = require('util');
-var generators = require('yeoman-generator');
 var helpers = require('yeoman-generator').test;
 
 describe('Angular generator template mechanism', function () {
@@ -22,56 +18,54 @@ describe('Angular generator template mechanism', function () {
         'karma:app'
       ]
     ];
-    helpers.testDirectory(path.join(__dirname, 'temp', appName), function (err) {
+    helpers.testDirectory(path.join(__dirname, 'tmp', appName), function (err) {
       if (err) {
         done(err);
       }
+
       angular = helpers.createGenerator('angular:app', deps, [appName], {
         'skip-welcome-message': true,
         'skip-install': true,
         'skip-message': true
       });
+
+      helpers.mockPrompt(angular, {
+        compass: true,
+        bootstrap: true,
+        compassBootstrap: true,
+        modules: []
+      });
+
       done();
     });
   });
 
   it('should generate the same appName in every file', function (done) {
-    var expected = [
-      'app/scripts/app.js',
-      'app/scripts/controllers/main.js',
-      'app/index.html',
-      'test/spec/controllers/main.js'
-    ];
-
-    helpers.mockPrompt(angular, {
-      compass: true,
-      bootstrap: true,
-      compassBootstrap: true,
-      modules: []
-    });
-
     angular.run({}, function () {
-      // Check if all files are created for the test
-      helpers.assertFile(expected);
-
-      // read JS Files
-      var app_js = fs.readFileSync('app/scripts/app.js', 'utf8');
-      var main_js = fs.readFileSync('app/scripts/controllers/main.js', 'utf8');
-      var main_test_js = fs.readFileSync('test/spec/controllers/main.js', 'utf8');
-
-      // Test JS Files
-      var regex_js = new RegExp('module\\(\'' + appName + 'App\'');
-
-      assert.ok(regex_js.test(app_js), 'app.js template using a wrong appName');
-      assert.ok(regex_js.test(main_js), 'main.js template using a wrong appName');
-      assert.ok(regex_js.test(main_test_js), 'controller spec template using a wrong appName');
+      helpers.assertFile([
+        'app/scripts/app.js',
+        'app/scripts/controllers/main.js',
+        'app/index.html',
+        'test/spec/controllers/main.js'
+      ]);
 
-      // read HTML file
-      var index_html = fs.readFileSync('app/index.html', 'utf8');
+      helpers.assertFileContent(
+        'app/scripts/app.js',
+        new RegExp('module\\(\'' + appName + 'App\'')
+      );
+      helpers.assertFileContent(
+        'app/scripts/controllers/main.js',
+        new RegExp('module\\(\'' + appName + 'App\'')
+      );
+      helpers.assertFileContent(
+        'test/spec/controllers/main.js',
+        new RegExp('module\\(\'' + appName + 'App\'')
+      );
 
-      // Test HTML File
-      var regex_html = new RegExp('ng-app=\"' + appName + 'App\"');
-      assert.ok(regex_html.test(index_html), 'index.html template using a wrong appName');
+      helpers.assertFileContent(
+        'app/index.html',
+        new RegExp('ng-app=\"' + appName + 'App\"')
+      );
       done();
     });
   });