rspec-openhab-scripting 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9f1f804d263fe2179ef5680704f14bc2ba476dc4525f014329aa30ea6e01d0
-  data.tar.gz: 924e7e3a2cc0f2578ff526d21a9a4050e216c7555004ebf21a7a76eca62a5e9c
+  metadata.gz: dc03fc7377be69a2c03c83d60bbc9faab0e6fc343dde9876b9acbb3b6320826d
+  data.tar.gz: b509c499d267a18e4adbeffb1f744a57b2b81ca027f97300b712f3f71f4119ff
 SHA512:
-  metadata.gz: 292ebc4f0386a670ee9b02528e13880e9c9801c397ada5bc83cc9193ff5728f056a27b6b780f6b5b8b789970da03fec6fa63fe6bc3420140ceaedba06f909e9e
-  data.tar.gz: b8c0d8e5619c50499189bfc1b85fa496d76549c03bbb23cae531e61afbac87a16b9f2d37cf4b6cb5518a55a5557570a248a0525ad4be66a84bcdb84a03b96bbf
+  metadata.gz: 6f623a8485f6d2e0f85e265855167f1b3818a1060bb2528dd8f7045327f375f54bd89e392beec84807b47ac825c861f46282605e0d8e0b30e97d159be2df75a5
+  data.tar.gz: 2b8d9371d764fea96ebb401f1f389abce1bae4e04c33ba31c2927d00b1b2f12df99d0dc6020972d3a5c27d2935ff47c700a5554c0985877ae73234696d0c169d

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
@@ -217,8 +217,15 @@ module RSpec
           next unless metadata.uid.namespace == "autoupdate"
 
           to_add << metadata
+
+          # 3.2.0 can't remove single namespaces from the GenericMetadataProvider, so
+          # we have to remove everything from the item
+          unless gmp.respond_to?(:remove_metadata_by_namespace)
+            to_add.concat(gmp.all.select { |m2| m2.uid.item_name == metadata.uid.item_name })
+            gmp.remove_metadata(metadata.uid.item_name)
+          end
         end
-        gmp.remove_metadata_by_namespace("autoupdate")
+        gmp.remove_metadata_by_namespace("autoupdate") if gmp.respond_to?(:remove_metadata_by_namespace)
 
         to_add.each do |m|
           if mmp.get(m.uid)

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
@@ -310,7 +326,6 @@ module RSpec
           org.openhab.core.thing.internal.console.FirmwareUpdateConsoleCommandExtension
         ],
         # the following bundles are blocked completely from starting
-        "org.apache.felix.fileinstall" => nil,
         "org.apache.karaf.http.core" => nil,
         "org.apache.karaf.features.command" => nil,
         "org.apache.karaf.shell.commands" => nil,
@@ -529,15 +544,16 @@ module RSpec
       # import global variables and constants that openhab-scripting gem expects,
       # since we're going to be running it in this same VM
       def set_jruby_script_presets
-        wait_for_service("org.openhab.core.automation.module.script.internal.ScriptExtensionManager") do |sem|
+        wait_for_service("org.openhab.core.automation.module.script.ScriptEngineFactory",
+                         filter: "(service.config.description.uri=automation:jruby)") do |jrubyscripting|
+          # "org.openhab.core.automation.module.script.internal.ScriptExtensionManager") do |sem|
+          sem = ::OpenHAB::Core::OSGI.service(
+            "org.openhab.core.automation.module.script.internal.ScriptExtensionManager"
+          )
           # since we're not created by the ScriptEngineManager, this never gets set; manually set it
           $se = $scriptExtension = ScriptExtensionManagerWrapper.new(sem)
           scope_values = sem.find_default_presets("rspec")
           scope_values = scope_values.entry_set
-          jrubyscripting = ::OpenHAB::Core::OSGI.services(
-            "org.openhab.core.automation.module.script.ScriptEngineFactory",
-            filter: "(service.pid=org.openhab.automation.jrubyscripting)"
-          ).first
 
           %w[mapInstancePresets mapGlobalPresets].each do |method_name|
             method = jrubyscripting.class.java_class.get_declared_method(method_name, java.util.Map::Entry.java_class)
@@ -680,12 +696,32 @@ module RSpec
         startlevels = File.read(config_file)
         startlevels.sub!(",rules:refresh,rules:dslprovider", "")
 
-        target_file = "#{oh_userdata}/etc/services.cfg"
+        target_file = "#{oh_userdata}/services.cfg"
         target_file_contents = File.read(target_file) if File.exist?(target_file)
         File.write(target_file, startlevels) unless target_file_contents == startlevels
         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),
@@ -696,6 +732,13 @@ module RSpec
         File.write("#{oh_userdata}/etc/org.apache.karaf.features.xml", <<~XML)
           <?xml version="1.0" encoding="UTF-8"?>
           <featuresProcessing xmlns="http://karaf.apache.org/xmlns/features-processing/v1.0.0" xmlns:f="http://karaf.apache.org/xmlns/features/v1.6.0">
+              <!-- From OpenHAB 3.2.0 -->
+              <bundleReplacements>
+                <bundle originalUri="mvn:org.ops4j.pax.logging/pax-logging-api/[0,2.0.13)" replacement="mvn:org.ops4j.pax.logging/pax-logging-api/2.0.13" mode="maven" />
+                <bundle originalUri="mvn:org.ops4j.pax.logging/pax-logging-log4j2/[0,2.0.13)" replacement="mvn:org.ops4j.pax.logging/pax-logging-log4j2/2.0.13" mode="maven" />
+                <bundle originalUri="mvn:org.ops4j.pax.logging/pax-logging-logback/[0,2.0.13)" replacement="mvn:org.ops4j.pax.logging/pax-logging-logback/2.0.13" mode="maven" />
+              </bundleReplacements>
+
               <blacklistedFeatures>
                 <feature>openhab-runtime-ui</feature>
                 <feature>openhab-core-ui*</feature>
@@ -721,6 +764,7 @@ module RSpec
                     <f:feature>openhab-core-storage-json</f:feature>
                     <f:feature>openhab-automation-jrubyscripting</f:feature>
                     <f:feature>openhab-transport-http</f:feature>
+                    <f:feature prerequisite="true">wrapper</f:feature>
                     <f:bundle>mvn:org.openhab.core.bundles/org.openhab.core.karaf/#{version}</f:bundle>
                   </feature>
                 </replacement>

data/lib/rspec/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Cody Cutrer
 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
   requirement: !ruby/object:Gem::Requirement