Merge JSHint checkstyle feature from @levsa

build.gradle

@@ -18,7 +18,7 @@ targetCompatibility = '1.6'
 
 defaultTasks 'clean', 'build'
 
-version = '1.4.2'
+version = '1.5.0'
 group = 'com.eriwen'
 ext.archivesBaseName = 'gradle-js-plugin'
 ext.isSnapshot = version.endsWith("-SNAPSHOT")

plugin.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.eriwen:gradle-js-plugin:1.4.1'
+        classpath 'com.eriwen:gradle-js-plugin:1.5.0'
     }
 }
 buildscript {
@@ -75,7 +75,8 @@ task gzip(type: com.eriwen.gradle.js.tasks.GzipJsTask) {
 task jshintz(type: com.eriwen.gradle.js.tasks.JsHintTask) {
     source = javascript.source.custom.js.files
     dest = "${buildDir}/jshint.out"
-    ignoreExitCode = false
+    ignoreExitCode = true
+    reporter = 'checkstyle'
     jshint.options = [expr: "true", unused: "true"]
 }
 

src/main/groovy/com/eriwen/gradle/js/RhinoExec.groovy

@@ -20,7 +20,7 @@ class RhinoExec {
         def execOptions = {
             main = RHINO_MAIN_CLASS
             classpath = project.configurations.rhino
-            args = execargs
+            args = ["-opt", "9"] + execargs
             workingDir = workingDirIn
             ignoreExitValue = ignoreExitCode
             standardOutput = out

src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy

@@ -23,14 +23,15 @@ import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.OutputFile
 
 class JsHintTask extends SourceTask {
-    private static final String JSHINT_PATH = 'jshint-rhino-r12.js'
+    private static final String JSHINT_PATH = 'jshint-rhino-cs-r12.js'
     private static final String TMP_DIR = "tmp${File.separator}js"
     private static final ResourceUtil RESOURCE_UTIL = new ResourceUtil()
     private final RhinoExec rhino = new RhinoExec(project)
 
     @OutputFile def dest = new File(project.buildDir, "jshint.log")
     @Input def ignoreExitCode = true
     @Input def outputToStdOut = false
+    @Input def reporter = ''
 
     File getDest() {
         project.file(dest)
@@ -42,6 +43,13 @@ class JsHintTask extends SourceTask {
                 new File(project.buildDir, TMP_DIR), JSHINT_PATH)
         final List<String> args = [jshintJsFile.canonicalPath]
         args.addAll(source.files.collect { it.canonicalPath })
+
+        // Allow variable reporter
+        if (reporter) {
+          logger.debug("reporter=${reporter}")
+          args.add("reporter=${reporter}")
+        }
+
         LinkedHashMap<String, Object> options = project.jshint.options
         if (options != null && options.size() > 0) {
             def optionsArg = ""

src/test/groovy/com/eriwen/gradle/js/JsHintTaskTest.groovy

@@ -13,13 +13,15 @@ class JsHintTaskTest extends Specification {
     Project project = ProjectBuilder.builder().build()
     def task
     def src
+    def dest
 
     def setup() {
         project.apply(plugin: JsPlugin)
         task = project.tasks.jshint
         src = dir.newFolder()
+        dest = dir.newFile()
         task.source = src
-        task.dest = dir.newFile()
+        task.dest = dest
     }
 
     def "build ignores result by default"() {
@@ -89,6 +91,32 @@ class JsHintTaskTest extends Specification {
         notThrown ExecException
     }
 
+    def "does not generate checkstyle report when disabled"() {
+        given:
+        task.checkstyle = false
+        addFile("invalid.js", "var b = 5")
+
+        when:
+        task.run()
+
+        then:
+        def contents = new File(dest as String).text
+        assert ! (contents =~ "<checkstyle")
+    }
+
+    def "generates checkstyle report when enabled"() {
+        given:
+        task.reporter = 'checkstyle'
+        addFile("invalid.js", "var b = 5")
+
+        when:
+        task.run()
+
+        then:
+        def contents = new File(dest as String).text
+        assert contents =~ "<checkstyle"
+    }
+
     def addValidFile() {
         addFile("valid.js", "var a = 5;")
     }