Refactor and tidy up customizing gemInstallDir while keeping it in project.buildDir by default

See #28

Author: R. Tyler Croy

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

@@ -14,18 +14,19 @@ class GemUtils {
 
     static Boolean extractGem(Project p, File gem) {
         String gemName = gemFullNameFromFile(gem.getName())
+        File gemInstallDir = new File(p.jruby.gemInstallDir)
         // Wherever our gems will be installed, we need to make sure the
         // directory exists since `p.exec` will silently fail
-        new File(p.gemInstallDir).mkdirs()
-        File extractDir = new File("${p.gemInstallDir}/gems/${gemName}")
+        gemInstallDir.mkdirs()
+        File extractDir = new File([gemInstallDir, 'gems', gemName].join(File.separator))
 
         if (extractDir.exists()) {
             return
         }
 
         p.exec {
             executable "gem"
-            args 'install', gem, "--install-dir=${p.gemInstallDir}", '--no-ri', '--no-rdoc'
+            args 'install', gem, "--install-dir=${gemInstallDir}", '--no-ri', '--no-rdoc'
         }
     }
 

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

@@ -19,10 +19,6 @@ class JRubyPlugin implements Plugin<Project> {
             }
         }
 
-        project.ext {
-            gemInstallDir = "${project.buildDir}/${project.jruby.gemInstallDir}"
-        }
-
         // Set up a special configuration group for our embedding jars
         project.configurations {
             jrubyEmbeds

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

@@ -4,15 +4,14 @@ 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 gemInstallDir = 'vendor'
-
     /** The default version of jruby that will be used by jrubyWar
      *
      */
     String defaultVersion = '1.7.13'
+    /** Directory for jrubyPrepare to install .gem dependencies into
+     *
+     */
+    String gemInstallDir
 
     /** The version of jruby used by jrubyexec as well as default version of jruby that will be used by JRubyExec
      *
@@ -27,6 +26,7 @@ class JRubyPluginExtension {
 
     JRubyPluginExtension(Project p) {
         project = p
+        gemInstallDir = [p.buildDir.absolutePath, 'vendor'].join(File.separator)
     }
 
     /** Change the version of jruby for jrubyexec and JRubyExec