rspec-openhab-scripting 0.0.7-java → 0.0.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76dfb6fa24e9d5efd4f0857cde57ae0c299f7ff5b6c16d08981fe04aa5ab3f52
-  data.tar.gz: b587bf33488da0f9a095eba35997ae4e615b6f8729ed11e1f8c514d1a195e7e1
+  metadata.gz: 5b4f4a385d3672410faee3ca6a90eb931f4499060de30d5dfc11869c73b78db7
+  data.tar.gz: 2d6c73ceabd6796134434250824ee255f80cc74b98b16f4172ac76d6be350c5b
 SHA512:
-  metadata.gz: 80961c7142353a5cd237414ed8a854a1ce33ef4fe0a32c758bf3a41921e6a3cf92e811fc635b9c72cc5e2d59cf1eb92710ad0a8cbb6cf6a357400180e8c4ba56
-  data.tar.gz: a3cef22e84c40c6f9780830873a0ac1c548e7076c81df9afe9d8fbe9e9bb30e9c316dc6352d329e1c7d95c0be470ebb319f2a7d2c3668c9b8462b24e7e45ebca
+  metadata.gz: e9153da220c8491f9a8f79bed277646df27b95ed4c17fb0181dcfd8519df0d9443c989ace2f2fe8da3fb39c14e177d7147e7148cffd5a47baa6a121a821ce883
+  data.tar.gz: 70b3fefd8b2df95db3fc553fcb785c48c8e63d3671c0922328bd0937819e7f3b3cc164edb58e3d4fc04da20101297c65868696ebf624b664892b16c86bed22cd

data/lib/rspec/openhab/timer.rb

@@ -3,8 +3,10 @@
 RSpec.configure do |config|
   config.before(:each) do
     OpenHAB::DSL::Timers.timer_manager.cancel_all
+    wait_for_background_tasks
   end
   config.after(:each) do
     OpenHAB::DSL::Timers.timer_manager.cancel_all
+    wait_for_background_tasks
   end
 end

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/rspec/openhab/wait.rb

@@ -4,14 +4,75 @@ module RSpec
   module OpenHAB
     module Wait
       def wait_for_rules
+        wait_for_background_tasks(timers: false)
+      end
+
+      def wait_for_timers
+        wait_for_background_tasks(rules: false)
+      end
+
+      def wait_for_background_tasks(rules: true, timers: true)
         loop do
-          sleep(0.1)
-          break if java.lang.Thread.all_stack_traces.keys.all? do |t|
-                     !t.name.match?(/^OH-rule-/) ||
-                     [java.lang.Thread::State::WAITING, java.lang.Thread::State::TIMED_WAITING].include?(t.state)
-                   end
+          sleep 0.1
+          next if java.lang.Thread.all_stack_traces.any? do |(t, stack)|
+            # this is just an estimate. I see 9 when it's parked waiting
+            # for an event, but once it hits ruby it gets real big real quick
+            min_frames = 15
+
+            case t.name
+            when /^OH-scheduler-/
+              # timer thread; born and die for each timer
+              if thread_running?(t) || stack.length > min_frames
+                logger.debug "thread #{t.name} is running (#{stack.length})"
+                stack.each do |frame|
+                  logger.trace "  #{frame}"
+                end
+                next timers
+              end
+            when /^OH-rule-/
+
+              if thread_running?(t) || stack.length > min_frames
+                logger.debug "thread #{t.name} is running (#{stack.length})"
+                stack.each do |frame|
+                  logger.trace "  #{frame}"
+                end
+
+                next rules
+              end
+            when /^OH-(?:eventwatcher|eventexecutor)-/
+              # an event is making its way through the system
+              if thread_running?(t)
+                logger.debug "thread #{t.name} is running"
+                next rules
+              end
+            end
+          end
+
+          # no need to retry if there were no timers
+          break unless timers && wait_for_next_timer
         end
       end
+
+      private
+
+      def thread_running?(thread)
+        ![java.lang.Thread::State::WAITING,
+          java.lang.Thread::State::TIMED_WAITING].include?(thread.state)
+      end
+
+      def wait_for_next_timer
+        latest = ::OpenHAB::DSL::Timers.timer_manager.instance_variable_get(:@timers).min_by(&:execution_time)
+        return false unless latest
+
+        delta = (latest.execution_time.to_instant.to_epoch_milli - java.time.Instant.now.to_epoch_milli) / 1000.0
+        # in the past? it's probably executing
+        return true if delta.negative?
+
+        logger.info("Waiting #{delta}s for next timer") if delta > 5
+
+        sleep(delta)
+        true
+      end
     end
   end
 end

data/lib/rspec-openhab-scripting.rb

@@ -70,10 +70,11 @@ require "rspec/openhab/core/cron_scheduler"
 # RSpec additions
 require "rspec/core"
 require "rspec/openhab/dsl/rules/rspec"
+require "rspec/openhab/items"
 require "rspec/openhab/state"
+require "rspec/openhab/timer"
 require "rspec/openhab/trigger"
 require "rspec/openhab/wait"
-require "rspec/openhab/items"
 
 RSpec::OpenHAB::Items.populate_items_from_api(api)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: java
 authors:
 - Cody Cutrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement