openhab-scripting 4.42.0 → 4.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62974273127c66d888a44c8871b287dd6cfc90485ad04e9d461b407d19474eb1
-  data.tar.gz: d9540eeb7d3df3df1075ff8c79a4bc8eef1ca9e6920860bce2c5a3c64a2931b8
+  metadata.gz: 3ced4a751b4de9b352e205574f4351ed291efe23b2b096b5be7f40e12cc20777
+  data.tar.gz: 914351269a8c397536cb1df56907891565d9214b1d11f6124543dbf91b6aa0f2
 SHA512:
-  metadata.gz: 26fbfcddca4f673fbaf1a2399bb126c06715dfbe966ae1c0a77259bdc5b1debafbbdb9b9103c81d0c8bc31311118b44517504e749611cb0c80cc4ddea1e69e23
-  data.tar.gz: 80e903ea1be4ce311c3f5093fa678bd38a22ddc5e97ac24245faaa5ad14cd5cd383b3e82f9cce11da6d7e062608ce5181a8eed3005f5aab09982f0a78f5eb944
+  metadata.gz: e6f5fd13e613a4b4b018f73236bb050b5b80f1087ac24e6747d5b5aa710920ad9b9bc6bbc56d437b4b8c8ba39f9db516995b15d64592ad813e4bee276ba79b67
+  data.tar.gz: fbee80a3b22ad7c2ee83c42e6294602a88b522926340fe0d5f089a76284b7742bc1d50352de8d2c087fd1a399b810f0182ea8c15f4d2e666eb86465ce6b907d1

data/lib/openhab/core/thread_local.rb

@@ -33,7 +33,7 @@ module OpenHAB
       # @param [Hash] values Keys and values to set for running thread, if hash is nil no values are set
       #
       def thread_local(**values, &block)
-        ThreadLocal.thread_local(values, &block)
+        ThreadLocal.thread_local(**values, &block)
       end
     end
   end

data/lib/openhab/dsl/actions.rb

@@ -101,6 +101,18 @@ module OpenHAB
         volume = Types::PercentType.new(volume) unless volume.is_a?(Types::PercentType) || volume.nil?
         Audio.playSound sink&.to_s, filename.to_s, volume
       end
+
+      #
+      # Play an audio stream from an URL to the given sink(s). Set url to nil if streaming should be stopped
+      #
+      # @param [String] url The URL of the audio stream
+      # @param [String] sink The audio sink, or nil to use the default audio sink
+      #
+      # @return [void]
+      #
+      def play_stream(url, sink: nil)
+        Audio.playStream sink&.to_s, url
+      end
     end
   end
 end

data/lib/openhab/dsl/items/comparable_item.rb

@@ -37,7 +37,7 @@ module OpenHAB
           end
 
           # if we're NULL or UNDEF, implement special logic
-          return nil_comparison unless state?
+          return nil_comparison(other) unless state?
 
           # delegate to how the state compares to the other object
           state <=> other
@@ -45,9 +45,10 @@ module OpenHAB
 
         # Special logic for NULL/UNDEF state comparison
         # @!visibility private
-        def nil_comparison
+        def nil_comparison(other)
           # if comparing to nil, consider ourselves equal
           return 0 if other.nil?
+
           # if the other object is an Item, only consider equal if we're
           # in the same _kind_ of UnDefType state
           return raw_state == other.raw_state if other.is_a?(GenericItem) && !other.state?

data/lib/openhab/dsl/items/ensure.rb

@@ -88,6 +88,7 @@ module OpenHAB
             @item.__send__(method, *args, &block)
           end
         end
+        ruby2_keywords :method_missing if respond_to? :ruby2_keywords
 
         # .
         def respond_to_missing?(method, include_private = false)

data/lib/openhab/dsl/items/persistence.rb

@@ -220,10 +220,10 @@ module OpenHAB
         end
 
         PERSISTENCE_METHODS.each do |method|
