Merge pull request #7 from mudetroit/eslint-2-upgrade

Upgrade to eslint 2

Author: IanVS

node_modules/eslint-config-nutshell

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-nutshell",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "ESLint sharable config for Nutshell Javascript style guide",
   "main": "index.js",
   "scripts": {
@@ -24,18 +24,16 @@
   },
   "homepage": "https://github.com/nutshellcrm/eslint-config-nutshell#readme",
   "peerDependencies": {
-    "eslint": ">=1.6.0",
-    "eslint-plugin-babel": ">=2.1.1",
-    "eslint-plugin-react": ">=3.12.0",
-    "eslint-config-import": ">=0.9.1",
-    "eslint-plugin-import": ">=0.10.0"
+    "eslint": "^2.0.0",
+    "eslint-plugin-babel": "^3.0.0",
+    "eslint-plugin-react": "^4.0.0",
+    "eslint-plugin-import": "^1.0.0"
   },
   "devDependencies": {
-    "babel-eslint": "^4.1.4",
-    "eslint": ">=1.6.0",
-    "eslint-config-import": "^0.9.1",
-    "eslint-plugin-babel": "^2.1.1",
-    "eslint-plugin-import": "^0.10.0",
-    "eslint-plugin-react": "^3.8.0"
+    "babel-eslint": "^6.0.2",
+    "eslint": "^2.7.0",
+    "eslint-plugin-babel": "^3.1.0",
+    "eslint-plugin-import": "^1.4.0",
+    "eslint-plugin-react": "^4.2.3"
   }
 }

package.json

@@ -1,9 +1,6 @@
 'use strict';
 
 module.exports = {
-    'extends': [
-        'import/es7-jsx',
-    ],
     'plugins': [
         'import',
     ],

rules/import.js

@@ -16,6 +16,8 @@ module.exports = {
         'indent'                     : [2, 4],
         // Enforce spacing between keys and values in object literal properties
         'key-spacing'                : [2, {'beforeColon': false, 'afterColon': true}],
+        // Enforce spacing around keywords
+        'keyword-spacing'                : [2],
         // Disallow mixed 'LF' and 'CRLF' as linebreaks
         'linebreak-style'            : [2, 'unix'],
         // Disallow use of the continue statement
@@ -40,16 +42,12 @@ module.exports = {
         'semi-spacing'               : [2, {'before': false, 'after': true}],
         // Require use of semicolons instead of ASI
         'semi'                       : [2, 'always'],
-        // Require a space after certain keywords
-        'space-after-keywords'       : [2],
         // Require space before blocks
         'space-before-blocks'        : [2],
         // Disallow space before function opening parenthesis
         'space-before-function-paren': [2, 'never'],
         // Require spaces around infix operators
         'space-infix-ops'            : [2],
-        // Require a space after return, throw, and case
-        'space-return-throw-case'    : [2],
         // Disallow spaces before/after unary operators
         'space-unary-ops'            : [2],
         // Disallow spaces at the ends of lines