rspec-openhab-scripting 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9f1f804d263fe2179ef5680704f14bc2ba476dc4525f014329aa30ea6e01d0
-  data.tar.gz: 924e7e3a2cc0f2578ff526d21a9a4050e216c7555004ebf21a7a76eca62a5e9c
+  metadata.gz: '081cb83fa410165a1c537444929816faae13f6a7b6b55b003fef54035eedb57c'
+  data.tar.gz: 93befbd99da2d87f0e251f919f541e7982cb438a559f305ce0113ea8afb6e9ea
 SHA512:
-  metadata.gz: 292ebc4f0386a670ee9b02528e13880e9c9801c397ada5bc83cc9193ff5728f056a27b6b780f6b5b8b789970da03fec6fa63fe6bc3420140ceaedba06f909e9e
-  data.tar.gz: b8c0d8e5619c50499189bfc1b85fa496d76549c03bbb23cae531e61afbac87a16b9f2d37cf4b6cb5518a55a5557570a248a0525ad4be66a84bcdb84a03b96bbf
+  metadata.gz: 0e254f2f46b7fef68311e8c695d60a36e1986813edac3cdc61e232b7acdc69d25fc437fde7ef344e13d7a38306683d1a965442c73a360a73ac491b20b59ba35e
+  data.tar.gz: 2ef07f698950dfc5b877566f4656c4cf7f3be4f05626b59c9740e362e132bb34d2ad6df613ce91fe366a8f834f78fea92a2e3f0cd808b161def17970f11a6d4d

data/lib/rspec/openhab/helpers.rb

@@ -165,7 +165,7 @@ module RSpec
 
           filename.slice!(0..transform_path.length)
           dir = File.dirname(filename)
-          modules = dir == "." ? [] : moduleize(dir)
+          modules = (dir == ".") ? [] : moduleize(dir)
           basename = File.basename(filename)
           method = basename[0...-7]
           modules << method

data/lib/rspec/openhab/karaf.rb

@@ -233,6 +233,22 @@ module RSpec
             field.set(fs, OpenHAB::Core::Mocks::BundleInstallSupport.new(fs.installSupport, self))
           end
           wait_for_service("org.osgi.service.cm.ConfigurationAdmin") do |ca|
+            # register a listener, so that we can know if the Start Level Service is busted
+            bundle = org.osgi.framework.FrameworkUtil.get_bundle(ca.class)
+            listener = org.osgi.service.cm.ConfigurationListener.impl do |_method, event|
+              next unless event.type == org.osgi.service.cm.ConfigurationEvent::CM_UPDATED
+              next unless event.pid == "org.openhab.startlevel"
+
+              # have to wait for the StartLevelService itself to process this event
+              Thread.new do
+                sleep 1
+                reset_start_level_service
+              end
+            end
+            bundle.bundle_context.register_service(org.osgi.service.cm.ConfigurationListener.java_class,
+                                                   listener,
+                                                   nil)
+
             cfg = ca.get_configuration("org.openhab.addons", nil)
             props = cfg.properties || java.util.Hashtable.new
             # remove all non-binding addons
@@ -686,6 +702,26 @@ module RSpec
         java.lang.System.set_property("openhab.servicecfg", target_file)
       end
 
+      # 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")
+        rs = ::OpenHAB::Core::OSGI.service("org.openhab.core.service.ReadyService")
+        sls.class.field_reader :trackers, :markers
+        rs.class.field_reader :trackers
+        return unless sls.markers.empty?
+        # SLS thinks it has trackers that RS doesn't?! Yeah, we hit the bug
+        return if (sls.trackers.values - rs.trackers.keys).empty?
+
+        ca = ::OpenHAB::Core::OSGI.service("org.osgi.service.cm.ConfigurationAdmin")
+        cfg = ca.get_configuration("org.openhab.startlevel", nil)
+        props = cfg.properties
+        config = props.keys.to_h { |k| [k, props.get(k)] }
+        m = sls.class.java_class.get_declared_method("modified", java.util.Map)
+        m.accessible = true
+        sls.trackers.clear
+        m.invoke(sls, config)
+      end
+
       def minimize_installed_features
         # cuts down openhab-runtime-base significantly, makes sure
         # openhab-runtime-ui doesn't get installed (from profile.cfg),

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,184 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-23 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: []