Skip to content

Commit 6a097e9

Browse files
committed
Merge pull request #76 from ysb33r/master
Updated CHANGELOG & README to cover the JRubyExec.gemWorkDir property
2 parents f37443a + 1e4bffb commit 6a097e9

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

CHANGELOG.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
# Changelog
22

3+
## 0.1.6 - ROADMAP
4+
5+
* [#73](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/73) - Allow user to override GEM directory for `JRubyExec`
6+
7+
## 0.1.5
8+
9+
* [#70](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/70) - Run executable scripts from gem dependency
10+
11+
## 0.1.4
12+
13+
* [#68](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/68) - `JRubyExec` should unset/overwrite `GEM_HOME/GEM_PATH`
314

415
## 0.1.3
516

6-
* [#53](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/53) - JRubyExec should not overwrite gems on every run
7-
* [#57](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/57) - Make JRuby 1.7.16 the default
17+
* [#53](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/53) - `JRubyExec` should not overwrite gems on every run
18+
* [#57](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/57) - Make `JRuby` 1.7.16 the default
819
* [#58](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/58) - Make build independent of project directory name
9-
* [#61](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/61) - "Native" gems are not properly supported
10-
* [#63](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/63) - Make the JRubyExec `script` argument optional provided `jrubyArgs` is present
11-
* [#64](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/64) - Updates to JRubyExec & project.jrubyexec to handle '-S'
20+
* [#61](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/61) - _Native_ gems are not properly supported
21+
* [#63](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/63) - Make the `JRubyExec` `script` argument optional provided `jrubyArgs` is present
22+
* [#64](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/64) - Updates to `JRubyExec` & `project.jrubyexec` to handle `-S`
1223

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ Common methods for ```JRubyExec``` for executing a script
9292
* ```ignoreExitValue``` - ```Boolean```. Ignore the JVm exit value. Exit values are only effective if the exit value of the Ruby script is correctly communicated back to the JVM.
9393
* ```configuration``` - ```String```. Configuration to copy gems from. (*)
9494
* ```classpath``` - ```List```. Additional Jars/Directories to place on classpath.
95-
* ```jrubyVersion``` - ```String```. JRuby version to use if not the same as ```project.jruby.execVersion```.
95+
* ```jrubyVersion``` - ```String```. JRuby version to use if not the same as ```project.jruby.execVersion```.
96+
* ```gemWorkDir``` - ```File```. Provide a custom working directory for unpacking GEMs.
9697

9798
(*) If ```jRubyVersion``` has not been set, ```jrubyExec``` will used as
9899
configuration. However, if ```jRubyVersion``` has been set, no gems will be used unless an explicit configuration has been provided

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ class JRubyExec extends JavaExec {
5656
@Input
5757
String jrubyVersion
5858

59+
/** Set the GEM directory to be used by the task. If not set, then an internal generated directory will be used.
60+
* The default behaviour is to allow each JRubyExec task to run in isolation from each other. By setting this
61+
* a script can allow different JRubyExec instances to utilise the same folder.
62+
*
63+
* @since 0.1.6
64+
*/
5965
@OutputDirectory
6066
File gemWorkDir
6167

0 commit comments

Comments
 (0)