diff --git a/CHANGELOG.md b/CHANGELOG.md index 70ef6cee..2fd7cc3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,23 @@ # Changelog +## 0.1.6 - ROADMAP + +* [#73](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/73) - Allow user to override GEM directory for `JRubyExec` + +## 0.1.5 + +* [#70](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/70) - Run executable scripts from gem dependency + +## 0.1.4 + +* [#68](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/68) - `JRubyExec` should unset/overwrite `GEM_HOME/GEM_PATH` ## 0.1.3 -* [#53](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/53) - JRubyExec should not overwrite gems on every run -* [#57](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/57) - Make JRuby 1.7.16 the default +* [#53](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/53) - `JRubyExec` should not overwrite gems on every run +* [#57](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/57) - Make `JRuby` 1.7.16 the default * [#58](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/58) - Make build independent of project directory name -* [#61](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/61) - "Native" gems are not properly supported -* [#63](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/63) - Make the JRubyExec `script` argument optional provided `jrubyArgs` is present -* [#64](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/64) - Updates to JRubyExec & project.jrubyexec to handle '-S' +* [#61](https://github.com/jruby-gradle/jruby-gradle-plugin/issues/61) - _Native_ gems are not properly supported +* [#63](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/63) - Make the `JRubyExec` `script` argument optional provided `jrubyArgs` is present +* [#64](https://github.com/jruby-gradle/jruby-gradle-plugin/pull/64) - Updates to `JRubyExec` & `project.jrubyexec` to handle `-S` diff --git a/README.md b/README.md index 0fc43dfe..ecae4a23 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,8 @@ Common methods for ```JRubyExec``` for executing a script * ```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. * ```configuration``` - ```String```. Configuration to copy gems from. (*) * ```classpath``` - ```List```. Additional Jars/Directories to place on classpath. -* ```jrubyVersion``` - ```String```. JRuby version to use if not the same as ```project.jruby.execVersion```. +* ```jrubyVersion``` - ```String```. JRuby version to use if not the same as ```project.jruby.execVersion```. +* ```gemWorkDir``` - ```File```. Provide a custom working directory for unpacking GEMs. (*) If ```jRubyVersion``` has not been set, ```jrubyExec``` will used as configuration. However, if ```jRubyVersion``` has been set, no gems will be used unless an explicit configuration has been provided diff --git a/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy b/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy index 3164a496..327d317e 100644 --- a/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy +++ b/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy @@ -56,6 +56,12 @@ class JRubyExec extends JavaExec { @Input String jrubyVersion + /** Set the GEM directory to be used by the task. If not set, then an internal generated directory will be used. + * The default behaviour is to allow each JRubyExec task to run in isolation from each other. By setting this + * a script can allow different JRubyExec instances to utilise the same folder. + * + * @since 0.1.6 + */ @OutputDirectory File gemWorkDir