rspec-openhab-scripting 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '081cb83fa410165a1c537444929816faae13f6a7b6b55b003fef54035eedb57c'
-  data.tar.gz: 93befbd99da2d87f0e251f919f541e7982cb438a559f305ce0113ea8afb6e9ea
+  metadata.gz: 88c81621c9a862e81d978ad293b6c3855e802c6f178484e10261a1c50033e152
+  data.tar.gz: 1dd7de9a0358d08e5006e208870af61f9d9c7b777e20cccccfb946b131b577bd
 SHA512:
-  metadata.gz: 0e254f2f46b7fef68311e8c695d60a36e1986813edac3cdc61e232b7acdc69d25fc437fde7ef344e13d7a38306683d1a965442c73a360a73ac491b20b59ba35e
-  data.tar.gz: 2ef07f698950dfc5b877566f4656c4cf7f3be4f05626b59c9740e362e132bb34d2ad6df613ce91fe366a8f834f78fea92a2e3f0cd808b161def17970f11a6d4d
+  metadata.gz: af8b2b36147936afff2729ce7050e2779910547cc91dc7e6463bf9fd8653b019f9db23b08cbfb526157dd46f02cff7b49defdb17de6aafa4e39c553d12dd551c
+  data.tar.gz: 2672ed326d2c88e5a10cd3144524383da703d48e16e79eda5c44ac7a9eaf6045e5266405458855fa124a5043a0ed14e2fc5a39f31f45a2202bd7877b0bee2906

data/lib/rspec/openhab/helpers.rb

@@ -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

@@ -326,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,
@@ -545,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)
@@ -696,7 +696,7 @@ 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)
@@ -705,6 +705,9 @@ 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")
+        # 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
@@ -732,6 +735,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>
@@ -757,6 +767,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.1"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,184 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 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'
-  type: :runtime
+  name: faraday
   prerelease: false
+  type: :runtime
   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'
-  type: :runtime
+  name: net-http-persistent
   prerelease: false
+  type: :runtime
   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'
-  type: :runtime
+  name: openhab-scripting
   prerelease: false
+  type: :runtime
   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'
-  type: :runtime
+  name: rspec-core
   prerelease: false
+  type: :runtime
   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'
-  type: :runtime
+  name: timecop
   prerelease: false
+  type: :runtime
   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'
-  type: :development
+  name: irb
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rubocop-performance
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rubocop-rake
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rubocop-rspec
   prerelease: false
+  type: :development
   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.3.7
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: Library testing OpenHAB ruby rules with rspec.
 test_files: []