Merge pull request #59 from krmorse/master

Improve jshint support

Author: krmorse

lib/build/get-script.coffee

@@ -39,22 +39,25 @@ module.exports =
         @getScripts {appPath, scripts: configJson.html}, htmlFilesCallback
       callback
 
-  getJavaScripts: ({appPath, scripts,compress}, callback)->
-    @getScripts {appPath, scripts}, (err, results) =>
-      if err then callback(err)
-      else
-        for key,code of results
-          fileName = scripts[key]
-          @hintJavaScriptFile(code, fileName)
-          if compress
-            try
-              results[key] = @compressJavaScript code
-            catch e
-              callback new Error()
-              return
-          else
-            results[key] = code
-        callback(null, results)
+  getJavaScripts: ({appPath, scripts, compress}, callback) ->
+    jshintrc = path.resolve appPath, '.jshintrc'
+    @readFile jshintrc, (e, jshintConfig) =>
+      jshintOptions = JSON.parse jshintConfig || "{}"
+      @getScripts {appPath, scripts}, (err, results) =>
+        if err then callback(err)
+        else
+          for key,code of results
+            fileName = scripts[key]
+            @hintJavaScriptFile(code, jshintOptions, fileName) unless compress
+            if compress
+              try
+                results[key] = @compressJavaScript code
+              catch e
+                callback new Error()
+                return
+            else
+              results[key] = code
+          callback(null, results)
 
   getStylesheets: ({appPath, scripts, compress}, callback)->
     @getScripts {appPath, scripts}, (err, results) =>
@@ -87,7 +90,9 @@ module.exports =
       callback(error, fileContents)
     fs.readFile(file, "utf-8", wrapper)
 
-  hintJavaScriptFile: (code, fileName)->
-    if(!JSHINT(code, undef: false))
+  hintJavaScriptFile: (code, jshintOptions, fileName) ->
+    if(!JSHINT(code, jshintOptions))
+      console.error()
       for error in JSHINT.errors
-        console.log "Error in #{fileName} on line #{error.line}: #{error.reason}" unless !error
+        console.error "Error in #{fileName} on line #{error.line}: #{error.reason}" unless !error
+      console.error()

lib/init.coffee

@@ -11,10 +11,11 @@ files =
   ".travis.yml": ".travis.yml"
   "LICENSE": "LICENSE"
   "README.md": "README.md"
-  "Gruntfile.js":"Gruntfile.js"
-  "package.json":"package.json"
-  "specs.tmpl":"test/specs.tmpl"
-  "AppSpec.js":"test/AppSpec.js"
+  "Gruntfile.js": "Gruntfile.js"
+  "package.json": "package.json"
+  "specs.tmpl": "test/specs.tmpl"
+  "AppSpec.js": "test/AppSpec.js"
+  ".jshintrc": ".jshintrc"
 
 directories = ["test"]
 

package.json

@@ -2,7 +2,7 @@
   "author": "Kyle Morse <kyle.morse@ca.com>",
   "name": "rally-app-builder",
   "description": "A node module that assists in the building of Rally Apps",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "homepage": "https://github.com/rallyapps/rally-app-builder",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "grunt-contrib-jasmine": "0.4.x",
     "grunt-contrib-watch": "~0.4.4",
     "handlebars": "~1.0.11",
-    "jshint": "~0.9.1",
+    "jshint": "~2.9.2",
     "less": "~1.7.0",
     "lodash": "~3.0.0",
     "mustache": "0.7.x",

templates/.jshintrc

@@ -0,0 +1,77 @@
+{
+    "maxerr"        : 50,
+
+    "bitwise"       : true,
+    "camelcase"     : false,
+    "curly"         : true,
+    "eqeqeq"        : true,
+    "forin"         : true,
+    "freeze"        : true,
+    "immed"         : false,
+    "latedef"       : false,
+    "newcap"        : false,
+    "noarg"         : true,
+    "noempty"       : true,
+    "nonbsp"        : true,
+    "nonew"         : false,
+    "plusplus"      : false,
+    "quotmark"      : false,
+    "undef"         : true,
+    "unused"        : true,
+    "strict"        : false,
+    "maxparams"     : false,
+    "maxdepth"      : false,
+    "maxstatements" : false,
+    "maxcomplexity" : false,
+    "maxlen"        : false,
+    "varstmt"       : false,
+
+    "asi"           : false,
+    "boss"          : false,
+    "debug"         : false,
+    "eqnull"        : false,
+    "esversion"     : 5,
+    "moz"           : false,
+    "evil"          : false,
+    "expr"          : false,
+    "funcscope"     : false,
+    "globalstrict"  : false,
+    "iterator"      : false,
+    "lastsemic"     : false,
+    "laxbreak"      : false,
+    "laxcomma"      : false,
+    "loopfunc"      : false,
+    "multistr"      : false,
+    "noyield"       : false,
+    "notypeof"      : false,
+    "proto"         : false,
+    "scripturl"     : false,
+    "shadow"        : false,
+    "sub"           : true,
+    "supernew"      : false,
+    "validthis"     : false,
+
+    "browser"       : true,
+    "browserify"    : false,
+    "couch"         : false,
+    "devel"         : true,
+    "dojo"          : false,
+    "jasmine"       : false,
+    "jquery"        : false,
+    "mocha"         : true,
+    "mootools"      : false,
+    "node"          : false,
+    "nonstandard"   : false,
+    "phantom"       : false,
+    "prototypejs"   : false,
+    "qunit"         : false,
+    "rhino"         : false,
+    "shelljs"       : false,
+    "typed"         : false,
+    "worker"        : false,
+    "wsh"           : false,
+    "yui"           : false,
+
+    "globals"       : {},
+    "predef"        : ["Ext", "Deft", "_", "moment"]
+}