Merge branch '0.4.x' of github.com:meanjs/mean into update-mean

.bluemix/pipeline.yml

@@ -0,0 +1,42 @@
+---
+stages:
+- name: Build
+  inputs:
+  - type: git
+    branch: master
+  triggers:
+  - type: commit
+  jobs:
+  - name: meanjs-build
+    type: builder
+    artifact_dir: ./
+    build_type: grunt
+    script: |-
+      #!/bin/bash
+      # Install RVM, Ruby, and SASS
+      # Needed when running grunt build
+      gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+      curl -sSL https://get.rvm.io | bash -s stable --ruby --gems=sass
+      # Start RVM
+      source /home/jenkins/.rvm/scripts/rvm
+      # Build MEANJS
+      npm install
+      grunt build
+- name: Deploy
+  inputs:
+  - type: job
+    stage: Build
+    job: meanjs-build
+  jobs:
+  - name: Deploy
+    type: deployer
+    target:
+      url: ${CF_TARGET_URL}
+      organization: ${CF_ORGANIZATION}
+      space: ${CF_SPACE}
+      application: ${CF_APP}
+    script: |-
+      #!/bin/bash
+      cf push
+      # view logs
+      #cf logs "${CF_APP}" --recent

.bowerrc

@@ -1,3 +1,3 @@
 {
-	"directory": "public/lib"
+  "directory": "public/lib"
 }

.cfignore

@@ -0,0 +1,10 @@
+# List of files and directories to ignore when deploying to Cloud Foundry
+.DS_Store
+.nodemonignore
+.sass-cache/
+npm-debug.log
+node_modules/
+public/lib
+app/tests/coverage/
+.bower-*/
+.idea/ 

.csslintrc

@@ -1,15 +1,15 @@
 {
-	"adjoining-classes": false,
-	"box-model": false,
-	"box-sizing": false,
-	"floats": false,
-	"font-sizes": false,
-	"important": false,
-	"known-properties": false,
-	"overqualified-elements": false,
-	"qualified-headings": false,
-	"regex-selectors": false,
-	"unique-headings": false,
-	"universal-selector": false,
-	"unqualified-attributes": false
+  "adjoining-classes": false,
+  "box-model": false,
+  "box-sizing": false,
+  "floats": false,
+  "font-sizes": false,
+  "important": false,
+  "known-properties": false,
+  "overqualified-elements": false,
+  "qualified-headings": false,
+  "regex-selectors": false,
+  "unique-headings": false,
+  "universal-selector": false,
+  "unqualified-attributes": false
 }

.editorconfig

@@ -1,6 +1,6 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
-# Howto with your editor:
+# Howto with your editor: http://editorconfig.org/#download
 #   Sublime: https://github.com/sindresorhus/editorconfig-sublime
 
 # top-most EditorConfig file
@@ -14,23 +14,35 @@ insert_final_newline = true
 # Standard at: https://github.com/felixge/node-style-guide 
 [**.js, **.json]
 trim_trailing_whitespace = true
-indent_style = tab
+indent_style = space
+indent_size = 2
 quote_type = single
 curly_bracket_next_line = false
 spaces_around_operators = true
 space_after_control_statements = true
-space_after_anonymous_functions = false
+space_after_anonymous_functions = true
 spaces_in_brackets = false
 
 # No Standard.  Please document a standard if different from .js
-[**.yml, **.html, **.css]
+[**.yml, **.css]
 trim_trailing_whitespace = true
 indent_style = tab
 
+[**.html]
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
 # No standard.  Please document a standard if different from .js
 [**.md]
 indent_style = tab
 
 # Standard at: 
 [Makefile]
-indent_style = tab
+indent_style = tab
+
+# The indentation in package.json will always need to be 2 spaces
+# https://github.com/npm/npm/issues/4718
+[package.json, bower.json]
+indent_style = space
+indent_size = 2

.eslintrc

@@ -0,0 +1,37 @@
+{
+  rules: {
+    indent: [2, 2, {"SwitchCase": 1}],
+    no-multi-spaces: 2,
+    no-underscore-dangle: 0,
+    no-use-before-define: [1, "nofunc"],
+    no-unused-expressions: 0,
+    no-empty-class: 0,
+    object-curly-spacing: [2, "always"],
+    quotes: [1, "single"],
+    space-in-parens: [2, "never"]
+  },
+  env: {
+    node: true
+  },
+  globals: {
+    angular: true,
+    $: true,
+    jQuery: true,
+    moment: true,
+    window: true,
+    document: true,
+    Modernizr: true,
+    __TESTING__: true,
+    beforeEach: true,
+    expect: true,
+    describe: true,
+    it: true,
+    element: true,
+    by: true,
+    browser: true,
+    inject: true,
+    register: true,
+    sinon: true,
+    _: false
+  }
+}

.gitignore

