From 25f81aa80fb52e391a7a01a3be083c9b65b4bc85 Mon Sep 17 00:00:00 2001
From: Gunther Brunner <gunta85@gmail.com>
Date: Thu, 21 Jan 2016 22:13:55 +0900
Subject: [PATCH] Update to eslint-2.0-beta.1 since eslint its getting better
 at indents (not yet ready to automatic fix)

---
 .eslintrc          | 8 ++++----
 gulpfile.js        | 1 +
 package.json       | 2 +-
 res/.eslintrc      | 3 +--
 res/test/.eslintrc | 9 +++++++++
 5 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 res/test/.eslintrc

diff --git a/.eslintrc b/.eslintrc
index 40ad0568..64d7425c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -134,13 +134,10 @@
     "semi-spacing": [2, {"before": false, "after": true}],
     "semi": [2, "never"],
     "sort-vars": 0, // optaionlly set `[2, {"ignoreCase": true}]`
-    "space-after-keywords": [2, "always"],
-    "space-before-keywords": [2, "always"],
     "space-before-blocks": [2, "always"], // optionally set `[2, {"functions": "never", "keywords": "always"}]`
     "space-before-function-paren": [2, "never"], // optionally set `[2, {"anonymous": "always", "named": "never"}]`
     "space-in-parens": [2, "never"], // optionally set `[2, "always", {"exceptions": ["empty"]}]`
     "space-infix-ops": 2,
-    "space-return-throw-case": 2,
     "space-unary-ops": [2, {"words": true, "nonwords": false}],
     "spaced-comment": [1, "always", {"exceptions": ["/"]}], // optionally set `[2, "always", {"exceptions": ["-", "+"], "markers": ["/"]}]`
     "wrap-regex": 0, // TODO: 2 is ok but the division edge case is too edgy
@@ -154,6 +151,9 @@
     "no-path-concat": 2, // `2` is default
     "no-process-exit": 0, // `2` is default
     "no-restricted-modules": 0, // no default, optionally set `[2, "fs", "os"]`
-    "no-sync": 1 // `2` is default
+    "no-sync": 1, // `2` is default
+
+    // eslint v2
+    "keyword-spacing": 2
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
index a445a06e..31524956 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -52,6 +52,7 @@ gulp.task('eslint', function() {
 gulp.task('eslint-cli', function(done) {
   var cli = new EslintCLIEngine({
     cache: true
+  , fix: false
   })
 
   var report = cli.executeOnFiles([
diff --git a/package.json b/package.json
index 6b3e3cf5..2b6eca74 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "chai": "^3.4.1",
     "css-loader": "^0.23.1",
     "del": "^2.0.1",
-    "eslint": "^1.10.3",
+    "eslint": "^2.0.0-beta.1",
     "eslint-loader": "^1.2.0",
     "event-stream": "^3.3.2",
     "exports-loader": "^0.6.2",
diff --git a/res/.eslintrc b/res/.eslintrc
index 8aaccabe..84903161 100644
--- a/res/.eslintrc
+++ b/res/.eslintrc
@@ -5,8 +5,7 @@
     "commonjs": true,
     "browser": true,
     "node": false,
-    "jasmine": true,
-    "protractor": true
+    "jasmine": true
   },
   "rules": {
     // TODO: for now lets just mute them
diff --git a/res/test/.eslintrc b/res/test/.eslintrc
new file mode 100644
index 00000000..d98018f9
--- /dev/null
+++ b/res/test/.eslintrc
@@ -0,0 +1,9 @@
+// TODO: Some day use eslint-plugin-angular
+// https://github.com/Gillespie59/eslint-plugin-angular
+{
+  "env": {
+    "browser": true,
+    "node": true,
+    "protractor": true
+  }
+}