openhab-scripting 3.8.3 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a742ef099c8ac0a80c12d5516a5e6a442e74163dbcbcde65e14fc720893504f
-  data.tar.gz: 2193be3d59ccf5acae8043e9b8cef08b60ff7f45f23ebe3a3eb417f4e5e5bbae
+  metadata.gz: 5c03b915b3027b19b32190a109fd89168ff9d4fd2b636176f7f24b0efc2d39b0
+  data.tar.gz: 281990d13b27ef66090ba90f0413f1102ea3945fc4d8f356688ac38b663ea3c2
 SHA512:
-  metadata.gz: 63468e75bd85979595f70ade6dd670c383450175aab1ee1bf51b9695f436f455ec5b11d10fc922e5e877d3af318edf730309d82bdf8e1f6fe9cf4aa73b825f5d
-  data.tar.gz: 23c99aef7e3ce17de6fc0ce34dfcceb62911a9b312a0d8f0a8ca19d0c7bdb45e93fd5860b11b22490c105fe030ef70554087e486ad5ef9227e3bed531c3362bc
+  metadata.gz: 8531c1602708c55a29159ed8a82193040db66a21a23badeccf3eb960a6ac96dee573716de5e15f1d9b47d95bb4f563be87d54abf7ca7db17c30a104e954e295b
+  data.tar.gz: d880407cc64add80e583f99ba7b8220741b51894ab3479f2dafb63a7a30d9c539abaf2c96abacaa2cfbc8c8f64f6ad6679cc5f470fdeed12973af98eee65761c

data/lib/openhab/core/entity_lookup.rb

@@ -129,7 +129,7 @@ module OpenHAB
         # Thing UIDs have at least 3 segements
         return if name.count('_') < 3
 
-        name = name.gsub('_', ':')
+        name = name.tr('_', ':')
         # rubocop: disable Style/GlobalVars
         $things.get(Java::OrgOpenhabCoreThing::ThingUID.new(name))
         # rubocop: enable Style/GlobalVars

data/lib/openhab/core/load_path.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  #
+  # Core support for OpenHAB JRuby Library
+  #
+  module Core
+    #
+    # JRuby isn't respecting $RUBYLIB when run embedded inside of OpenHAB, so do it manually
+    #
+    def self.add_rubylib_to_load_path
+      ENV['RUBYLIB']&.split(File::PATH_SEPARATOR)&.each do |path|
+        next if path.empty?
+
+        $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
+      end
+    end
+  end
+end

data/lib/openhab/dsl/timers.rb

@@ -31,14 +31,14 @@ module OpenHAB
         # @param [Duration] duration Duration until timer should fire
         # @param [Block] block Block to execute when timer fires
         #
-        def initialize(duration:, &block)
+        def initialize(duration:)
           @duration = duration
 
           # A semaphore is used to prevent a race condition in which calling the block from the timer thread
           # occurs before the @timer variable can be set resulting in @timer being nil
           semaphore = Mutex.new
 
-          timer_block = proc { semaphore.synchronize { block.call(self) } }
+          timer_block = proc { semaphore.synchronize { yield(self) } }
 
           semaphore.synchronize do
             @timer = ScriptExecution.createTimer(

data/lib/openhab/dsl/types/datetime.rb

@@ -81,7 +81,7 @@ module OpenHAB
 
           case other
           when TimeOfDay::TimeOfDay, TimeOfDay::TimeOfDayRangeElement then to_tod <=> other
-          when String then self <=> DateTime.parse(DATE_ONLY_REGEX =~ other ? "#{other}'T'00:00:00#{zone}" : other)
+          when String then self <=> DateTime.parse(DATE_ONLY_REGEX.match?(other) ? "#{other}'T'00:00:00#{zone}" : other)
           else
             self <=> DateTime.from(other)
           end
@@ -120,7 +120,7 @@ module OpenHAB
           when Numeric then DateTime.from(to_time - other)
           when String
             dt = DateTime.parse(other)
-            TIME_ONLY_REGEX =~ other ? self - dt.to_f : time_diff(dt)
+            TIME_ONLY_REGEX.match?(other) ? self - dt.to_f : time_diff(dt)
           when Duration then DateTime.new(zoned_date_time.minus(other))
           when Time, DateTime, DateTimeType, DateTimeItem then time_diff(other)
           end
@@ -298,7 +298,7 @@ module OpenHAB
         # @return [Java::org::openhab::core::library::types::DateTimeType] Object representing the same time
         #
         def self.parse(time_string)
-          time_string += 'Z' if TIME_ONLY_REGEX =~ time_string
+          time_string += 'Z' if TIME_ONLY_REGEX.match?(time_string)
           DateTime.new(DateTimeType.new(time_string))
         rescue Java::JavaLang::StringIndexOutOfBoundsException, Java::JavaLang::IllegalArgumentException
           # Try ruby's Time.parse if OpenHAB's DateTimeType parser fails

data/lib/openhab/version.rb

@@ -5,5 +5,5 @@
 #
 module OpenHAB
   # @return [String] Version of OpenHAB helper libraries
-  VERSION = '3.8.3'
+  VERSION = '3.9.3'
 end

data/lib/openhab.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'openhab/core/load_path'
 require 'openhab/core/openhab_setup'
 require 'openhab/log/logger'
 require 'openhab/dsl/dsl'
@@ -28,6 +29,8 @@ module OpenHAB
     base.send :include, OpenHAB::DSL::Items
     base.send :include, OpenHAB::DSL::Types
     logger.info "OpenHAB JRuby Scripting Library Version #{OpenHAB::VERSION} Loaded"
+
+    OpenHAB::Core.add_rubylib_to_load_path
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.9.3
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - lib/openhab.rb
 - lib/openhab/core/entity_lookup.rb
+- lib/openhab/core/load_path.rb
 - lib/openhab/core/openhab_setup.rb
 - lib/openhab/core/osgi.rb
 - lib/openhab/dsl/actions.rb