rspec-openhab-scripting 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc03fc7377be69a2c03c83d60bbc9faab0e6fc343dde9876b9acbb3b6320826d
-  data.tar.gz: b509c499d267a18e4adbeffb1f744a57b2b81ca027f97300b712f3f71f4119ff
+  metadata.gz: 14c2866f832e36d59f6e3fda3c6c3b05b78a07ea1f14ad2d2dbfb237dd20951f
+  data.tar.gz: 5e294c19788f5ff79b2ab0de597a1cef68f0a36cf1181b407beffae9ecbb1b64
 SHA512:
-  metadata.gz: 6f623a8485f6d2e0f85e265855167f1b3818a1060bb2528dd8f7045327f375f54bd89e392beec84807b47ac825c861f46282605e0d8e0b30e97d159be2df75a5
-  data.tar.gz: 2b8d9371d764fea96ebb401f1f389abce1bae4e04c33ba31c2927d00b1b2f12df99d0dc6020972d3a5c27d2935ff47c700a5554c0985877ae73234696d0c169d
+  metadata.gz: 0db3ac4f2f9bf4b0a77a8d97bd9f6c0c96592f1c62002a55801ce63c9ae0bf294eeed974d978e2d8ef80f4af7b7aa51876ad693b044057bc078096714e21164f
+  data.tar.gz: 5fa61081ef0e73146cab8225a6d5717579b6f0fb12fc86df716aa2fa215435bd84fcc07270fdb167005bfd54130e7026f0e535d0a3ce7a3d38e039940f661ba9

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/karaf.rb

@@ -705,6 +705,21 @@ 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
+
         rs = ::OpenHAB::Core::OSGI.service("org.openhab.core.service.ReadyService")
         sls.class.field_reader :trackers, :markers
         rs.class.field_reader :trackers

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,184 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 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: []