Merge branch 'canary' of https://github.com/DaftMonk/generator-angular-fullstack into gulp

* 'canary' of https://github.com/DaftMonk/generator-angular-fullstack:
  feat(jscs): update to ^2.1.0, rename config file to .jscsrc, use esnext option
  docs(gen:readme): remove demo
  chore(npm): grunt-node-inspector ^0.2.0 -> ^0.4.1
  Fix typo in readme.md
  fix(server:config): template db configs and add sequelize prod conf
  chore(dependencies): require peer-dependant modules directly, per npm 3+
  feat(client:admin): use class for AdminController
  refactor(karma): update file globs, jade preprocessor only when `filters.jade`
  feat(client:admin): use controllerAs syntax for `AdminController`
  feat(client:admin): implement admin components as a seperate module
  chore(travis): add node 4.0.0 to travis targets

Author: Awk34

Diff for: .travis.yml

@@ -2,10 +2,15 @@ sudo: false
 language: node_js
 node_js:
   - '0.12'
+  - '4.0.0'
 env:
   global:
     - SAUCE_USERNAME=fullstack_ci
     - SAUCE_ACCESS_KEY=1a527ca6-4aa5-4618-86ce-0278bf158cbf
+matrix:
+  fast_finish: true
+  allow_failures:
+    - node_js: 4.0.0
 before_install:
   - ./scripts/sauce_connect_setup.sh
   - gem update --system

Diff for: app/generator.js

