Merge branch 'master' of https://github.com/rtyler/jruby-gradle-plugin

Author: ysb33r

CHANGELOG.md

@@ -1,8 +1,22 @@
 # Changelog
 
-## v2.0.3
-
- * s
+## v2.1.1
+
+ * Removed `jruby.gemrepo_url` extension point (*hopefully*) before anybody
+   started using it. Renamed to `jruby.defaultGemRepo` to line up better with
+   changes that will come in to support [multiple rubygem
+   repos](https://github.com/rtyler/jruby-gradle-plugin/issues/13)
+
+## v2.1.0
+
+ * [#18](https://github.com/rtyler/jruby-gradle-plugin/issues/18) allow
+   changing the Gem installation directory by setting `jruby.gemInstallDir` in
+   a gradle file
+ * [#16](https://github.com/rtyler/jruby-gradle-plugin/pull/16) add the
+   `JRubyExec` task type for executing Ruby code with the embedded JRuby
+   dependency.
+ * [#14](https://github.com/rtyler/jruby-gradle-plugin/pull/14) allow a user to
+   set/choose the version of JRuby they wish to use with the plugin
 
 ## v2.0.2
 

README.md

@@ -1,6 +1,6 @@
 # JRuby Gradle plugin
 
-[![Build Status](https://buildhive.cloudbees.com/job/rtyler/job/jruby-gradle-plugin/badge/icon)](https://buildhive.cloudbees.com/job/rtyler/job/jruby-gradle-plugin/) [![Download](https://api.bintray.com/packages/rtyler/jruby/jruby-gradle-plugin/images/download.png)](https://bintray.com/rtyler/jruby/jruby-gradle-plugin/\_latestVersion)
+[![Build Status](https://buildhive.cloudbees.com/job/rtyler/job/jruby-gradle-plugin/badge/icon)](https://buildhive.cloudbees.com/job/rtyler/job/jruby-gradle-plugin/) [![Download](https://api.bintray.com/packages/rtyler/jruby/jruby-gradle-plugin/images/download.png)](https://bintray.com/rtyler/jruby/jruby-gradle-plugin/\_latestVersion) [![Gitter chat](https://badges.gitter.im/rtyler/jruby-gradle-plugin.png)](https://gitter.im/rtyler/jruby-gradle-plugin)
 
 The purpose of plugin is to encapsulate useful [Gradle](http://www.gradle.org/)
 functionality for JRuby projects. Use of this plugin replaces the need for both
@@ -46,7 +46,7 @@ buildscript {
     repositories { jcenter() }
 
     dependencies {
-      classpath group: 'com.lookout', name: 'jruby-gradle-plugin', version: '2.0.+'
+      classpath group: 'com.lookout', name: 'jruby-gradle-plugin', version: '2.1.+'
     }
 }
 ```
@@ -186,7 +186,7 @@ You can then use that custom Gem repository with:
 apply plugin: 'com.lookout.jruby'
 
 // Set our custom Gem repository
-jruby.gemrepo_url = 'http://localhost:8989/releases'
+jruby.defaultGemRepo = 'http://localhost:8989/releases'
 
 dependencies {
     gems group: 'com.lookout', name: 'custom-gem', version: '1.0.+'

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 }
 
 group = 'com.lookout'
-version = '2.0.3'
+version = '2.1.0'
 
 if (System.env.RELEASE != '1') {
     version = "${version}-SNAPSHOT"

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

@@ -11,16 +11,17 @@ import org.gradle.api.file.DuplicateFileCopyingException
  */
 class GemUtils {
     static Boolean extractGem(Project p, File gem) {
-        def gemname = gemFullNameFromFile(gem.getName())
-        File extract_dir = new File("./vendor/gems/$gemname")
+        String gemName = gemFullNameFromFile(gem.getName())
+        String installDir = p.jruby.gemInstallDir
+        File extractDir = new File("./${installDir}/gems/${gemName}")
 
-        if (extract_dir.exists()) {
+        if (extractDir.exists()) {
             return
         }
 
         p.exec {
             executable "gem"
-            args 'install', gem, '--install-dir=./vendor', '--no-ri', '--no-rdoc'
+            args 'install', gem, "--install-dir=./${installDir}", '--no-ri', '--no-rdoc'
         }
     }
 
@@ -33,13 +34,17 @@ class GemUtils {
      * @param overwrite Allow overwrite of an existing gem folder
      * @return
      */
-    static void extractGem(Project project, def jRubyClasspath, File gem,File destDir,boolean overwrite) {
-        def gemname = gemFullNameFromFile(gem.name)
-        File extract_dir = new File(destDir,gemname)
+    static void extractGem(Project project,
+                            def jRubyClasspath,
+                            File gem,
+                            File destDir,
+                            boolean overwrite) {
+        String gemName = gemFullNameFromFile(gem.name)
+        File extractDir = new File(destDir, gemName)
 
-        if (extract_dir.exists()) {
+        if (extractDir.exists()) {
             if(overwrite) {
-                project.delete extract_dir
+                project.delete extractDir
             } else {
                 throw new DuplicateFileCopyingException("Gem ${gem.name} already exists")
             }

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

@@ -16,7 +16,7 @@ class JRubyPlugin implements Plugin<Project> {
             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.gemrepo_url }
+                url { project.jruby.defaultGemRepo }
             }
 
             // Required to pull in our warbler-bootstrap dependency
@@ -99,7 +99,7 @@ class JRubyPlugin implements Plugin<Project> {
             from "$project.buildDir/classes/main"
             // Bring our vendored gems into the created war file
             webInf {
-                from 'vendor'
+                from project.jruby.gemInstallDir
                 into 'gems'
             }
 

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

@@ -3,10 +3,10 @@ package com.lookout.jruby
 import org.gradle.api.Project
 
 class JRubyPluginExtension {
-
     // More details here: <http://rubygems-proxy.torquebox.org/>
-    def String gemrepo_url = "http://rubygems-proxy.torquebox.org/releases"
-
+    String defaultGemRepo = 'http://rubygems-proxy.torquebox.org/releases'
+    String gemrepo_url = defaultGemRepo
+    String gemInstallDir = 'vendor'
     String defaultVersion = '1.7.13'
     String execVersion = defaultVersion
 

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

@@ -55,7 +55,7 @@ class JRubyPluginTest {
     @Test
     public void jrubyPluginCustomGemRepoUrl() {
         def url = 'http://junit.maven/releases'
-        project.jruby.gemrepo_url = url
+        project.jruby.defaultGemRepo = url
         assertTrue(hasRepositoryUrl(project, url))
     }