Merge pull request #145 from eslint/updatebuild

Build: Switch to Makefile.js

.eslintrc.js

@@ -77,7 +77,6 @@ module.exports = {
         "no-dupe-class-members": 2,
         "no-dupe-keys": 2,
         "no-duplicate-case": 2,
-        "no-else-return": 2,
         "no-empty": 2,
         "no-empty-character-class": 2,
         "no-empty-label": 2,
@@ -200,10 +199,9 @@ module.exports = {
         "valid-typeof": 2,
         "wrap-iife": 2,
         "wrap-regex": 2,
-        "yield-star-spacing": 2,
         "yoda": [
             2,
             "never"
         ]
     }
-};
+};

.gitignore

@@ -3,3 +3,4 @@ node_modules
 *.iml
 coverage
 .cache
+npm-debug.log

Makefile.js

@@ -262,12 +262,12 @@ target.test = function() {
     var errors = 0,
         lastReturn;
 
-    lastReturn = nodeCLI.exec("istanbul", "cover", MOCHA, "-- -R progress -t " + MOCHA_TIMEOUT, "-c", TEST_FILES);
+    lastReturn = nodeCLI.exec("istanbul", "cover", MOCHA, "-- -R dot -t " + MOCHA_TIMEOUT, "-c", TEST_FILES);
     if (lastReturn.code !== 0) {
         errors++;
     }
 
-    lastReturn = nodeCLI.exec("istanbul", "check-coverage", "--statement 99 --branch 97 --function 99 --lines 99");
+    lastReturn = nodeCLI.exec("istanbul", "check-coverage", "--statement 99 --branch 97 --function 100 --lines 99");
     if (lastReturn.code !== 0) {
         errors++;
     }

package.json

@@ -18,10 +18,15 @@
     "README.md"
   ],
   "maintainers": [
+    {
+      "name": "Nicholas C. Zakas",
+      "email": "[email protected]",
+      "web": "https://www.nczonline.net"
+    },
     {
       "name": "Yusuke Suzuki",
       "email": "[email protected]",
-      "web": "http://github.com/Constellation"
+      "web": "https://github.com/Constellation"
     }
   ],
   "repository": {
@@ -31,17 +36,8 @@
   "devDependencies": {
     "coveralls": "^2.11.2",
     "dateformat": "^1.0.11",
-    "eslint": "^1.9.0",
-    "gulp": "^3.8.10",
-    "gulp-bump": "^0.1.13",
-    "gulp-eslint": "^0.5.0",
-    "gulp-filter": "^2.0.2",
-    "gulp-git": "^1.0.0",
-    "gulp-istanbul": "^0.6.0",
-    "gulp-jshint": "^1.9.0",
-    "gulp-mocha": "^2.0.0",
-    "gulp-tag-version": "^1.2.1",
-    "jshint-stylish": "^1.0.0",
+    "eslint": "^1.10.3",
+    "istanbul": "^0.4.1",
     "linefix": "^0.1.1",
     "mocha": "^2.3.3",
     "npm-license": "^0.3.1",
@@ -57,10 +53,8 @@
     }
   ],
   "scripts": {
-    "test": "gulp",
-    "unit-test": "gulp test",
-    "lint": "gulp lint",
-    "coveralls": "cat ./coverage/lcov.info | coveralls && rm -rf ./coverage"
+    "test": "node Makefile.js test",
+    "lint": "node Makefile.js lint"
   },
   "dependencies": {
     "esutils": "^1.1.6",