Merge pull request #1802 from mbroadst/jshint-on-test

lint code with jshint as part of the 'make test' process

.jshintrc

-/*
-{
-    "globals": {
-        "spyOn": false,
-        "it": false,
-        "console": false,
-        "describe": false,
-        "expect": false,
-        "beforeEach": false,
-        "afterEach": false,
-        "waits": false,
-        "waitsFor": false,
-        "runs": false
-    },
-    "node": true,
-    "camelcase": true,
-    "curly": true,
-    "forin": true,
-    "indent": 2,
-    "unused": true,
-    "asi": true,
-    "evil": false,
-    "laxcomma": true,
-    "es5": true,
-    "quotmark": false,
-    "undef": true,
-    "strict": false
-}
-*/
-
 {
 {
   "bitwise":false,
   "bitwise":false,
   "boss":true,
   "boss":true,

Makefile

@@ -16,12 +16,15 @@ test: codeclimate
 else
 else
 test:
 test:
 	@if [ "$$GREP" ]; then \
 	@if [ "$$GREP" ]; then \
-		make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
+		make jshint && make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
 	else \
 	else \
-		make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) $(TESTS); \
+		make jshint && make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) $(TESTS); \
 	fi
 	fi
 endif
 endif
 
 
+jshint:
+	./node_modules/.bin/jshint lib
+
 cover:
 cover:
 	rm -rf coverage \
 	rm -rf coverage \
 	make teaser && ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- -t 10000 $(TESTS); \
 	make teaser && ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- -t 10000 $(TESTS); \

package.json

@@ -71,7 +71,8 @@
     "async": "~0.2.10",
     "async": "~0.2.10",
     "coffee-script": "~1.7.1",
     "coffee-script": "~1.7.1",
     "markdox": "0.1.4",
     "markdox": "0.1.4",
-    "sinon-chai": "~2.5.0"
+    "sinon-chai": "~2.5.0",
+    "jshint": ">=2.4.2"
   },
   },
   "keywords": [
   "keywords": [
     "mysql",
     "mysql",