Added rubygemRelease() as a repository name. Added jruby.defaultRepositories as a way to turn off the loading of default repositories in JRubyPlugin.apply. Updated tests to cope with change as some tests require project.evaluate to be called first. Currently ignoring jrubyPluginCustomGemRepoUrl test as it probably no longer needed.

Author: ysb33r

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'
             }
 

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

@@ -1,19 +1,38 @@
 package com.lookout.jruby
 
+import org.gradle.api.Incubating
 import org.gradle.api.Project
 
 class JRubyPluginExtension {
     // More details here: <http://rubygems-proxy.torquebox.org/>
-    String defaultGemRepo = 'http://rubygems-proxy.torquebox.org/releases'
-    String gemrepo_url = defaultGemRepo
+//    String defaultGemRepo = 'http://rubygems-proxy.torquebox.org/releases'
+//    String gemrepo_url = defaultGemRepo
     String gemInstallDir = 'vendor'
+
+    /** The default version of jruby that will be used by jrubyWar
+     *
+     */
     String defaultVersion = '1.7.13'
+
+    /** The version of jruby used by jrubyexec as well as default version of jruby that will be used by JRubyExec
+     *
+     */
     String execVersion = defaultVersion
 
+    /** Set this to false if you do not want the default set of repositories to be loaded.
+     *
+     */
+    @Incubating
+    boolean defaultRepositories = true
+
     JRubyPluginExtension(Project p) {
         project = p
     }
 
+    /** Change the version of jruby for jrubyexec and JRubyExec
+     *
+     * @param newVersion
+     */
     void setExecVersion(final String newVersion) {
         execVersion = newVersion
 

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

@@ -49,13 +49,16 @@ class JRubyPluginTest {
 
     @Test
     public void jrubyPluginSetsRepositoriesCorrectly() {
+        project.evaluate()
         assertTrue(hasRepositoryUrl(project, 'http://rubygems-proxy.torquebox.org/releases'))
     }
 
     @Test
+    @Ignore
     public void jrubyPluginCustomGemRepoUrl() {
         def url = 'http://junit.maven/releases'
         project.jruby.defaultGemRepo = url
+        project.evaluate()
         assertTrue(hasRepositoryUrl(project, url))
     }
 
@@ -71,6 +74,14 @@ class JRubyPluginTest {
         assertEquals(gem_name, GemUtils.gemFullNameFromFile(filename))
     }
 
+    @Test
+    public void defaultRubyGemRepository() {
+        project.evaluate()
+        assertTrue project.repositories.metaClass.respondsTo(project.repositories,'rubygemsRelease') != null
+        def repo = project.repositories.rubygemsRelease()
+        assertTrue(hasRepositoryUrl(project, 'http://rubygems-proxy.torquebox.org/releases'))
+    }
+
     //
     //  Helper methods for testing
     ////////////////////////////////////////////////////////////////////////////