@@ -401,6 +401,7 @@ export default class Generator extends Base {
         if(this.filters.uirouter) angModules.push("'ui.router'");
         if(this.filters.uibootstrap) angModules.push("'ui.bootstrap'");
         if(this.filters.auth) {
+          angModules.unshift(`'${this.scriptAppName}.admin'`);
           angModules.unshift(`'${this.scriptAppName}.auth'`);
           angModules.push("'validation.match'");
         }

Diff for: app/templates/.jscs.json renamed to app/templates/.jscsrc

@@ -1,4 +1,5 @@
 {
+  "esnext": true,
   "maximumLineLength": {
     "value": 100,
     "allowComments": true,

Diff for: app/templates/.travis.yml

@@ -1,6 +1,11 @@
 language: node_js
 node_js:
   - '0.12'
+  - '4.0.0'
+matrix:
+  fast_finish: true
+  allow_failures:
+    - node_js: 4.0.0
 before_script:
   - npm install -g bower grunt-cli<% if (filters.sass) { %>
   - gem install sass<% } %>

Diff for: app/templates/Gruntfile(grunt).js

@@ -165,7 +165,7 @@ module.exports = function (grunt) {
 
     jscs: {
       options: {
-        config: ".jscs.json"
+        config: ".jscsrc"
       },
       main: {
         files: {

Diff for: app/templates/_package.json

@@ -95,19 +95,20 @@
     "grunt-contrib-jshint": "~0.11.2",
     "grunt-contrib-uglify": "^0.9.1",
     "grunt-contrib-watch": "~0.6.1",<% if (filters.jade) { %>
-    "grunt-contrib-jade": "^0.15.0",<% } %><% if (filters.less) { %>
+    "grunt-contrib-jade": "^0.15.0",
+    "karma-ng-jade2js-preprocessor": "^0.2.0",<% } %><% if (filters.less) { %>
     "grunt-contrib-less": "^1.0.0",<% } %><% if(filters.babel) { %>
     "karma-babel-preprocessor": "^5.2.1",<% } %>
     "grunt-babel": "~5.0.0",
     "grunt-google-cdn": "~0.4.0",
-    "grunt-jscs": "^2.0.0",
+    "grunt-jscs": "^2.1.0",
     "grunt-newer": "^1.1.1",
     "grunt-ng-annotate": "^1.0.1",
     "grunt-ng-constant": "^1.1.0",
     "grunt-filerev": "^2.3.1",
     "grunt-usemin": "^3.0.0",
     "grunt-env": "~0.4.1",
-    "grunt-node-inspector": "^0.2.0",
+    "grunt-node-inspector": "^0.4.1",
     "grunt-nodemon": "^0.4.0",
     "grunt-angular-templates": "^0.5.4",
     "grunt-dom-munger": "^3.4.0",
@@ -129,6 +130,8 @@
     "connect-livereload": "^0.5.3",
     "mocha": "^2.2.5",
     "istanbul": "^0.3.17",
+    "chai": "^3.2.0",
+    "sinon": "^1.16.1",
     "chai-as-promised": "^5.1.0",
     "chai-things": "^0.2.0",
     "sinon-chai": "^2.8.0",<% if (filters.mocha) { %>
@@ -142,11 +145,11 @@
     "karma-firefox-launcher": "~0.1.6",
     "karma-script-launcher": "~0.1.0",
     "karma-html2js-preprocessor": "~0.1.0",
-    "karma-ng-jade2js-preprocessor": "^0.2.0",
     "karma-chrome-launcher": "~0.2.0",
     "requirejs": "~2.1.11",
     "karma-requirejs": "~0.2.2",
     "karma-jade-preprocessor": "0.0.11",
+    "phantomjs": "^1.9.18",
     "karma-phantomjs-launcher": "~0.2.0",
     "karma": "~0.13.3",
     "karma-ng-html2js-preprocessor": "~0.1.2",

Diff for: app/templates/client/app/admin(auth)/admin(html).html

@@ -3,10 +3,10 @@
 <div class="container">
   <p>The delete user and user index api routes are restricted to users with the 'admin' role.</p>
   <ul class="list-group">
-    <li class="list-group-item" ng-repeat="user in users">
+    <li class="list-group-item" ng-repeat="user in admin.users">
         <strong>{{user.name}}</strong><br>
         <span class="text-muted">{{user.email}}</span>
-        <a ng-click="delete(user)" class="trash"><span class="glyphicon glyphicon-trash pull-right"></span></a>
+        <a ng-click="admin.delete(user)" class="trash"><span class="glyphicon glyphicon-trash pull-right"></span></a>
     </li>
   </ul>
 </div>

Diff for: app/templates/client/app/admin(auth)/admin(jade).jade

@@ -3,9 +3,9 @@ navbar
   p
     | The delete user and user index api routes are restricted to users with the 'admin' role.
   ul.list-group
-    li.list-group-item(ng-repeat='user in users')
+    li.list-group-item(ng-repeat='user in admin.users')
       strong {{user.name}}
       br
       span.text-muted {{user.email}}
-      a.trash(ng-click='delete(user)')
+      a.trash(ng-click='admin.delete(user)')
         span.glyphicon.glyphicon-trash.pull-right

Diff for: app/templates/client/app/admin(auth)/admin.controller.js

@@ -1,13 +1,21 @@
 'use strict';
 
-angular.module('<%= scriptAppName %>')
-  .controller('AdminCtrl', function($scope, $http, Auth, User) {
+(function() {
 
+class AdminController {
+
+  constructor(User) {
     // Use the User $resource to fetch all users
-    $scope.users = User.query();
+    this.users = User.query();
+  }
+
+  delete(user) {
+    user.$remove();
+    this.users.splice(this.users.indexOf(user), 1);
+  }
+}
+
+angular.module('<%= scriptAppName %>.admin')
+  .controller('AdminController', AdminController);
 
-    $scope.delete = function(user) {
-      User.remove({ id: user._id });
-      $scope.users.splice(this.$index, 1);
-    };
-  });
+})();

Diff for: app/templates/client/app/admin(auth)/admin.module.js

@@ -0,0 +1,7 @@
+'use strict';
+
+angular.module('<%= scriptAppName %>.admin', [
+  '<%= scriptAppName %>.auth'<% if (filters.ngroute) { %>,
+  'ngRoute'<% } if (filters.uirouter) { %>,
+  'ui.router'<% } %>
+]);

Diff for: app/templates/client/app/admin(auth)/admin.js renamed to app/templates/client/app/admin(auth)/admin.router.js

@@ -1,19 +1,21 @@
 'use strict';
 
-angular.module('<%= scriptAppName %>')
+angular.module('<%= scriptAppName %>.admin')
   <% if (filters.ngroute) { %>.config(function($routeProvider) {
     $routeProvider
       .when('/admin', {
         templateUrl: 'app/admin/admin.html',
-        controller: 'AdminCtrl',
+        controller: 'AdminController',
+        controllerAs: 'admin',
         authenticate: 'admin'
       });
-  });<% } %><% if (filters.uirouter) { %>.config(function($stateProvider) {
+  });<% } if (filters.uirouter) { %>.config(function($stateProvider) {
     $stateProvider
       .state('admin', {
         url: '/admin',
         templateUrl: 'app/admin/admin.html',
-        controller: 'AdminCtrl',
+        controller: 'AdminController',
+        controllerAs: 'admin',
         authenticate: 'admin'
       });
   });<% } %>

Diff for: app/templates/karma.conf.js

@@ -22,29 +22,25 @@ module.exports = function(config) {
       // endbower<% if (filters.socketio) { %>
       'node_modules/socket.io-client/socket.io.js',<% } %>
       'client/app/app.js',
-      'client/app/**/*.js',
-      'client/components/**/*.js',
-      'client/app/**/*.jade',
-      'client/components/**/*.jade',
-      'client/app/**/*.html',
-      'client/components/**/*.html'
+      'client/{app,components}/**/*.module.js',
+      'client/{app,components}/**/*.js',
+      'client/{app,components}/**/*.<%= filters.jade ? '{jade,html}' : 'html' %>'
     ],
 
     preprocessors: {
-      '**/*.jade': 'ng-jade2js',
-      '**/*.html': 'html2js',<% if(filters.babel) { %>
+      '**/*.html': 'html2js'<% if (filters.jade) { %>,
+      '**/*.jade': 'ng-jade2js'<% } if (filters.babel) { %>,
       'client/{app,components}/**/*.js': 'babel'<% } %>
     },
 
     ngHtml2JsPreprocessor: {
       stripPrefix: 'client/'
-    },
+    },<% if (filters.jade) { %>
 
     ngJade2JsPreprocessor: {
       stripPrefix: 'client/'
-    },
+    },<% } if (filters.babel) { %>
 
-    <% if(filters.babel) { %>
     babelPreprocessor: {
       options: {
         sourceMap: 'inline'
@@ -55,8 +51,7 @@ module.exports = function(config) {
       sourceFileName: function (file) {
         return file.originalPath;
       }
-    },
-    <% } %>
+    },<% } %>
 
     // list of files / patterns to exclude
     exclude: [],
@@ -80,7 +75,6 @@ module.exports = function(config) {
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: false,
 
-
     // Start these browsers, currently available:
     // - Chrome
     // - ChromeCanary
@@ -91,7 +85,6 @@ module.exports = function(config) {
     // - IE (only Windows)
     browsers: ['PhantomJS'],
 
-
     // Continuous Integration mode
     // if true, it capture browsers, run tests and exit
     singleRun: false

Diff for: app/templates/server/config/environment/development.js

@@ -2,11 +2,14 @@
 
 // Development specific configuration
 // ==================================
-module.exports = {
+module.exports = {<% if (filters.mongoose) { %>
+
   // MongoDB connection options
   mongo: {
     uri: 'mongodb://localhost/<%= lodash.slugify(appname) %>-dev'
-  },
+  },<% } if (filters.sequelize) { %>
+
+  // Sequelize connecton opions
   sequelize: {
     uri: 'sqlite://',
     options: {
@@ -16,7 +19,9 @@ module.exports = {
         timestamps: false
       }
     }
-  },
+  },<% } %>
 
+  // Seed database on startup
   seedDB: true
+
 };

Diff for: app/templates/server/config/environment/production.js

@@ -4,21 +4,33 @@
 // =================================
 module.exports = {
   // Server IP
-  ip:       process.env.OPENSHIFT_NODEJS_IP ||
-            process.env.IP ||
-            undefined,
+  ip:     process.env.OPENSHIFT_NODEJS_IP ||
+          process.env.IP ||
+          undefined,
 
   // Server port
-  port:     process.env.OPENSHIFT_NODEJS_PORT ||
-            process.env.PORT ||
-            8080,
+  port:   process.env.OPENSHIFT_NODEJS_PORT ||
+          process.env.PORT ||
+          8080<% if (filters.mongoose) { %>,
 
   // MongoDB connection options
   mongo: {
-    uri:    process.env.MONGOLAB_URI ||
-            process.env.MONGOHQ_URL ||
-            process.env.OPENSHIFT_MONGODB_DB_URL +
-            process.env.OPENSHIFT_APP_NAME ||
-            'mongodb://localhost/<%= lodash.slugify(appname) %>'
-  }
+    uri:  process.env.MONGOLAB_URI ||
+          process.env.MONGOHQ_URL ||
+          process.env.OPENSHIFT_MONGODB_DB_URL +
+          process.env.OPENSHIFT_APP_NAME ||
+          'mongodb://localhost/<%= lodash.slugify(appname) %>'
+  }<% } if (filters.sequelize) { %>,
+
+  sequelize: {
+    uri:  process.env.SEQUELIZE_URI ||
+          'sqlite://',
+    options: {
+      logging: false,
+      storage: 'dist.sqlite',
+      define: {
+        timestamps: false
+      }
+    }
+  }<% } %>
 };

Diff for: readme.md

@@ -12,8 +12,6 @@
 
 ## Example project
 
-Generated with defaults: http://fullstack-demo.herokuapp.com/.
-
 Source code: https://github.com/DaftMonk/fullstack-demo
 
 ## Usage
@@ -442,7 +440,7 @@ See the [contributing docs](https://github.com/DaftMonk/generator-angular-fullst
 
 This project has 2 main branches: `master` and `canary`. The `master` branch is where the current stable code lives and should be used for production setups. The `canary` branch is the main development branch, this is where PRs should be submitted to (backport fixes may be applied to `master`).
 
-By seperating the current stable code from the cutting-edge development we hope to provide a stable and efficient workflow for users and developers alike.
+By separating the current stable code from the cutting-edge development we hope to provide a stable and efficient workflow for users and developers alike.
 
 When submitting an issue, please follow the [guidelines](https://github.com/yeoman/yeoman/blob/master/contributing.md#issue-submission). Especially important is to make sure Yeoman is up-to-date, and providing the command or commands that cause the issue.
 

Diff for: test/test-file-creation.js

@@ -213,7 +213,7 @@ describe('angular-fullstack generator', function () {
       '.gitattributes',
       '.gitignore',
       '.travis.yml',
-      '.jscs.json',
+      '.jscsrc',
       '.yo-rc.json',
       'Gruntfile.js',
       'package.json',
@@ -268,7 +268,8 @@ describe('angular-fullstack generator', function () {
         'client/app/account/signup/signup.controller.' + script,
         'client/app/admin/admin.' + markup,
         'client/app/admin/admin.' + stylesheet,
-        'client/app/admin/admin.' + script,
+        'client/app/admin/admin.module.' + script,
+        'client/app/admin/admin.router.' + script,
         'client/app/admin/admin.controller.' + script,
         'client/components/auth/auth.module.' + script,
         'client/components/auth/auth.service.' + script,