openhab-scripting 5.47.5 → 5.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22421ade202e53be08b9511bcacdeb16b8242587999d8b9a017f928748318cd
-  data.tar.gz: 6c4e7e8d938b2c6c62c41a8bb1baf5b10470f73fe371f0e2130fc09bf1c09124
+  metadata.gz: 7cd17ad8e229eaed4db0be72e682f771612f10c59a1fed7612dae537eb5df073
+  data.tar.gz: a10d086518f1069b0f283f3ba680572f55ce4e5ef372397dde455259330b27ae
 SHA512:
-  metadata.gz: d338d71faf5eb7adf46c4b787a3202bcf33c5705541727b40d669331e3d85266464681842439e9a5f1fa79f4b5bd1b527b549c2a266f06b7f90ec8ac31a57a9c
-  data.tar.gz: 34bd14d2816fc2350fbce61f65d891d10b098f0014d09f113ec0ee85347bfed2ec35255fd836d6894db0b1d283315d5da75d74a1e4bb0f4d4ddcdaffd61b84dc
+  metadata.gz: ffd401dad6cd239b69f6c28c394d87fbfc9bbe557f3f080520ff579034170dfaabd84f9fc883d53a1b4c2a97bdffa767964a1526010764c7b28bac427cbc3d0a
+  data.tar.gz: d8e684891946c9b0fa67ff1b29f0a4ceabc1d1173611ff904993cf39589bc89aad7b882d647bf1eda1045d7f37210d5dc56ea04023bbc4d7638cf2f016f4c1e5

data/lib/openhab/core/actions/notification.rb

@@ -15,7 +15,8 @@ module OpenHAB
           # openHAB Cloud Notification Action}.
           #
           # @param msg [String] The message to send.
-          # @param email [String, nil] The email address to send to. If `nil`, the message will be broadcasted.
+          # @param email [String, <String>, nil] The email address(es) to send to. If `nil`, the message will be
+          #   broadcast.
           # @param icon [String, Symbol, nil] The icon name
           #   (as described in {https://www.openhab.org/docs/configuration/items.html#icons Items}).
           # @param tag [String, Symbol, nil] a name to group the type or severity of the notification.
@@ -83,7 +84,21 @@ module OpenHAB
             end
 
             args = []
-            if email
+            if email.is_a?(Enumerable)
+              email.each do |e|
+                send(msg,
+                     email: e,
+                     icon:,
+                     tag:,
+                     severity:,
+                     id:,
+                     title:,
+                     on_click:,
+                     attachment:,
+                     buttons:)
+              end
+              return
+            elsif email
               args.push(:send_notification, email)
             else
               args.push(:send_broadcast_notification)
@@ -116,7 +131,7 @@ module OpenHAB
           # - Notifications matching the `id` will be hidden, and
           # - Notifications matching the `tag` will be hidden, independently from the given tag.
           #
-          # @param email [String, nil] The email address to hide notifications for.
+          # @param email [String, <String>, nil] The email address(es) to hide notifications for.
           #   If nil, hide broadcast notifications.
           # @param id [String, nil] hide notifications associated with the given reference ID.
           # @param tag [String, nil] hide notifications associated with the given tag.
@@ -130,7 +145,12 @@ module OpenHAB
             raise ArgumentError, "Either id or tag must be provided." unless id || tag
 
             args = []
-            if email
+            if email.is_a?(Enumerable)
+              email.each do |e|
+                hide(email: e, id:, tag:)
+              end
+              return
+            elsif email
               args.push(email)
               notification = :notification
             else

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

@@ -897,6 +897,7 @@ module OpenHAB
         # @param [String, Core::Things::Channel, Core::Things::ChannelUID] channels
         #   channels to create triggers for in form of 'binding_id:type_id:thing_id#channel_id'
         #   or 'channel_id' if thing is provided.
+        #   A string that contains `*` and `?` wildcards are supported since openHAB 5.2.
         # @param [String, Core::Things::Thing, Core::Things::ThingUID] thing
         #   Thing(s) to create trigger for if not specified with the channel.
         # @param [String, Array<String>] triggered

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.47.5"
+    VERSION = "5.49.0"
   end
 end

data/lib/openhab/rspec/helpers.rb

@@ -257,6 +257,13 @@ module OpenHAB
           rs.register_tracker(org.openhab.core.service.ReadyService::ReadyTracker.impl { continue.call }, filter)
         end
 
+        # openHAB 5.2.0.M5+ can leave RuleEngineImpl.started false in the rspec
+        # harness even after the rule-engine startlevel marker is reached.
+        # Force it on so RuleEngineImpl.runRule won't drop triggered events.
+        rule_manager = OSGi.service("org.openhab.core.automation.RuleManager")
+        rule_manager.class.field_accessor :started
+        rule_manager.started = true unless rule_manager.started
+
         begin
           # load storage based type providers
           ast = org.openhab.core.thing.binding.AbstractStorageBasedTypeProvider

data/lib/openhab/rspec/mocks/synchronous_executor.rb

@@ -26,15 +26,18 @@ module OpenHAB
         end
 
         def submit(runnable)
-          return super unless Thread.current == main_thread
-
-          runnable.respond_to?(:run) ? runnable.run : runnable.call
+          if OpenHAB::Core.version < "5.1.0" # @deprecated OH5.1 remove the version guard
+            return super unless Thread.current == main_thread # rubocop:disable Style/SoleNestedConditional
+          end
 
-          java.util.concurrent.CompletableFuture.completed_future(nil)
+          value = runnable.respond_to?(:run) ? runnable.run : runnable.call
+          java.util.concurrent.CompletableFuture.completed_future(value)
         end
 
         def execute(runnable)
-          return super unless Thread.current == main_thread
+          if OpenHAB::Core.version < "5.1.0" # @deprecated OH5.1 remove the version guard
+            return super unless Thread.current == main_thread # rubocop:disable Style/SoleNestedConditional
+          end
 
           runnable.run
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.47.5
+  version: 5.49.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -68,7 +68,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
 email:
 - broconne+github@gmail.com
 - cody@cutrer.us
@@ -360,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.15
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []