Merge pull request #30 from ysb33r/master

Proposed changes to the handling of default repositories

Author: R. Tyler Croy

HACKING.md

@@ -8,7 +8,12 @@ Unit tests are in 'src/test' and integration tests are in 'src/integTest'. To ru
 do `./gradlew check` or `./gradlew build`. For unittests just doing `./gradlew test` is enough.
 
 Test logging is controlled via `logback-test.xml`. Be aware that integration tests generate a lot of debug information.
-Please do not commit the config file back with DEBUG turned on
+Please do not commit the config file back with DEBUG turned on.
+
+=== Running single test suites
+
+If you only want to run the unittests in say `JRubyPlugin` then you can do `./gradlew test -Dtest.single=JRubyPlugin`.
+In a similar manner for integration tests one can do `./gradlew integrationTest -Dtest.single=JRubyIntegrationSpec`.
 
 == Release HOWTO
 

README.md

@@ -255,13 +255,13 @@ task needSomeRubyLove {
 }
 ```
 
-The behaviour of ```project.jrubyexec``` is slightly different to that of ```JRubyExec```.
+The behaviour of `project.jrubyexec` is slightly different to that of `JRubyExec`.
 
-* The version of ```jruby-complete``` is strictly tied to to ```jruby.defaultVersion```. Therefore trying to set ```jrubyVersion```
+* The version of `jruby-complete` is strictly tied to the `jruby.execVersion`. Therefore trying to set `jrubyVersion`
 in the ```jrubyexec``` closure will cause a failure
-* GEMs and additional JARs are only taken from the ```jrubyExec``` configuration. 
-* It is not possible to supply a ```configuration``` parameter to the ```jrubyexec``` closure.
-* GEMs will be installed to ```jruby.gemInstallDir```. Existing gems will not be overwritten.
+* GEMs and additional JARs are only taken from the `jrubyExec` configuration. 
+* It is not possible to supply a `configuration` parameter to the `jrubyexec` closure.
+* GEMs will be installed to `jruby.gemInstallDir`. Existing gems will not be overwritten.
 
-As with ```JRubyExec```, ```args```, ```setArgs``` and ```main``` are illegal within the ```jrubyexec``` closure.
+As with `JRubyExec`, `args`, `setArgs` and `main` are illegal within the `jrubyexec` closure.
 All other methods should work.

build.gradle

@@ -45,7 +45,6 @@ test {
     }
 
     systemProperties TESTROOT : new File(buildDir,'tmp/test/unittests').absolutePath
-    systemProperties TEST_SCRIPT_DIR : new File(projectDir,'src/test/resources/scripts').absolutePath
     systemProperties 'logback.configurationFile' : new File(projectDir,'src/test/resources/logback-test.xml').absolutePath
 
 }

gradle/integration-tests.gradle

@@ -15,15 +15,15 @@ sourceSets {
         java.srcDir file("src/integTest/java")
         groovy.srcDir file("src/integTest/groovy")
         resources.srcDir file("src/integTest/resources")
-        compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile
+        compileClasspath = sourceSets.main.output +  configurations.integrationTestCompile
         runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime
     }
 }
 
 task integrationTest(type: Test, dependsOn: jar) {
     testClassesDir = sourceSets.integrationTest.output.classesDir
     classpath = sourceSets.integrationTest.runtimeClasspath
-    systemProperties["integTest.projects"] = new File(sourceSets.integrationTest.output.resourcesDir, "projects").absolutePath
+    mustRunAfter test
 }
 
 check.dependsOn integrationTest

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 08 12:16:10 PDT 2014
+#Fri Aug 15 18:13:15 BST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip

src/integTest/groovy/com/lookout/jruby/JRubyExecExtensionIntegrationSpec.groovy

@@ -1,23 +1,30 @@
 package com.lookout.jruby
 
+import org.gradle.api.artifacts.repositories.ArtifactRepository
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Ignore
 import spock.lang.IgnoreIf
 import spock.lang.Specification
+import spock.lang.Stepwise
 
 import static org.gradle.api.logging.LogLevel.LIFECYCLE
 
 /**
  * @author Schalk W. Cronjé
  */
+@Stepwise
 class JRubyExecExtensionIntegrationSpec extends Specification {
     static final boolean TESTS_ARE_OFFLINE = System.getProperty('TESTS_ARE_OFFLINE') != null
     static final File TEST_SCRIPT_DIR = new File( System.getProperty('TESTS_SCRIPT_DIR') ?: 'src/integTest/resources/scripts')
-    static final File TESTROOT = new File(System.getProperty('TESTROOT') ?: 'build/tmp/test/integration-tests')
+    static final File TESTROOT = new File("${System.getProperty('TESTROOT') ?: 'build/tmp/test/integration-tests'}/jreeis")
 
     def project
 
     void setup() {
+        if(TESTROOT.exists()) {
+            TESTROOT.deleteDir()
+        }
+        TESTROOT.mkdirs()
         project = ProjectBuilder.builder().build()
         project.with {
             buildDir = TESTROOT

src/integTest/groovy/com/lookout/jruby/JRubyExecIntegrationSpec.groovy

@@ -8,16 +8,21 @@ import static org.gradle.api.logging.LogLevel.LIFECYCLE
 /**
  * Created by schalkc on 20/08/2014.
  */
+@Stepwise
 class JRubyExecIntegrationSpec extends Specification {
     static final boolean TESTS_ARE_OFFLINE = System.getProperty('TESTS_ARE_OFFLINE') != null
     static final File TEST_SCRIPT_DIR = new File( System.getProperty('TEST_SCRIPT_DIR') ?: 'src/integTest/resources/scripts')
-    static final File TESTROOT = new File(System.getProperty('TESTROOT') ?: 'build/tmp/test/integration-tests')
+    static final File TESTROOT = new File("${System.getProperty('TESTROOT') ?: 'build/tmp/test/integration-tests'}/jreis")
     static final String TASK_NAME = 'RubyWax'
 
     def project
     def execTask
 
     void setup() {
+        if(TESTROOT.exists()) {
+            TESTROOT.deleteDir()
+        }
+        TESTROOT.mkdirs()
         project = ProjectBuilder.builder().build()
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
@@ -93,7 +98,6 @@ class JRubyExecIntegrationSpec extends Specification {
                 }
             }
 
-
         when:
             project.evaluate()
             execTask.exec()

src/integTest/groovy/com/lookout/jruby/JRubyPluginIntegrationSpec.groovy

@@ -8,6 +8,7 @@ import static org.gradle.api.logging.LogLevel.LIFECYCLE
 /**
  * Created by schalkc on 20/08/2014.
  */
+@Stepwise
 class JRubyPluginIntegrationSpec extends Specification {
 
     static final boolean TESTS_ARE_OFFLINE = System.getProperty('TESTS_ARE_OFFLINE') != null

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

@@ -134,12 +134,12 @@ class JRubyExec extends JavaExec {
 
         def jrubyCompletePath = project.configurations.getByName(jrubyConfigurationName)
         File gemDir = tmpGemDir()
+        gemDir.mkdirs()
         environment 'GEM_HOME' : gemDir
 
         if(configuration != null) {
             project.configurations.getByName(jrubyConfigurationName)
             project.with {
-                mkdir gemDir
                 configurations.getByName(configuration).files.findAll { File f ->
                     f.name.endsWith('.gem')
                 }.each { File f ->

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

@@ -13,22 +13,14 @@ class JRubyPlugin implements Plugin<Project> {
         project.apply plugin: 'war'
         project.extensions.create('jruby', JRubyPluginExtension, project)
 
-        project.ext {
-            gemInstallDir = "${project.buildDir}/${project.jruby.gemInstallDir}"
-        }
-
-        project.repositories {
-            maven {
-                // The url is in a closure to ensure that we can overwrite this
-                // at runtime and have the right value come through.
-                url { project.jruby.defaultGemRepo }
+        if(!project.repositories.metaClass.respondsTo(project.repositories,'rubygemsRelease')) {
+            project.repositories.metaClass.rubygemsRelease << { ->
+                maven { url 'http://rubygems-proxy.torquebox.org/releases' }
             }
+        }
 
-            // Required to pull in our warbler-bootstrap dependency
-            maven { url 'http://dl.bintray.com/rtyler/jruby' }
-
-            // We'll need jcenter to resolve the jruby .jar deps
-            jcenter()
+        project.ext {
+            gemInstallDir = "${project.buildDir}/${project.jruby.gemInstallDir}"
         }
 
         // Set up a special configuration group for our embedding jars
@@ -37,12 +29,23 @@ class JRubyPlugin implements Plugin<Project> {
             jrubyWar
             gems
         }
+
         project.configurations.create(JRubyExec.JRUBYEXEC_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) {
+                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
@@ -105,7 +108,7 @@ class JRubyPlugin implements Plugin<Project> {
             from "$project.buildDir/classes/main"
             // Bring our vendored gems into the created war file
             webInf {
-                from project.gemInstallDir
+                from project.jruby.gemInstallDir
                 into 'gems'
             }