Merge pull request #74 from ysb33r/master

Added support for gemWorkDir - Fixes #73

Author: ysb33r

build.gradle

@@ -21,6 +21,7 @@ if (System.env.RELEASE != '1') {
     version = "${version}-SNAPSHOT"
 }
 sourceCompatibility = '1.7'
+targetCompatibility = '1.7'
 
 // --- Could be in a separate gradle file
 configurations {

src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy

@@ -106,4 +106,26 @@ class JRubyExecIntegrationSpec extends Specification {
             output.toString() == "Not valid\n"
     }
 
+    @IgnoreIf({TESTS_ARE_OFFLINE})
+    def "Running a script that has a custom gemdir"() {
+        given:
+            def output = new ByteArrayOutputStream()
+            project.configure(execTask) {
+                setEnvironment [:]
+                script        "${TEST_SCRIPT_DIR}/requiresGem.rb"
+                standardOutput output
+                gemWorkDir     new File(TESTROOT,'customGemDir')
+            }
+
+        when:
+            project.dependencies.add(JRubyExec.JRUBYEXEC_CONFIG,'rubygems:credit_card_validator:1.2.0' )
+            project.evaluate()
+            execTask.exec()
+
+        then:
+            output.toString() == "Not valid\n"
+            new File(TESTROOT,'customGemDir').exists()
+
+    }
+
 }

src/main/groovy/com/github/jrubygradle/JRubyExec.groovy

@@ -10,6 +10,7 @@ import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskInstantiationException
 import org.gradle.internal.FileUtils
 import org.gradle.process.ExecResult
@@ -55,6 +56,9 @@ class JRubyExec extends JavaExec {
     @Input
     String jrubyVersion
 
+    @OutputDirectory
+    File gemWorkDir
+
     JRubyExec() {
         super()
         super.setMain 'org.jruby.Main'
@@ -86,6 +90,27 @@ class JRubyExec extends JavaExec {
         }
     }
 
+    /** Sets the working directory used by the task for installing GEMs.
+     * By default every task will use its own private directory, so that tasks
+     * can be run in isolation avoiding potential clashes between different versions
+     * of the same GEM. If the user requires multiple tasks to share the same GEM area
+     * then this configuration property can be used to to provide such a folder..
+     *
+     * @param fName Path to script
+     */
+    void setGemWorkDir(Object fName) {
+        switch (fName) {
+            case File:
+                gemWorkDir=fName
+                break
+            case String:
+                gemWorkDir = new File(fName)
+                break
+            default:
+                gemWorkDir = new File(fName.toString())
+        }
+    }
+
     /** Returns a list of script arguments
      */
     List<String> scriptArgs() {
@@ -148,17 +173,19 @@ class JRubyExec extends JavaExec {
 
         GemUtils.OverwriteAction overwrite = project.gradle.startParameter.refreshDependencies ?  GemUtils.OverwriteAction.OVERWRITE : GemUtils.OverwriteAction.SKIP
         def jrubyCompletePath = project.configurations.getByName(jrubyConfigurationName)
-        File gemDir = tmpGemDir()
-        gemDir.mkdirs()
-        environment 'GEM_HOME' : gemDir,
+        if(gemWorkDir == null) {
+            gemWorkDir = tmpGemDir()
+        }
+        gemWorkDir.mkdirs()
+        environment 'GEM_HOME' : gemWorkDir,
                     'PATH' : getComputedPATH(System.env.PATH)
 
         if (configuration != null) {
             GemUtils.extractGems(
                     project,
                     jrubyCompletePath,
                     project.configurations.getByName(configuration),
-                    gemDir,
+                    gemWorkDir,
                     overwrite
             )
         }

src/test/groovy/com/github/jrubygradle/JRubyExecSpec.groovy

@@ -176,4 +176,15 @@ class JRubyExecSpec extends Specification {
         then:
             execTask.getComputedPATH(System.env.PATH).contains('foo')
     }
+
+    def "Override the GEM working directory"() {
+        when:
+            project.configure(execTask) {
+                gemWorkDir 'foobar'
+            }
+
+        then:
+            execTask.gemWorkDir == new File('foobar')
+    }
+
 }