Refactor some code out of JRubyPlugin and create a JRubyWar task

Fixes #24

Author: R. Tyler Croy

src/main/groovy/com/lookout/jruby/JRubyPlugin.groovy

@@ -8,67 +8,68 @@ import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.bundling.War
 
 class JRubyPlugin implements Plugin<Project> {
+    static final String TASK_GROUP_NAME = 'JRuby'
+
+    static final String RUBYGEMS_RELEASE_URL = 'http://rubygems-proxy.torquebox.org/releases'
+
     void apply(Project project) {
         project.apply plugin: 'java'
         project.apply plugin: 'war'
         project.extensions.create('jruby', JRubyPluginExtension, project)
 
-        if(!project.repositories.metaClass.respondsTo(project.repositories,'rubygemsRelease')) {
+        if (!project.repositories.metaClass.respondsTo(project.repositories, 'rubygemsRelease')) {
             project.repositories.metaClass.rubygemsRelease << { ->
-                maven { url 'http://rubygems-proxy.torquebox.org/releases' }
+                maven { url RUBYGEMS_RELEASE_URL }
             }
         }
 
         // Set up a special configuration group for our embedding jars
         project.configurations {
             jrubyEmbeds
-            jrubyWar
             gems
         }
 
         project.configurations.create(JRubyExec.JRUBYEXEC_CONFIG)
+        project.configurations.create(JRubyWar.JRUBYWAR_CONFIG)
         JRubyExecDelegate.addToProject(project)
 
         // In order for jrubyWar to work we'll need to pull in the warbler
         // bootstrap code from this artifact
         project.afterEvaluate {
-            if(project.jruby.defaultRepositories) {
+            if (project.jruby.defaultRepositories) {
                 project.repositories {
                     jcenter()
                     rubygemsRelease()
 
                     // Required to pull in our warbler-bootstrap dependency
                     maven { url 'http://dl.bintray.com/rtyler/jruby' }
-
                 }
             }
+
             project.dependencies {
                 jrubyEmbeds group: 'com.lookout', name: 'warbler-bootstrap', version: '1.+'
-                jrubyWar group: 'org.jruby', name: 'jruby-complete', version: project.jruby.defaultVersion
-                jrubyWar (group: 'org.jruby.rack', name: 'jruby-rack', version: '1.1.+') {
-                    exclude module : 'jruby-complete'
-                }
             }
 
             JRubyExec.updateJRubyDependencies(project)
+            JRubyWar.updateJRubyDependencies(project)
         }
 
         project.task('jrubyClean', type: Delete) {
-            group 'JRuby'
+            group TASK_GROUP_NAME
             description 'Clean up the temporary dirs used by the JRuby plugin'
             mustRunAfter 'clean'
             delete '.jarcache/'
         }
 
         project.task('jrubyPrepareGems', type: JRubyPrepareGems) {
-            group 'JRuby'
+            group TASK_GROUP_NAME
             description 'Prepare the gems from the `gem` dependencies, extracts into jruby.installGemDir'
             gems project.configurations.gems
             outputDir project.jruby.gemInstallDir
         }
 
         project.task('jrubyCacheJars', type: Copy) {
-            group 'JRuby'
+            group TASK_GROUP_NAME
             description 'Cache .jar-based dependencies into .jarcache/'
 
             from project.configurations.jrubyWar
@@ -77,38 +78,12 @@ class JRubyPlugin implements Plugin<Project> {
         }
 
         project.task('jrubyPrepare') {
-            group 'JRuby'
+            group TASK_GROUP_NAME
             description 'Pre-cache and prepare all dependencies (jars and gems)'
             dependsOn project.tasks.jrubyCacheJars, project.tasks.jrubyPrepareGems
         }
 
-        project.task('jrubyWar', type: War) {
-            group 'JRuby'
-            description 'Create a executable JRuby-based web archive'
-            dependsOn project.tasks.jrubyPrepare
-
-            from "$project.buildDir/classes/main"
-            // Bring our vendored gems into the created war file
-            webInf {
-                from project.jruby.gemInstallDir
-                into 'gems'
-            }
-
-            // Bring the jrubyWar configuration's dependencies into
-            // WEB-INF/libs
-            classpath project.configurations.jrubyWar
-
-            // note that zipTree call is wrapped in closure so that configuration
-            // is only resolved at execution time. This will take the embeds
-            // from within the `jrubyEmbeds` configuration and dump them into the war
-            from {
-                project.configurations.jrubyEmbeds.collect { project.zipTree(it) }
-            }
-
-            // By adding the WarMain class as the main-class we can have a
-            // runnable war
-            manifest { attributes 'Main-Class' : 'com.lookout.jruby.WarMain' }
-        }
+        project.task('jrubyWar', type: JRubyWar)
     }
 
 }

src/main/groovy/com/lookout/jruby/JRubyWar.groovy

@@ -0,0 +1,61 @@
+package com.lookout.jruby
+
+import org.gradle.api.Project
+import org.gradle.api.tasks.bundling.War
+
+/**
+  *
+  * @author R. Tyler Croy
+  */
+class JRubyWar extends War {
+
+    static final String mainClass = 'com.lookout.jruby.WarMain'
+    static final String JRUBYWAR_CONFIG = 'jrubyWar'
+
+    JRubyWar() {
+        super()
+        group JRubyPlugin.TASK_GROUP_NAME
+        description 'Create a JRuby-based web archive'
+        dependsOn project.tasks.jrubyPrepare
+
+        // Bring in any compiled classes from our project
+        from "$project.buildDir/classes/main"
+
+        // Bring our vendored gems into the created war file
+        webInf {
+            from project.jruby.gemInstallDir
+            into 'gems'
+        }
+
+        // Bring the jrubyWar configuration's dependencies into
+        // WEB-INF/libs
+        classpath project.configurations.jrubyWar
+
+        // note that zipTree call is wrapped in closure so that configuration
+        // is only resolved at execution time. This will take the embeds
+        // from within the `jrubyEmbeds` configuration and dump them into the war
+        from {
+            project.configurations.jrubyEmbeds.collect {
+                project.zipTree(it)
+            }
+        }
+
+        // By adding the WarMain class as the main-class we can have a
+        // runnable war
+        manifest {
+            attributes 'Main-Class' : mainClass
+        }
+    }
+
+    /** Update dependencies on the project to include those necessary for
+     * building JRubyWar's
+     */
+    static void updateJRubyDependencies(Project project) {
+        project.dependencies {
+            jrubyWar group: 'org.jruby', name: 'jruby-complete', version: project.jruby.defaultVersion
+            jrubyWar (group: 'org.jruby.rack', name: 'jruby-rack', version: '1.1.+') {
+                exclude module : 'jruby-complete'
+            }
+        }
+    }
+}

src/test/groovy/com/lookout/jruby/JRubyExecSpec.groovy

@@ -28,7 +28,7 @@ class JRubyExecSpec extends Specification {
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
         project.apply plugin: 'com.lookout.jruby'
-        execTask = project.task(TASK_NAME,type: JRubyExec)
+        execTask = project.task(TASK_NAME, type: JRubyExec)
     }
 
     def "Do not allow JRubyExec to be instantiated if plugin has not been loaded"() {

src/test/groovy/com/lookout/jruby/JRubyWarSpec.groovy

@@ -0,0 +1,33 @@
+package com.lookout.jruby
+
+import org.gradle.testfixtures.ProjectBuilder
+import spock.lang.*
+import static org.gradle.api.logging.LogLevel.*
+
+/**
+ * @author R. Tyler Croy
+ *
+ */
+class JRubyWarSpec extends Specification {
+    static final File TEST_SCRIPT_DIR = new File( System.getProperty('TEST_SCRIPT_DIR') ?: 'src/test/resources/scripts')
+    static final File TESTROOT = new File(System.getProperty('TESTROOT') ?: 'build/tmp/test/unittests')
+    static final String TASK_NAME = 'WarWarTask'
+
+    def project
+    def warTask
+
+    void setup() {
+        project = ProjectBuilder.builder().build()
+        project.buildDir = TESTROOT
+        project.logging.level = LIFECYCLE
+        project.apply plugin: 'com.lookout.jruby'
+        warTask = project.task(TASK_NAME, type: JRubyWar)
+
+    }
+
+    def "basic sanity check"() {
+        expect: "warTask to be an instance"
+            warTask instanceof JRubyWar
+            warTask.group == 'JRuby'
+    }
+}