diff --git a/bundles/org.openhab.automation.jrubyscripting/README.md b/bundles/org.openhab.automation.jrubyscripting/README.md index d689fd83be9..b7e935e5940 100644 --- a/bundles/org.openhab.automation.jrubyscripting/README.md +++ b/bundles/org.openhab.automation.jrubyscripting/README.md @@ -99,7 +99,7 @@ Additional [example rules are available](https://openhab.github.io/openhab-jruby following the [openHAB instructions](https://www.openhab.org/docs/configuration/addons.html). In openHAB 4.0+ the defaults are set so the next step can be skipped. 1. Go to `Settings -> Other Services -> JRuby Scripting`: - - **Ruby Gems**: `openhab-scripting=~>5.0.0` + - **Ruby Gems**: `openhab-scripting=~>5.0` - **Require Scripts**: `openhab/dsl` (not required, but recommended) ### Using Files @@ -112,7 +112,7 @@ Additional [example rules are available](https://openhab.github.io/openhab-jruby Create a file called `jruby.cfg` in `/services/` with the following content: ```ini - org.openhab.automation.jrubyscripting:gems=openhab-scripting=~>5.0.0 + org.openhab.automation.jrubyscripting:gems=openhab-scripting=~>5.0 org.openhab.automation.jrubyscripting:require=openhab/dsl ``` @@ -129,7 +129,7 @@ Simply change the `gems` and `require` configuration settings. | Parameter | Description | | --------------------- | -------------------------------------------------------------------------------------------------------- | | `gem_home` | The path to store Ruby Gems.

Default: `$OPENHAB_CONF/automation/ruby/.gem/RUBY_ENGINE_VERSION` | -| `gems` | A list of gems to install.

Default: `openhab-scripting=~>5.0.0` | +| `gems` | A list of gems to install.

Default: `openhab-scripting=~>5.0` | | `check_update` | Check for updated version of `gems` on start up or settings change.

Default: `true` | | `require` | List of scripts to be required automatically.

Default: `openhab/dsl` | | `rubylib` | Search path for user libraries.

Default: `$OPENHAB_CONF/automation/ruby/lib` | diff --git a/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineConfiguration.java b/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineConfiguration.java index 92a5eecb678..ee01cb7732b 100644 --- a/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineConfiguration.java +++ b/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineConfiguration.java @@ -79,7 +79,7 @@ public class JRubyScriptEngineConfiguration { new OptionalConfigurationElement(OptionalConfigurationElement.Type.RUBY_ENVIRONMENT, DEFAULT_RUBYLIB, "RUBYLIB")), - Map.entry(GEMS_CONFIG_KEY, new OptionalConfigurationElement("openhab-scripting=~>5.0.0")), + Map.entry(GEMS_CONFIG_KEY, new OptionalConfigurationElement("openhab-scripting=~>5.0")), Map.entry(REQUIRE_CONFIG_KEY, new OptionalConfigurationElement("openhab/dsl")), diff --git a/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/config/config.xml index 6fd0791eb7a..4239e13196b 100644 --- a/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/config/config.xml @@ -26,7 +26,7 @@ = and then the standard RubyGems version constraint, such as "openhab-scripting=~>5.0.0". + = and then the standard RubyGems version constraint, such as "openhab-scripting=~>5.0". ]]> openhab-scripting=~>5.0.0 diff --git a/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/i18n/jruby.properties b/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/i18n/jruby.properties index 184d389dd5a..0cb1333bace 100644 --- a/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/i18n/jruby.properties +++ b/bundles/org.openhab.automation.jrubyscripting/src/main/resources/OH-INF/i18n/jruby.properties @@ -5,7 +5,7 @@ automation.config.jruby.dependency_tracking.description = Dependency tracking al automation.config.jruby.gem_home.label = GEM_HOME automation.config.jruby.gem_home.description = Location Ruby Gems will be installed to and loaded from. Directory will be created if necessary. You can use {RUBY_ENGINE_VERSION}, {RUBY_ENGINE} and/or {RUBY_VERSION} replacements in this value to automatically point to a new directory when the addon is updated with a new version of JRuby. Defaults to "OPENHAB_CONF/automation/ruby/.gem/{RUBY_ENGINE_VERSION}" when not specified. automation.config.jruby.gems.label = Ruby Gems -automation.config.jruby.gems.description = A comma separated list of Ruby Gems to install. Versions may be constrained by separating with an = and then the standard RubyGems version constraint, such as "openhab-scripting=~>5.0.0". +automation.config.jruby.gems.description = A comma separated list of Ruby Gems to install. Versions may be constrained by separating with an = and then the standard RubyGems version constraint, such as "openhab-scripting=~>5.0". automation.config.jruby.group.environment.label = Ruby Environment automation.config.jruby.group.environment.description = This group defines Ruby's environment. automation.config.jruby.group.gems.label = Ruby Gems