Fix npm warnings

.travis.yml

@@ -1,10 +1,13 @@
 language: node_js
 sudo: false
 node_js:
-  - 0.10
   - 0.12
   - 4
+  - 5
 # NodeJS v4 requires gcc 4.8
+matrix:
+  allow_failures:
+    - node_js: 5
 env:
   - NODE_ENV=travis CXX="g++-4.8" CC="gcc-4.8"
 services:
@@ -38,8 +41,3 @@ notifications:
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: never     # options: [always|never|change] default: always
-cache:
-  apt: true
-  directories:
-  - node_modules/
-  - public/lib/

CONTRIBUTING.md

@@ -16,23 +16,70 @@ Before you create a new Issue:
 
 * Create a topic branch from the master branch.
 * Check for unnecessary whitespace / changes with `git diff --check` before committing.
-	* Also check that your code is formatted properly with spaces (hint: Use [.editorconfig](http://editorconfig.org/))
+  * Also check that your code is formatted properly with spaces (hint: Use [.editorconfig](http://editorconfig.org/))
 * Keep git commit messages clear and appropriate
-	* If possible, please "squash" your commits to as few commits as possible/reasonable such as one commit for implementation, one for tests, and one for documentation before finally squashing to one commit when getting the LGTM from a collaborator.
+  * If possible, please "squash" your commits to as few commits as possible/reasonable such as one commit for implementation, one for tests, and one for documentation before finally squashing to one commit when getting the LGTM from a collaborator.
+  * Follow the commit message guidelines below.
 * Make Sure you have added any tests necessary to test your code.
-	* Run __all__ the tests to ensure nothing else was accidently broken.
-	* Don't rely on the existing tests to see if you've broken code elsewhere; test the changes you made in a browser too!
+  * Run __all__ the tests to ensure nothing else was accidently broken.
+  * Don't rely on the existing tests to see if you've broken code elsewhere; test the changes you made in a browser too!
 * Update the Documentation to go along with any changes in functionality / improvements in a separate pull request against the gh-pages branch.
 
+## Commit Message Guidelines
+```
+Header
+Blank Line
+Body
+Blank Line
+Footer
+
+The header should look like:
+<type>(<scope>): <subject>
+
+The body should have any necessary detailed info about the commit:
+An example, references as to where this idea came from, etc.
+
+The footer should have all the issues tagged:
+Fixes #123, Fixes #456
+
+So a commit should like like:
+feat(users): Add new Yahoo authentication
+
+Yahoo authentication idea proposed by @codydaig
+Example implementation in file.js
+
+Fixes #82
+```
+
+* Types: 
+  * feat - Features, Enhancements, and overall Improvements
+  * fix - Fixes, Bugs, HotFixs, etc...
+  * doc - Changes to the Documentation and doesn't actually touch any code.
+* Scope:
+  * The scope should be where the change took place.
+  * Examples: users, core, config, articles
+* Subject:
+  * The subject line should be clear and consice as to what is being accomplished in the commit.
+* General Rules:
+  * No Line in the Commit message can be longer than 80 characters.
+* Refrence: [Angular Conventions](https://github.com/ajoslin/conventional-changelog/blob/master/conventions/angular.md)
+
+
 ## Submitting the Pull Request
 
 * Push your changes to your topic branch on your fork of the repo.
 * Submit a pull request from your topic branch to the master branch on the MEAN.JS repository.
 * Be sure to tag any issues your pull request is taking care of / contributing to.
-	* By adding "Closes #xyz" to a commit message will auto close the issue once the pull request is merged in.
+  * By adding "Closes #xyz" to a commit message will auto close the issue once the pull request is merged in.
 * Small changes are usually accepted and merged in within a week (provided that 2 collaborators give the okay)
 * Larger changes usually spark further discussion and possible changes prior to being merged in.
 
 ## Documentation (meanjs.org)
 
 The code for the documentation and the website are located in the meanjs/mean repo on the gh-pages branch. The website is hosted by github pages and generated using jekyll. See the README in the gh-pages branch for more information on how to get your dev enviorment set-up.
+
+## Generating a new Release
+
+For those who will be generating releases:
+* Don't forget to update the changelog!
+  * `conventional-changelog -r 1 | cat - CHANGELOG.md | tee CHANGELOG.md`

Dockerfile

@@ -1,6 +1,4 @@
-FROM node:0.10
-
-MAINTAINER Matthias Luebken, [email protected]
+FROM node:0.12
 
 # Install gem sass for  grunt-contrib-sass
 RUN apt-get update -qq && apt-get install -y build-essential

README.md

@@ -18,6 +18,7 @@ Before you begin we recommend you read about the basic building blocks that asse
 ## Prerequisites
 Make sure you have installed all of the following prerequisites on your development machine:
 * Node.js - [Download & Install Node.js](https://nodejs.org/en/download/) and the npm package manager. If you encounter any problems, you can also use this [GitHub Gist](https://gist.github.com/isaacs/579814) to install Node.js.
+  * Node v5 IS NOT SUPPORTED AT THIS TIME! 
 * MongoDB - [Download & Install MongoDB](http://www.mongodb.org/downloads), and make sure it's running on the default port (27017).
 * Ruby - [Download & Install Ruby](https://www.ruby-lang.org/en/documentation/installation/)
 * Bower - You're going to use the [Bower Package Manager](http://bower.io/) to manage your front-end packages. Make sure you've installed Node.js and npm first, then install bower globally using npm:
@@ -38,6 +39,16 @@ $ npm install -g grunt-cli
 $ gem install sass
 ```
 
+```bash
+$ npm install -g grunt-cli
+```
+
+* Gulp - (Optional) You may use Gulp for Live Reload, Linting, and SASS or LESS.
+
+```bash
+$ npm install gulp -g
+```
+
 ## Downloading MEAN.JS
 There are several ways you can get the MEAN.JS boilerplate:
 
@@ -59,8 +70,8 @@ $ wget https://github.com/meanjs/mean/archive/master.zip -O meanjs.zip; unzip me
 
 Don't forget to rename **mean-master** after your project name.
 
-### Yo Generator		
--Another way would be to use the [Official Yo Generator](http://meanjs.org/generator.html), which generates a copy of the MEAN.JS 0.3.x boilerplate and supplies multiple sub-generators to ease your daily development cycles. 
+### Yo Generator
+Another way would be to use the [Official Yo Generator](http://meanjs.org/generator.html), which generates a copy of the MEAN.JS 0.4.x boilerplate and supplies an application generator to ease your daily development cycles.
 
 ## Quick Install
 Once you've downloaded the boilerplate and installed all the prerequisites, you're just a few steps away from starting to develop your MEAN application.
@@ -152,6 +163,59 @@ And to run only the client tests, run the test:client task:
 $ grunt test:client
 ```
 
+## Running your application with Gulp
+
+After the install process, you can easily run your project with:
+
+```bash
+$ gulp
+```
+or
+
+```bash
+$ gulp default
+```
+
+The server is now running on http://localhost:3000 if you are using the default settings. 
+
+### Running Gulp Development Environment
+
+Start the development environment with:
+
+```bash
+$ gulp dev
+```
+
+### Running in Production mode
+To run your application with *production* environment configuration, execute gulp as follows:
+
+```bash
+$ gulp prod
+```
+
+### Testing Your Application with Gulp
+Using the full test suite included with MEAN.JS with the test task:
+
+### Run all tests
+```bash
+$ gulp test
+```
+
+### Run server tests
+```bash
+gulp test:server
+```
+
+### Run client tests
+```bash
+gulp test:client
+```
+
+### Run e2e tests
+```bash
+gulp test:e2e
+```
+
 ## Development and deployment With Docker
 
 * Install [Docker](https://docs.docker.com/installation/#installation)
@@ -185,9 +249,6 @@ In the docs we'll try to explain both general concepts of MEAN components and gi
 * Discuss it in the new [Google Group](https://groups.google.com/d/forum/meanjs)
 * Ping us on [Twitter](http://twitter.com/meanjsorg) and [Facebook](http://facebook.com/meanjs)
 
-## Live Example
-Browse the live MEAN.JS example on [http://meanjs.herokuapp.com](http://meanjs.herokuapp.com).
-
 ## Contributing
 We welcome pull requests from the community! Just be sure to read the [contributing](https://github.com/meanjs/mean/blob/master/CONTRIBUTING.md) doc to get started.
 
@@ -196,17 +257,17 @@ We welcome pull requests from the community! Just be sure to read the [contribut
 Cloud Foundry is an open source platform-as-a-service (PaaS).  The MEANJS project
 can easily be deployed to any Cloud Foundry instance.  The easiest way to deploy the
 MEANJS project to Cloud Foundry is to use a public hosted instance.  The two most popular
-instances are [Pivotal Web Services](https://run.pivotal.io/) and 
+instances are [Pivotal Web Services](https://run.pivotal.io/) and
 [IBM Bluemix](https://bluemix.net).  Both provide free trials and support pay-as-you-go models
-for hosting applications in the cloud.  After you have an account follow the below steps to 
-deploy MEANJS.
+for hosting applications in the cloud.  After you have an account follow the below steps to deploy MEANJS.
 
 * Install the [Cloud Foundry command line tools](http://docs.cloudfoundry.org/devguide/installcf/install-go-cli.html).
 * Now you need to log into Cloud Foundry from the Cloud Foundry command line.
   *  If you are using Pivotal Web Services run `$ cf login -a api.run.pivotal.io`.
   *  If you are using IBM Bluemix run `$ cf login -a api.ng.bluemix.net`.
-* Create a Mongo DB service, IBM Bluemix and Pivotal Web Services offer a free MongoLabs service.
-  *  `$ cf create-service mongolab sandbox mean-mongo`
+* Create a Mongo DB service.
++  *  If you are using Pivotal Web Services run `$ cf create-service mongolab sandbox mean-mongo`
++  *  If you are using IBM Bluemix run `$ cf create-service mongodb 100 mean-mongo`
 * Clone the GitHub repo for MEANJS if you have not already done so
   * `$ git clone https://github.com/meanjs/mean.git && cd mean`
 * Run `$ npm install`
@@ -260,4 +321,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

config/env/cloud-foundry.js

@@ -1,9 +1,15 @@
 'use strict';
 
 var cfenv = require('cfenv'),
-  appEnv = cfenv.getAppEnv(),
-  cfMongoUrl = appEnv.getService('mean-mongo') ?
-  appEnv.getService('mean-mongo').credentials.uri : undefined;
+  appEnv = cfenv.getAppEnv();
+var cfMongoUrl = (function() {
+  if (appEnv.getService('mean-mongo')) {
+    var mongoCreds = appEnv.getService('mean-mongo').credentials;
+    return mongoCreds.uri || mongoCreds.url;
+  } else {
+    throw new Error('No service names "mean-mongo" bound to the application.');
+  }
+}());
 
 var getCred = function (serviceName, credProp) {
   return appEnv.getService(serviceName) ?

gulpfile.js

@@ -18,7 +18,8 @@ var _ = require('lodash'),
   endOfLine = require('os').EOL,
   protractor = require('gulp-protractor').protractor,
   webdriver_update = require('gulp-protractor').webdriver_update,
-  webdriver_standalone = require('gulp-protractor').webdriver_standalone;
+  webdriver_standalone = require('gulp-protractor').webdriver_standalone,
+  KarmaServer = require('karma').Server;
 
 // Set NODE_ENV to 'test'
 gulp.task('env:test', function () {
@@ -207,6 +208,11 @@ gulp.task('mocha', function (done) {
 
 // Karma test runner task
 gulp.task('karma', function (done) {
+  new KarmaServer({
+    configFile: __dirname + '/karma.conf.js',
+    singleRun: true
+  }, done).start();
+
   return gulp.src([])
     .pipe(plugins.karma({
       configFile: 'karma.conf.js',

manifest.yml

@@ -1,8 +1,8 @@
 ---
-declared-services: 
-  mean-mongo: 
-    label: mongolab 
-    plan: sandbox 
+declared-services:
+  mean-mongo:
+    label: mongodb
+    plan: 100
 applications:
 - name: mean
   host: mean-${random-word}

package.json

@@ -1,8 +1,8 @@
 {
   "name": "meanjs",
   "description": "Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
-  "version": "0.4.1",
-  "meanjs-version": "0.4.1",
+  "version": "0.4.2",
+  "meanjs-version": "0.4.2",
   "private": false,
   "author": "https://github.com/meanjs/mean/graphs/contributors",
   "license": "MIT",
@@ -11,8 +11,8 @@
     "url": "https://github.com/meanjs/mean.git"
   },
   "engines": {
-    "node": ">=0.10.28",
-    "npm": ">=1.4.28"
+    "node": ">=0.12.0",
+    "npm": ">=2.0.0"
   },
   "scripts": {
     "start": "grunt",
@@ -77,7 +77,7 @@
     "grunt-contrib-watch": "~0.6.1",
     "grunt-env": "~0.4.4",
     "grunt-eslint": "~17.3.1",
-    "grunt-karma": "~0.11.2",
+    "grunt-karma": "~0.12.1",
     "grunt-mocha-istanbul": "^2.4.0",
     "grunt-mocha-test": "~0.12.7",
     "grunt-ng-annotate": "^1.0.1",
@@ -93,7 +93,6 @@
     "gulp-cssmin": "~0.1.7",
     "gulp-eslint": "~1.0.0",
     "gulp-jshint": "^1.11.2",
-    "gulp-karma": "~0.0.4",
     "gulp-less": "^3.0.3",
     "gulp-livereload": "^3.8.0",
     "gulp-load-plugins": "^1.0.0-rc.1",
@@ -105,7 +104,8 @@
     "gulp-sass": "^2.0.3",
     "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.6",
-    "karma": "~0.12.37",
+    "istanbul": "~0.4.0",
+    "karma": "~0.13.14",
     "karma-chrome-launcher": "~0.2.0",
     "karma-coverage": "~0.4.2",
     "karma-firefox-launcher": "~0.1.6",