Merge pull request #72 from rtyler/jrubyexec-path-fixes

Jrubyexec path fixes

Author: R. Tyler Croy

build.gradle

@@ -14,7 +14,7 @@ apply from: 'gradle/integration-tests.gradle'
 
 
 group = 'com.github.jruby-gradle'
-version = '0.1.3'
+version = '0.1.4'
 archivesBaseName = 'jruby-gradle-plugin'
 
 if (System.env.RELEASE != '1') {

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

@@ -30,8 +30,9 @@ class JRubyExec extends JavaExec {
         }
 
         proj.tasks.withType(JRubyExec) { t ->
-            if(t.jrubyConfigurationName != proj.configurations.jrubyExec) {
-                proj.dependencies.add(t.jrubyConfigurationName,"org.jruby:jruby-complete:${t.jrubyVersion}")
+            if (t.jrubyConfigurationName != proj.configurations.jrubyExec) {
+                proj.dependencies.add(t.jrubyConfigurationName,
+                                        "org.jruby:jruby-complete:${t.jrubyVersion}")
             }
         }
     }
@@ -78,16 +79,18 @@ class JRubyExec extends JavaExec {
                 script=fName
                 break
             case String:
-                script=new File(fName)
+                script = new File(fName)
                 break
             default:
-                script=new File(fName.toString())
+                script = new File(fName.toString())
         }
     }
 
     /** Returns a list of script arguments
      */
-    List<String> scriptArgs() {CollectionUtils.stringize(this.scriptArgs)}
+    List<String> scriptArgs() {
+        CollectionUtils.stringize(this.scriptArgs)
+    }
 
     /** Set arguments for script
      *
@@ -99,7 +102,9 @@ class JRubyExec extends JavaExec {
 
     /** Returns a list of jruby arguments
      */
-    List<String> jrubyArgs()  {CollectionUtils.stringize(this.jrubyArgs)}
+    List<String> jrubyArgs() {
+        CollectionUtils.stringize(this.jrubyArgs)
+    }
 
     /** Set arguments for jruby
      *
@@ -109,6 +114,17 @@ class JRubyExec extends JavaExec {
         this.jrubyArgs.addAll(args as List)
     }
 
+    /** Return the computed `PATH` for the task
+     *
+     */
+    String getComputedPATH(String configuration, String originalPath) {
+        File path = new File([project.buildDir,
+                                'tmp',
+                                configuration,
+                                'bin'].join(File.separator))
+        return path.absolutePath + File.pathSeparatorChar + originalPath
+    }
+
     /** Setting the {@code jruby-complete} version allows for tasks to be run using different versions of JRuby.
      * This is useful for comparing the results of different version or running with a gem that is only
      * compatible with a specific version or when running a script with a different version that what will
@@ -117,7 +133,7 @@ class JRubyExec extends JavaExec {
      * @param version String in the form '1.7.13'
      */
     void setJrubyVersion(final String version) {
-        if(version == project.jruby.execVersion) {
+        if (version == project.jruby.execVersion) {
             jrubyConfigurationName = JRUBYEXEC_CONFIG
         } else {
             final String cfgName= 'jrubyExec$$' + name
@@ -129,17 +145,18 @@ class JRubyExec extends JavaExec {
 
     @Override
     void exec() {
-        if(configuration == null && jrubyConfigurationName == JRUBYEXEC_CONFIG) {
+        if (configuration == null && jrubyConfigurationName == JRUBYEXEC_CONFIG) {
             configuration = JRUBYEXEC_CONFIG
         }
 
         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
+        environment 'GEM_HOME' : gemDir,
+                    'PATH' : getComputedPATH(configuration, System.env.PATH)
 
-        if(configuration != null) {
+        if (configuration != null) {
             GemUtils.extractGems(
                     project,
                     jrubyCompletePath,
@@ -174,7 +191,7 @@ class JRubyExec extends JavaExec {
 
     @Override
     JavaExec setMain(final String mainClassName) {
-        if(mainClassName == 'org.jruby.Main') {
+        if (mainClassName == 'org.jruby.Main') {
             super.setMain(mainClassName)
         } else {
             throw notAllowed("Setting main class for jruby to ${mainClassName} is not a valid operation")
@@ -208,7 +225,7 @@ class JRubyExec extends JavaExec {
 
     private File tmpGemDir() {
         String ext = FileUtils.toSafeFileName(jrubyConfigurationName)
-        if(configuration && configuration!=jrubyConfigurationName) {
+        if (configuration && configuration != jrubyConfigurationName) {
             ext= ext + "-${FileUtils.toSafeFileName(configuration)}"
         }
         new File( project.buildDir, "tmp/${ext}").absoluteFile

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

@@ -164,4 +164,16 @@ class JRubyExecSpec extends Specification {
             thrown(InvalidUserDataException)
     }
 
+    def "Properly set the PATH in the Exec envirionment"() {
+        given:
+            project.configurations.maybeCreate('foo')
+
+        when:
+            project.configure(execTask) {
+                configuration 'foo'
+            }
+
+        then:
+            execTask.getComputedPATH('foo', System.env.PATH).contains('foo')
+    }
 }