@@ -1,9 +1,74 @@
+# OS
+# ===========
 .DS_Store
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Node and related ecosystem
+# ==========================
 .nodemonignore
 .sass-cache/
-npm-debug.log
 node_modules/
-public/lib
+public/lib/
 app/tests/coverage/
 .bower-*/
-.idea/
+.idea/
+coverage/
+
+# MEAN.js app and assets
+# ======================
+public/dist/
+uploads
+modules/users/client/img/profile/uploads
+config/env/local.js
+*.pem
+
+# Ignoring MEAN.JS's gh-pages branch for documenation
+_site/
+
+# General
+# =======
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+*.tmp
+*.bak
+*.swp
+logs/
+build/
+
+# Sublime editor
+# ==============
+.sublime-project
+*.sublime-project
+*.sublime-workspace
+
+# Eclipse project files
+# =====================
+.project
+.settings/
+.*.md.html
+.metadata
+*~.nib
+local.properties
+
+# IntelliJ
+# ========
+*.iml
+
+# Cloud9 IDE
+# =========
+.c9/
+data/
+mongod
+
+# Visual Studio
+# =========
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

.jshintrc

@@ -1,42 +1,27 @@
 {
-	"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
-	"browser": true, // Standard browser globals e.g. `window`, `document`.
-	"esnext": true, // Allow ES.next specific features such as `const` and `let`.
-	"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
-	"camelcase": false, // Permit only camelcase for `var` and `object indexes`.
-	"curly": false, // Require {} for every new block or scope.
-	"eqeqeq": true, // Require triple equals i.e. `===`.
-	"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
-	"latedef": true, // Prohibit variable use before definition.
-	"newcap": true, // Require capitalization of all constructor functions e.g. `new F()`.
-	"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
-	"quotmark": "single", // Define quotes to string values.
-	"regexp": true, // Prohibit `.` and `[^...]` in regular expressions.
-	"undef": true, // Require all non-global variables be declared before they are used.
-	"unused": false, // Warn unused variables.
-	"strict": true, // Require `use strict` pragma in every file.
-	"trailing": true, // Prohibit trailing whitespaces.
-	"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
-	"globals": { // Globals variables.
-		"jasmine": true,
-		"angular": true,
-		"ApplicationConfiguration": true
-	},
-	"predef": [ // Extra globals.
-		"define",
-		"require",
-		"exports",
-		"module",
-		"describe",
-		"before",
-		"beforeEach",
-		"after",
-		"afterEach",
-		"it",
-		"inject",
-		"expect"
-	],
-	"indent": 4, // Specify indentation spacing
-	"devel": true, // Allow development statements e.g. `console.log();`.
-	"noempty": true // Prohibit use of empty blocks.
-}
+  "node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
+  "mocha": true, // Enable globals available when code is running inside of the Mocha tests.
+  "jasmine": true, // Enable globals available when code is running inside of the Jasmine tests.
+  "browser": true, // Standard browser globals e.g. `window`, `document`.
+  "esnext": true, // Allow ES.next specific features such as `const` and `let`.
+  "bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
+  "curly": false, // Require {} for every new block or scope.
+  "eqeqeq": true, // Require triple equals i.e. `===`.
+  "latedef": "nofunc", // Prohibit variable use before definition.
+  "noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
+  "undef": true, // Require all non-global variables be declared before they are used.
+  "unused": false, // Warn unused variables.
+  "strict": true, // Require `use strict` pragma in every file.
+  "globals": { // Globals variables.
+    "angular": true,
+    "io": true,
+    "ApplicationConfiguration": true
+  },
+  "predef": [ // Extra globals.
+    "inject",
+    "by",
+    "browser",
+    "element"
+  ],
+  "devel": true // Allow development statements e.g. `console.log();`.
+}

.slugignore

@@ -1 +1 @@
-/app/tests
+/app/tests

.travis.yml

@@ -1,7 +1,44 @@
 language: node_js
+sudo: false
 node_js:
-  - "0.10"
+  - 0.10
+  - 0.12
+  - 4
+  - 5
+# NodeJS v4 requires gcc 4.8
 env:
-  - NODE_ENV=travis
+  - NODE_ENV=travis CXX="g++-4.8" CC="gcc-4.8"
+matrix:
+  allow_failures:
+    - node_js: 5
 services:
-  - mongodb
+  - mongodb
+# gcc 4.8 requires ubuntu-toolchain-r-test
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
+    - gcc-4.8
+    - clang
+before_install:
+  - gem update --system
+  - gem install sass --version "=3.3.7"
+  - npm i nsp -g
+  - npm install protractor
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - 'node_modules/protractor/bin/webdriver-manager update --standalone --firefox'
+  - 'node_modules/protractor/bin/webdriver-manager start 2>&1 &'
+  - sleep 3
+after_script:
+  - nsp audit-package
+  - grunt coverage
+notifications:
+  webhooks:
+    urls:
+      - $GITTER_IM_URL
+    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