rspec-openhab-scripting 0.0.11-java → 0.0.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ef6a42e87b4466cf53972b65523d3a810060cbeac84497796ab4514b377d445
-  data.tar.gz: 0b3be611dddf1a4e5643cdb48fd3f8a05d35eda32e50e9b4062a063f49f6ad17
+  metadata.gz: 0b18cd9bfb33b5ddab9ba78ef3e83f9b5572aebc17ade365599bc9fae9ebd9bc
+  data.tar.gz: fab8152b3c09bcb23ae2af7ce6fb5a8380d97190ce7a3153e156d26d3c405d8e
 SHA512:
-  metadata.gz: 0ffaf54c3e64d9a4f1be5ff0ecec757976db0e5ebbddec2d916d254fb9f9f730f3e1e1245fc478a970e8e42509613877ac535f9983aa94288cbb9c1f7abfa826
-  data.tar.gz: 3333117270aa1e6b2de597ad9570df51a9f829d0c5da345cdbb1aed5f50d5bf841cdd1b9a140a94cf06695982acce024280ec814f4cbe5b46ab94dce88566b40
+  metadata.gz: 1cf4905df6306b1a85db73ea49d164d245ce1510c76934bbf74d33e8941227a158ea3bf009b80fb9a2db726a8bf1d5dfd6b2948acc9f622096f39873464b2718
+  data.tar.gz: ffd0784c0995bac8a2188d6a8d5f7617422f441237affc07dc81782a89a54bd14f0de5709946b976fe9fa690a23b1ed8d35ffcb0b77a9d9a13661c5b89e8556e

data/lib/rspec/openhab/api.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "faraday_middleware"
+require "faraday"
 
 module OpenHAB
   class API
     def initialize(url)
       @faraday = Faraday.new(url) do |f|
-        f.request :retry
         f.response :raise_error
         f.response :json
-        f.adapter :net_http_persistent
         f.path_prefix = "/rest/"
       end
     end

data/lib/rspec/openhab/dsl/rules/triggers/watch.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module DSL
+    module Rules
+      module Triggers
+        def watch(path, glob: "*", for: %i[created deleted modified], attach: nil); end
+      end
+    end
+  end
+end

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

@@ -45,7 +45,7 @@ module OpenHAB
         raise "Timer already cancelled" if cancelled?
         raise "Timer already executed" if terminated?
 
-        @block.call
+        @block.call(self)
         Timers.timer_manager.delete(self)
         @executed = true
       end

data/lib/rspec/openhab/helpers.rb

@@ -11,7 +11,7 @@ module RSpec
       end
 
       def execute_timers
-        OpenHAB::DSL::Timers.timer_manager.execute_timers
+        ::OpenHAB::DSL::Timers.timer_manager.execute_timers
       end
 
       def suspend_rules(&block)

data/lib/rspec/openhab/hooks.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  config.before(:all) { OpenHAB::DSL::Timers.timer_manager.cancel_all }
-
   config.before do
     suspend_rules do
       $ir.for_each do |_provider, item|
+        next if item.is_a?(GroupItem) # groups only have calculated states
+
         item.state = NULL unless item.raw_state == NULL
       end
     end

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.11"
+    VERSION = "0.0.14"
   end
 end

data/lib/rspec-openhab-scripting.rb

@@ -75,10 +75,10 @@ require "rspec/openhab/core/cron_scheduler"
 
 # override several timer methods
 require_relative "rspec/openhab/dsl/timers/timer"
+require_relative "rspec/openhab/dsl/rules/triggers/watch"
 
 # RSpec additions
 require "rspec/core"
-require "rspec/openhab/dsl/rules/rspec"
 require "rspec/openhab/items"
 require "rspec/openhab/helpers"
 require "rspec/openhab/hooks"
@@ -102,9 +102,11 @@ end
 # load rules files
 OPENHAB_AUTOMATION_PATH = "#{org.openhab.core.OpenHAB.config_folder}/automation/jsr223/ruby/personal"
 
-Dir["#{OPENHAB_AUTOMATION_PATH}/*.rb"].each do |f|
-  load f
-rescue Exception => e
-  warn "Failed loading #{f}: #{e.inspect}"
-  warn e.backtrace
+RSpec::OpenHAB::SuspendRules.suspend_rules do
+  Dir["#{OPENHAB_AUTOMATION_PATH}/*.rb"].each do |f|
+    load f
+  rescue Exception => e
+    warn "Failed loading #{f}: #{e.inspect}"
+    warn e.backtrace
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.14
 platform: java
 authors:
 - Cody Cutrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  name: faraday_middleware
+        version: '2.3'
+  name: faraday
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -195,7 +195,7 @@ files:
 - lib/rspec/openhab/core/osgi.rb
 - lib/rspec/openhab/core/script_handling.rb
 - lib/rspec/openhab/dsl/imports.rb
-- lib/rspec/openhab/dsl/rules/rspec.rb
+- lib/rspec/openhab/dsl/rules/triggers/watch.rb
 - lib/rspec/openhab/dsl/timers/timer.rb
 - lib/rspec/openhab/helpers.rb
 - lib/rspec/openhab/hooks.rb

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

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module OpenHAB
-  module DSL
-    module Rules
-      class RuleConfig
-        # override on_start to never work
-        def on_start?
-          false
-        end
-      end
-    end
-  end
-end