-          public_method = method.to_s.delete_suffix('?') # For some reason, the boolean methods with '?' are missing
           define_method(method) do |timestamp, service = nil|
             service ||= persistence_service
-            result = PersistenceExtensions.public_send(public_method, self, to_zdt(timestamp), service&.to_s)
+            result = PersistenceExtensions.public_send(method.to_s.delete_suffix('?'), self, to_zdt(timestamp),
+                                                       service&.to_s)
             wrap_result(result, method)
           end
 
@@ -232,8 +232,8 @@ module OpenHAB
           between_method = method.to_s.sub('_since', '_between').to_sym
           define_method(between_method) do |start, finish, service = nil|
             service ||= persistence_service
-            result = PersistenceExtensions.public_send(public_method, self, to_zdt(start), to_zdt(finish),
-                                                       service&.to_s)
+            result = PersistenceExtensions.public_send(between_method.to_s.delete_suffix('?'), self, to_zdt(start),
+                                                       to_zdt(finish), service&.to_s)
             wrap_result(result, method)
           end
         end

data/lib/openhab/dsl/items/timed_command.rb

@@ -173,7 +173,7 @@ module OpenHAB
             def execute(_mod = nil, inputs = nil)
               OpenHAB::DSL.import_presets
               @semaphore.synchronize do
-                thread_local(@thread_locals) do
+                thread_local(**@thread_locals) do
                   logger.trace "Canceling implicit timer #{@timed_command_details.timer} for "\
                                "#{@timed_command_details.item.id}  because received event #{inputs}"
                   @timed_command_details.timer.cancel

data/lib/openhab/dsl/rules/rule_config.rb

@@ -8,7 +8,6 @@ require_relative 'guard'
 require_relative 'rule_triggers'
 require 'openhab/core/entity_lookup'
 require 'openhab/dsl/between'
-require 'openhab/dsl/dsl'
 require 'openhab/dsl/timers'
 
 module OpenHAB

data/lib/openhab/dsl/rules/triggers/conditions/duration.rb

@@ -35,6 +35,7 @@ module OpenHAB
               from = Conditions::Proc.from_value(from)
               @conditions = Conditions::Proc.new(to: to, from: from)
               @duration = duration
+              @timer = nil
               logger.trace "Created Duration Condition To(#{to}) From(#{from}) "\
                            "Conditions(#{@conditions}) Duration(#{@duration})"
             end

data/lib/openhab/dsl/rules/triggers/conditions/proc.rb

@@ -20,9 +20,6 @@ module OpenHAB
           class Proc
             include OpenHAB::Log
 
-            # Proc that doesn't check any fields
-            ANY = Proc.new.freeze
-
             #
             # Converts supplied ranges to procs that check range
             # @param [Array] ranges objects to convert to range proc if they are ranges
@@ -83,6 +80,9 @@ module OpenHAB
               @command = command
             end
 
+            # Proc that doesn't check any fields
+            ANY = Proc.new.freeze # this needs to be defined _after_ initialize so its instance variables are set
+
             #
             # Process rule
             # @param [Hash] inputs inputs from trigger

data/lib/openhab/dsl/timers/timer.rb

@@ -82,7 +82,7 @@ module OpenHAB
           OpenHAB::DSL.import_presets
           semaphore.synchronize do
             Timers.timer_manager.delete(self)
-            thread_local(@thread_locals) do
+            thread_local(**@thread_locals) do
               yield(self)
             end
           end

data/lib/openhab/log/logger.rb

@@ -212,7 +212,7 @@ module OpenHAB
               .then { |klass| java_klass(klass) }
               .then(&:name)
               .then { |name| filter_base_classes(name) }
-              .then { |name| name&.prepend('.') }
+              .then { |name| ".#{name}" unless name.nil? } # name is frozen in jruby 9.4
       end
 
       # Get the appropriate java class for the supplied klass if the supplied

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.42.0
+  version: 4.43.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler