Merge branch 'feature-demo'

Author: DaftMonk

.gitignore

@@ -1,7 +1,7 @@
 node_modules
 bower_components
 test/temp
-test/UpperCaseBug
+demo
 .idea
 .DS_Store
 release.txt

Gruntfile.js

@@ -1,11 +1,19 @@
 'use strict';
 var markdown = require('marked');
 var semver = require('semver');
+var _s = require('underscore.string');
+var shell = require('shelljs');
+var process = require('child_process');
+var Q = require('q');
+var helpers = require('yeoman-generator').test;
 
 module.exports = function (grunt) {
   require('load-grunt-tasks')(grunt);
 
   grunt.initConfig({
+    config: {
+      demo: 'demo'
+    },
     pkg: grunt.file.readJSON('package.json'),
     changelog: {
       options: {
@@ -26,12 +34,39 @@ module.exports = function (grunt) {
         files: ['CHANGELOG.md']
       }
     },
+    buildcontrol: {
+      options: {
+        dir: 'demo',
+        commit: true,
+        push: true,
+        connectCommits: false,
+        message: 'Built using Angular Fullstack v<%= pkg.version %> from commit %sourceCommit%'
+      },
+      release: {
+        options: {
+          remote: 'origin',
+          branch: 'master'
+        }
+      }
+    },
     jshint: {
       options: {
         curly: false,
         node: true
       },
       all: ['Gruntfile.js', '*/index.js']
+    },
+    clean: {
+      demo: {
+        files: [{
+          dot: true,
+          src: [
+            '<%= config.demo %>/*',
+            '!<%= config.demo %>/.git',
+            '!<%= config.demo %>/dist'
+          ]
+        }]
+      }
     }
   });
 
@@ -63,5 +98,77 @@ module.exports = function (grunt) {
     }, grunt.task.current.async());
   });
 
+  grunt.registerTask('generate', 'generate demo', function () {
+    var done = this.async();
+
+    shell.cd(grunt.config('config').demo);
+
+    Q()
+      .then(generateDemo)
+      .then(gruntBuild)
+      .then(gruntRelease)
+      .catch(function(msg){
+        grunt.fail.warn(msg || 'failed to generate demo')
+      })
+      .finally(done);
+
+    function generateDemo() {
+      var deferred = Q.defer();
+      var options = {
+        script: 'js',
+        markup: 'html',
+        stylesheet: 'sass',
+        router: 'uirouter',
+        mongoose: true,
+        auth: true,
+        oauth: ['googleAuth', 'twitterAuth'],
+        socketio: true
+      };
+
+      var deps = [
+        '../app',
+        [
+          helpers.createDummyGenerator(),
+          'ng-component:app'
+        ]
+      ];
+
+      var gen = helpers.createGenerator('angular-fullstack:app', deps);
+
+      helpers.mockPrompt(gen, options);
+      gen.run({}, function () {
+        deferred.resolve();
+      });
+
+      return deferred.promise;
+    }
+
+    function run(cmd) {
+      var deferred = Q.defer();
+      var generator = shell.exec(cmd, {async:true});
+      generator.stdout.on('data', function (data) {
+        grunt.verbose.writeln(data);
+      });
+      generator.on('exit', function (code) {
+        deferred.resolve();
+      });
+
+      return deferred.promise;
+    }
+
+    function gruntBuild() {
+      return run('grunt');
+    }
+
+    function gruntRelease() {
+      return run('grunt buildcontrol');
+    }
+  });
+
+  grunt.registerTask('demo', [
+    'clean:demo',
+    'generate'
+  ]);
+
   //grunt.registerTask('default', ['bump', 'changelog', 'stage', 'release']);
 };

app/templates/Gruntfile.js

@@ -16,7 +16,8 @@ module.exports = function (grunt) {
     ngtemplates: 'grunt-angular-templates',
     cdnify: 'grunt-google-cdn',
     protractor: 'grunt-protractor-runner',
-    injector: 'grunt-asset-injector'
+    injector: 'grunt-asset-injector',
+    buildcontrol: 'grunt-build-control'
   });
 
   // Time how long tasks take. Can help when optimizing build times
@@ -26,6 +27,7 @@ module.exports = function (grunt) {
   grunt.initConfig({
 
     // Project settings
+    pkg: grunt.file.readJSON('package.json'),
     yeoman: {
       // configurable paths
       client: require('./bower.json').appPath || 'client',
@@ -407,6 +409,28 @@ module.exports = function (grunt) {
       }
     },
 
+    buildcontrol: {
+      options: {
+        dir: 'dist',
+        commit: true,
+        push: true,
+        connectCommits: false,
+        message: 'Built %sourceName% from commit %sourceCommit% on branch %sourceBranch%'
+      },
+      heroku: {
+        options: {
+          remote: 'heroku',
+          branch: 'master'
+        }
+      },
+      openshift: {
+        options: {
+          remote: 'openshift',
+          branch: 'master'
+        }
+      }
+    },
+
     // Run some tasks in parallel to speed up the build process
     concurrent: {
       server: [<% if(filters.coffee) { %>

app/templates/_.gitignore

@@ -2,6 +2,7 @@ node_modules
 public
 .tmp
 .sass-cache
+.idea
 client/bower_components
 dist
 /server/config/local.env.js

app/templates/_package.json

@@ -59,6 +59,7 @@
     "grunt-protractor-runner": "^1.1.0",
     "grunt-asset-injector": "^0.1.0",
     "grunt-karma": "~0.8.2",
+    "grunt-build-control": "DaftMonk/grunt-build-control",
     "grunt-mocha-test": "~0.10.2",<% if(filters.sass) { %>
     "grunt-contrib-sass": "^0.7.3",<% } %><% if(filters.stylus) { %>
     "grunt-contrib-stylus": "latest",<% } %>

app/templates/client/app/main/main(html).html

@@ -31,7 +31,8 @@ <h1 class="page-header">Features:</h1>
 
 <footer class="footer">
   <div class="container">
-      <p><a href="https://twitter.com/tyhenkel">@tyhenkel</a> |
+      <p>Angular Fullstack v<%= pkg.version %> |
+        <a href="https://twitter.com/tyhenkel">@tyhenkel</a> |
          <a href="https://github.com/DaftMonk/generator-angular-fullstack/issues?state=open">Issues</a></p>
   </div>
 </footer>

app/templates/client/app/main/main(jade).jade

@@ -26,6 +26,8 @@ header#banner.hero-unit
 footer.footer
   .container
     p
+      | Angular Fullstack v<%= pkg.version %>
+      = ' | '
       a(href='https://twitter.com/tyhenkel') @tyhenkel
       = ' | '
       a(href='https://github.com/DaftMonk/generator-angular-fullstack/issues?state=open') Issues

heroku/index.js

@@ -161,10 +161,6 @@ Generator.prototype.gitForcePush = function gitForcePush() {
         this.log(chalk.yellow('\nBecause you\'re using mongoose, you must add mongoDB to your heroku app.\n\t' + 'from `/dist`: ' + chalk.bold('heroku addons:add mongohq') + '\n'));
         hasWarning = true;
       }
-      if(this.filters.socketio) {
-        this.log(chalk.yellow('Because you\'re using socketIO, you must enable websockets on your heroku app.\n\t' + 'from `/dist`: ' + chalk.bold('heroku labs:enable websockets') + '\n'));
-        hasWarning = true;
-      }
 
       if(this.filters.facebookAuth) {
         this.log(chalk.yellow('You will need to set environment variables for facebook auth. From `/dist`:\n\t' +
@@ -190,9 +186,8 @@ Generator.prototype.gitForcePush = function gitForcePush() {
         this.log(chalk.green('\nYou may need to address the issues mentioned above and restart the server for the app to work correctly.'));
       }
 
-      this.log(chalk.cyan('\nTo deploy a new build\n\t' + chalk.bold('grunt build') +
-                '\nThen enter the dist folder to commit these updates:\n\t' + chalk.bold('cd dist && git add -A && git commit -m "describe your changes here"')));
-      this.log(chalk.cyan('Finally, deploy your updated build to Heroku with\n\t' + chalk.bold('git push -f heroku master')));
+      this.log(chalk.yellow('After app modification run\n\t' + chalk.bold('grunt build') +
+      '\nThen deploy with\n\t' + chalk.bold('grunt buildcontrol:heroku')));
     }
     done();
   }.bind(this));