rspec-openhab-scripting 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c81621c9a862e81d978ad293b6c3855e802c6f178484e10261a1c50033e152
-  data.tar.gz: 1dd7de9a0358d08e5006e208870af61f9d9c7b777e20cccccfb946b131b577bd
+  metadata.gz: 116f3664ed9d88e87a4030cf7006dc82c3c517b7b6f54b2611989f5aa48f7988
+  data.tar.gz: d257ff1821dad6bca67eaa1cb848d3cc55b1a05f7cb02d5f20e9e34d2b2c3c17
 SHA512:
-  metadata.gz: af8b2b36147936afff2729ce7050e2779910547cc91dc7e6463bf9fd8653b019f9db23b08cbfb526157dd46f02cff7b49defdb17de6aafa4e39c553d12dd551c
-  data.tar.gz: 2672ed326d2c88e5a10cd3144524383da703d48e16e79eda5c44ac7a9eaf6045e5266405458855fa124a5043a0ed14e2fc5a39f31f45a2202bd7877b0bee2906
+  metadata.gz: c29fdc081461392dcad67246de4b784c012c0963d971acc1ca4f2c4f78e9229698ef36c7c1946c1b14e290b7bf11c77977f4d20a0e39b41fa950b3e2609663b6
+  data.tar.gz: 859f14916f43496a242adf17896a2d8bb5cd46027d101c5e3da70ebc215fba5bcecf9f71d0dd4eb41b9022e8879d427af3cbb4624a909af33864f5011ccdaeee

data/lib/rspec/openhab/helpers.rb

@@ -145,10 +145,11 @@ module RSpec
       end
 
       def load_rules
-        automation_path = "#{org.openhab.core.OpenHAB.config_folder}/automation/jsr223/ruby/personal"
+        automation_path = "#{org.openhab.core.OpenHAB.config_folder}/automation/jsr223"
 
         RSpec::OpenHAB::SuspendRules.suspend_rules do
-          Dir["#{automation_path}/*.rb"].each do |f|
+          files = Dir["#{automation_path}/**/*.rb"]
+          files.sort_by { |f| [get_start_level(f), f] }.each do |f|
             load f
           rescue Exception => e
             warn "Failed loading #{f}: #{e.inspect}"
@@ -184,6 +185,12 @@ module RSpec
         jrubyscripting_config&.get("rubylib") || "#{org.openhab.core.OpenHAB.config_folder}/automation/lib/ruby"
       end
 
+      def get_start_level(file)
+        return ($1 || $2).to_i if file =~ %r{/sl(\d{2})/[^/]+$|\.sl(\d{2})\.[^/.]+$}
+
+        50
+      end
+
       EMACS_MODELINE_REGEXP = /# -\*-(.+)-\*-/.freeze
 
       def parse_emacs_modeline(line)

data/lib/rspec/openhab/hooks.rb

@@ -35,6 +35,8 @@ module RSpec
         end
 
         config.before do
+          next unless defined?(::OpenHAB::DSL::Items::ItemProvider)
+
           @item_provider = ::OpenHAB::DSL::Items::ItemProvider.send(:new)
           allow(::OpenHAB::DSL::Items::ItemProvider).to receive(:instance).and_return(@item_provider)
         end
@@ -44,7 +46,7 @@ module RSpec
           (::OpenHAB::Core.rule_registry.all.map(&:uid) - @known_rules).each do |uid|
             ::OpenHAB::Core.rule_registry.remove(uid)
           end
-          $ir.remove_provider(@item_provider) if @item_provider
+          $ir.remove_provider(@item_provider) if instance_variable_defined?(:@item_provider) && @item_provider
           ::OpenHAB::DSL::Timers.timer_manager.cancel_all
           Timecop.return
           restore_autoupdate_items

data/lib/rspec/openhab/karaf.rb

@@ -705,6 +705,18 @@ module RSpec
       # workaround for https://github.com/openhab/openhab-core/pull/3092
       def reset_start_level_service
         sls = ::OpenHAB::Core::OSGI.service("org.openhab.core.service.StartLevelService")
+
+        unless sls
+          # try a different (hacky!) way to get it, since in OpenHAB 3.2.0 it's not exposed as a service
+          scr = ::OpenHAB::Core::OSGI.service("org.osgi.service.component.runtime.ServiceComponentRuntime")
+          scr.class.field_reader :componentRegistry
+          cr = scr.componentRegistry
+
+          oh_core_bundle = org.osgi.framework.FrameworkUtil.get_bundle(org.openhab.core.OpenHAB)
+          ch = cr.get_component_holder(oh_core_bundle, "org.openhab.core.service.StartLevelService")
+          sls = ch&.components&.first&.component_instance&.instance
+        end
+
         # no SLS yet? then we couldn't have hit the bug
         return unless sls
 

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "1.0.3"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,184 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-  name: faraday
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-  name: net-http-persistent
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
+  name: openhab-scripting
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.42'
-  name: openhab-scripting
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.42'
 - !ruby/object:Gem::Dependency
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
-  name: rspec-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
 - !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  name: timecop
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-  name: irb
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
 - !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
-  name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
 - !ruby/object:Gem::Dependency
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-  name: rubocop-performance
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-  name: rubocop-rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-  name: rubocop-rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-description:
+description: 
 email: cody@cutrer.us'
 executables: []
 extensions: []
@@ -210,7 +210,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -225,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Library testing OpenHAB ruby rules with rspec.
 test_files: []