Merge pull request #43 from ysb33r/master

Some fixes towards ISSUE #42

Author: R. Tyler Croy

README.md

@@ -12,6 +12,9 @@ The Ruby gem dependency code for this project relies on the [Rubygems Maven
 proxy](http://rubygems-proxy.torquebox.org/) provided by the
 [Torquebox](http://torquebox.org) project.
 
+## Compatilibity
+
+This plugin requires Gradle 2.0 or better
 
 ## Getting Started
 

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

@@ -14,9 +14,7 @@ class JRubyJar extends Jar {
 
     JRubyJar() {
         super()
-        group JRubyPlugin.TASK_GROUP_NAME
         description 'Create a JRuby-based .jar file'
-        dependsOn project.tasks.jrubyPrepare
 
         // Bring in any compiled classes from our project
         from "$project.buildDir/classes/main"

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

@@ -14,7 +14,6 @@ class JRubyPlugin implements Plugin<Project> {
 
     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')) {
@@ -51,6 +50,15 @@ class JRubyPlugin implements Plugin<Project> {
                 jrubyEmbeds group: 'com.lookout', name: 'warbler-bootstrap', version: '1.+'
             }
 
+            // In order to update the testing cycle we need to tell unit tests where to
+            // find GEMs. We are assuming that if someone includes this plugin, that they
+            // will be writing tests that includes jruby and that they might need some
+            // GEMs as part of the tests.
+            project.tasks.test {
+                environment GEM_HOME : project.extensions.getByName('jruby').gemInstallDir
+                dependsOn 'jrubyPrepareGems'
+            }
+
             JRubyExec.updateJRubyDependencies(project)
             JRubyWar.updateJRubyDependencies(project)
         }
@@ -84,8 +92,21 @@ class JRubyPlugin implements Plugin<Project> {
             dependsOn project.tasks.jrubyCacheJars, project.tasks.jrubyPrepareGems
         }
 
-        project.task('jrubyWar', type: JRubyWar)
-        project.task('jrubyJar', type: JRubyJar)
+        // Only jRubyWar will depend on jrubyPrepare. Other JRubyWar tasks created by
+        // build script authors will be under their own control
+        // jrubyWar task will use jrubyWar as configuration
+        project.task('jrubyWar', type: JRubyWar) {
+            group JRubyPlugin.TASK_GROUP_NAME
+            description 'Create a JRuby-based web archive'
+            dependsOn project.tasks.jrubyPrepare
+            classpath project.configurations.jrubyWar
+        }
+
+        project.task('jrubyJar', type: JRubyJar) {
+            group JRubyPlugin.TASK_GROUP_NAME
+            dependsOn project.tasks.jrubyPrepare
+            dependsOn project.tasks.classes
+        }
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.lookout.jruby
 
 import org.gradle.api.Project
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.bundling.War
 
 /**
@@ -9,28 +10,21 @@ import org.gradle.api.tasks.bundling.War
   */
 class JRubyWar extends War {
 
-    static final String mainClass = 'com.lookout.jruby.WarMain'
+    static final String JRUBYWAR_MAINCLASS = 'com.lookout.jruby.WarMain'
     static final String JRUBYWAR_CONFIG = 'jrubyWar'
 
+    /** Setting the main class allows for a runnable War.
+     * By default the value is {@code JRUBYWAR_MAINCLASS}
+     */
+    @Input
+    String mainClass = JRUBYWAR_MAINCLASS
+
     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
@@ -39,12 +33,20 @@ class JRubyWar extends War {
                 project.zipTree(it)
             }
         }
+    }
+
+    @Override
+    void copy() {
+        // Bring our vendored gems into the created war file
+        webInf {
+            from project.jruby.gemInstallDir
+            into 'gems'
+        }
 
-        // By adding the WarMain class as the main-class we can have a
-        // runnable war
         manifest {
             attributes 'Main-Class' : mainClass
         }
+        super.copy()
     }
 
     /** Update dependencies on the project to include those necessary for

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

@@ -28,6 +28,6 @@ class JRubyJarSpec extends Specification {
     def "basic sanity check"() {
         expect: "jarTask to be an instance"
             jarTask instanceof JRubyJar
-            jarTask.group == 'JRuby'
+            project.tasks.jrubyJar.group == 'JRuby'
     }
 }

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

@@ -28,6 +28,6 @@ class JRubyWarSpec extends Specification {
     def "basic sanity check"() {
         expect: "warTask to be an instance"
             warTask instanceof JRubyWar
-            warTask.group == 'JRuby'
+            project.tasks.jrubyWar.group == 'JRuby'
     }
 }