openhab-jrubyscripting 5.0.0.rc8 → 5.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a08d2ec63be7c6f1049ddc92de20e0184a9c4e959c6a20e97ce9c9214520d94
-  data.tar.gz: 90178ba5a194cc91e24381c91bb691ddbafae498a033284a687698a8406c3b68
+  metadata.gz: b818f8062ce950e265819455075b42fd1cf2d1fc6270b57f547b3e93f19f0656
+  data.tar.gz: '08c396633d12172da0751719196247319731205b9ee6704ea4844bd3709321aa'
 SHA512:
-  metadata.gz: 659647412602ecb689524f4f760f1b4f6f054617190ffb8adee922daeb5a715b75f6e245a062f250e18b9262dc27667f7081ed2ca168454552ae1ca12fd24e0b
-  data.tar.gz: ac977120af8e531f0471d9f17601e7b59de9c9f44a40379d069b50227c4ec6d9674ab6f5a7791afb79f90174b6e532de3846f45d6f270459a94b2e12ecb47917
+  metadata.gz: ac9760ebe37190c941c973a4526ec8b8a7a2b1584585f324f80c531849f879f7cb471bcbac1beae02f3412fb6822fbb7e50e343e6e015e5ddbb9f5b552712a70
+  data.tar.gz: bc0ec52bafce17c3f090984370d98695fa49bfc1799293d1d6f421764f7a8ecfbe814c6d2b7bd6b03f023c0daefa517f3595bebcd7c0af53d0ce53ee153d4360

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.0.0.rc8"
+    VERSION = "5.0.0.rc9"
   end
 end

data/lib/openhab/rspec/helpers.rb

@@ -184,7 +184,7 @@ module OpenHAB
       def autorequires
         ENV["RUBYLIB"] ||= ""
         ENV["RUBYLIB"] += ":" unless ENV["RUBYLIB"].empty?
-        ENV["RUBYLIB"] += rubylib_dir
+        ENV["RUBYLIB"] += rubylib_dirs.join(":")
 
         $LOAD_PATH.unshift(*ENV["RUBYLIB"]
           .split(File::PATH_SEPARATOR)
@@ -265,10 +265,15 @@ module OpenHAB
       # @return [void]
       #
       def load_rules
-        automation_path = "#{org.openhab.core.OpenHAB.config_folder}/automation/jsr223"
+        automation_path = "#{org.openhab.core.OpenHAB.config_folder}/automation/ruby"
+        lib_dirs = rubylib_dirs.map { |d| File.join(d, "") }
+        lib_dirs << File.join(gem_home, "")
 
         SuspendRules.suspend_rules do
           files = Dir["#{automation_path}/**/*.rb"]
+          files.reject! do |f|
+            lib_dirs.any? { |l| f.start_with?(l) }
+          end
           files.sort_by { |f| [get_start_level(f), f] }.each do |f|
             load f
           rescue Exception => e
@@ -376,8 +381,17 @@ module OpenHAB
         ca.get_configuration("org.openhab.automation.jrubyscripting", nil)&.properties
       end
 
-      def rubylib_dir
-        jrubyscripting_config&.get("rubylib") || "#{org.openhab.core.OpenHAB.config_folder}/automation/lib/ruby"
+      def gem_home
+        gem_home = jrubyscripting_config&.get("gem_home")
+        return "#{org.openhab.core.OpenHAB.config_folder}/automation/ruby/.gem" unless gem_home
+
+        # strip everything after the first {
+        gem_home.split("{", 2).first
+      end
+
+      def rubylib_dirs
+        jrubyscripting_config&.get("rubylib")&.split(File::PATH_SEPARATOR) ||
+          ["#{org.openhab.core.OpenHAB.config_folder}/automation/ruby/lib"]
       end
 
       def get_start_level(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-jrubyscripting
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc8
+  version: 5.0.0.rc9
 platform: ruby
 authors:
 - Cody Cutrer