openhab-scripting 5.48.0 → 5.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd253fc1f0f462a281d219b0a102bb6f929e4fc9ae1555c60b8611e2e212487
-  data.tar.gz: fc0e411cf1a935d87999ceaaf3750d9ef8d6deee6ebd642c751cd2d1d5085054
+  metadata.gz: 7cd17ad8e229eaed4db0be72e682f771612f10c59a1fed7612dae537eb5df073
+  data.tar.gz: a10d086518f1069b0f283f3ba680572f55ce4e5ef372397dde455259330b27ae
 SHA512:
-  metadata.gz: 922a3b755a5258e853e4b3285d67f975d14acc03760adb9f3b66503068053dfa78377a83d60c366f43bac36784df03ff646794905a57883b9b1052b131486f2e
-  data.tar.gz: b59b65d06610d7acaa9724b84993ade4464d000d0efe3490b6caf1a4aaaac4082540dfc9a8f5238ab44da85118af8b4e424ce8abb91fd69670070c4c54bd38fd
+  metadata.gz: ffd401dad6cd239b69f6c28c394d87fbfc9bbe557f3f080520ff579034170dfaabd84f9fc883d53a1b4c2a97bdffa767964a1526010764c7b28bac427cbc3d0a
+  data.tar.gz: d8e684891946c9b0fa67ff1b29f0a4ceabc1d1173611ff904993cf39589bc89aad7b882d647bf1eda1045d7f37210d5dc56ea04023bbc4d7638cf2f016f4c1e5

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.48.0"
+    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.48.0
+  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.11
+rubygems_version: 4.0.15
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []