Allowing JSHint to be output to a given file

boardbloke · Jun 21, 2012 · 80d33df · 80d33df
1 parent dd655f2
commit 80d33df
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'idea'
 
 defaultTasks 'clean', 'build'
 
-version = '1.0.1'
+version = '1.0.2'
 group = 'com.eriwen'
 ext.archivesBaseName = 'gradle-js-plugin'
 ext.isSnapshot = version.endsWith("-SNAPSHOT")

diff --git a/plugin.gradle b/plugin.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.eriwen:gradle-js-plugin:1.0.1'
+        classpath 'com.eriwen:gradle-js-plugin:1.0.2'
     }
 }
 
@@ -24,6 +24,10 @@ javascript.source {
     }
 }
 
+task clean(type: Delete) {
+    delete buildDir
+}
+
 // Combine JS files
 task combine(type: com.eriwen.gradle.js.tasks.CombineJsTask) {
     source = javascript.source.custom.js.files
@@ -32,7 +36,7 @@ task combine(type: com.eriwen.gradle.js.tasks.CombineJsTask) {
 
 // Minify with Google Closure Compiler
 task minify(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    source = file("${buildDir}/all.js")
+    source = combine
     dest = file("${buildDir}/all-min.js")
     closure {
         warningLevel = 'VERBOSE'
@@ -41,14 +45,19 @@ task minify(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
     }
 }
 
+// For auto-versioning
+//def version = Integer.toHexString(Integer.parseInt(new java.text.SimpleDateFormat('yyDDHHmm').format(new Date())))
+def version = "1.7.2"
+
 // GZip it!
 task gzip(type: com.eriwen.gradle.js.tasks.GzipJsTask) {
-    source = file("${buildDir}/all-min.js")
-    dest = file("${buildDir}/all-min.js")
+    source = minify
+    dest = file("${buildDir}/all-${version}.min.js")
 }
 
 task jshintz(type: com.eriwen.gradle.js.tasks.JsHintTask) {
     source = javascript.source.custom.js.files
+    dest = file("${buildDir}/jshint.out")
 }
 
 task jsdocz(type: com.eriwen.gradle.js.tasks.JsDocTask) {

diff --git a/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy b/src/main/groovy/com/eriwen/gradle/js/tasks/JsHintTask.groovy
@@ -19,19 +19,22 @@ import org.gradle.api.tasks.TaskAction
 import com.eriwen.gradle.js.ResourceUtil
 import com.eriwen.gradle.js.RhinoExec
 import org.gradle.api.tasks.SourceTask
+import org.gradle.api.tasks.OutputFile
 
 class JsHintTask extends SourceTask {
     private static final String JSHINT_PATH = 'jshint-rhino.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 File dest;
+
     @TaskAction
     def run() {
         final File jshintJsFile = RESOURCE_UTIL.extractFileToDirectory(
                 new File(project.buildDir, TMP_DIR), JSHINT_PATH)
         final List<String> args = [jshintJsFile.canonicalPath]
         args.addAll(source.files.collect { it.canonicalPath })
-        rhino.execute(args, '.', true)
+        rhino.execute(args, [ignoreExitCode: true, out: new FileOutputStream(dest)])
     }
 }
diff --git a/src/test/resources/file1.js b/src/test/resources/file1.js
@@ -3,6 +3,7 @@
  * @return {Boolean} True whenever we damn well feel like it
  */
 function test1() {
-    console.log('test1');
+    // The following should be a JSHint warning
+    console && console.log('test1');
     return true;
 }