Merge pull request #14 from ysb33r/master

Allowing user to set a default JRuby version

Author: R. Tyler Croy

build.gradle

@@ -33,6 +33,9 @@ test {
         showStandardStreams = true
         exceptionFormat "full"
     }
+
+    systemProperties TESTROOT : new File(buildDir,'tmp/test/unittests').absolutePath
+
 }
 
 
@@ -45,7 +48,6 @@ artifacts {
     archives sourcesJar
 }
 
-
 // Ensure we don't fail in CI or on a system without these values set in
 // ~/.gradle/gradle.properties
 if( !hasProperty( 'bintrayUser' ) )

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

@@ -38,10 +38,14 @@ class JRubyPlugin implements Plugin<Project> {
 
         // In order for jrubyWar to work we'll need to pull in the warbler
         // bootstrap code from this artifact
-        project.dependencies {
-            jrubyEmbeds group: 'com.lookout', name: 'warbler-bootstrap', version: '1.+'
-            jrubyWar group: 'org.jruby.rack', name: 'jruby-rack', version: '1.1.+'
-            jrubyWar group: 'org.jruby', name: 'jruby-complete', version: '1.7.+'
+        project.afterEvaluate {
+            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'
+                }
+            }
         }
 
         project.task('jrubyClean', type: Delete) {
@@ -75,6 +79,7 @@ class JRubyPlugin implements Plugin<Project> {
         project.task('jrubyCacheJars', type: Copy) {
             group 'JRuby'
             description 'Cache .jar-based dependencies into .jarcache/'
+
             from project.configurations.jrubyWar
             into ".jarcache"
             include '**/*.jar'

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

@@ -3,4 +3,6 @@ package com.lookout.jruby
 class JRubyPluginExtension {
     // More details here: <http://rubygems-proxy.torquebox.org/>
     def String gemrepo_url = "http://rubygems-proxy.torquebox.org/releases"
+
+    String defaultVersion = '1.7.13'
 }

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

@@ -13,10 +13,16 @@ import static org.junit.Assert.*
 
 
 class JRubyPluginTest {
+    static final File TESTROOT = new File(System.getProperty('TESTROOT') ?: 'build/tmp/test/unittests')
+
     def project
 
     @Before
     void setUp() {
+        if(TESTROOT.exists()) {
+            TESTROOT.deleteDir()
+        }
+        TESTROOT.mkdirs()
         project = ProjectBuilder.builder().build()
         project.apply plugin: 'com.lookout.jruby'
     }
@@ -63,6 +69,36 @@ class JRubyPluginTest {
         assertEquals(gem_name, JRubyPlugin.gemFullNameFromFile(filename))
     }
 
+    // NOTE: This test will fail if no network is available
+    // It really needs Spock's @IgnoreIf annotation
+    // See https://gist.github.com/ysb33r/74574a45c67c9e9e8187
+    @Test
+    public void jrubyWarTaskNeedsToAddJrubyCompleteJar() {
+        final String useVersion = '1.7.3'
+        assertNotEquals "We need the test version to be different from the defaultVersion that is compiled in",
+                useVersion,project.jruby.defaultVersion
+
+        project.jruby {
+            defaultVersion useVersion
+        }
+
+        Task jrw = project.tasks.jrubyWar
+        new File(TESTROOT,'libs').mkdirs()
+        new File(TESTROOT,'classes/main').mkdirs()
+        project.buildDir = TESTROOT
+        project.evaluate()
+        jrw.copy()
+
+        assertTrue jrw.outputs.files.singleFile.exists()
+
+        def item = project.configurations.jrubyWar.files.find { it.toString().find('jruby-complete') }
+        assertNotNull 'Would expected to have a jruby-complete-XXX.jar',item
+
+        def matches = item =~ /.*(jruby-complete-.+.jar)/
+        assertNotNull 'jruby-complete-XXX.jar did not match', matches
+        assertEquals "jruby-complete-${useVersion}.jar".toString(), matches[0][1]
+
+    }
     //
     //  Helper methods for testing
     ////////////////////////////////////////////////////////////////////////////