rspec-openhab-scripting 0.0.2-java → 0.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb06cd0d4f2eb7710a678cf6b080ae636d81ef9faa4012a755ed8b73117a158a
-  data.tar.gz: 3ed1a44e4cc9802054e6697807e75adafa75e6069647f917b809e20cbdb2e92a
+  metadata.gz: 66ee3ecec1c902dcf931cb3e51a7cacdb4df1e3b0798fa973aabf0147787c72f
+  data.tar.gz: da69d9608f4242545a4e01b0ae22e0133b6a1868b518ad1a95dd5d67bcd94785
 SHA512:
-  metadata.gz: 4ee95923dc2c84ca4253112fcb0d6b351cb14d3a1879dcbcdd5e67dfcf095fdfdd0ab8f3c9d4b617fe2db13393a727f2687194531436c9572857066fcc57a62d
-  data.tar.gz: 05245aa976b20f462002b87c9451b16c9aa1609f145981f259ee1637270e82a9ca295a55fcb15c6bc66a295664e313e0ffb5b280f193e624fc411ccf3138be2d
+  metadata.gz: 5160b3281ea2f567fd040f49cb0acf5b6c1b56ae050711ae049868ec645dc8a38799434c8c51c3c2a2fb806da98b5261b9c1e54119d3fd2c0d2888680cc2b762
+  data.tar.gz: c0ca81a870b864c45ba50d281fa9584421b36d64c48b86048765b32d6d0ab5aa64c92a49a4ddfcc6fa21d9b085b7e5a5baa63c95fcde295b090dd5967996d823

data/lib/rspec/openhab/api.rb

@@ -15,14 +15,21 @@ module OpenHAB
     end
 
     def version
-      body = @faraday.get.body
-      version = body.dig("runtimeInfo", "version")
-      version = "#{version}-SNAPSHOT" if body.dig("runtimeInfo", "buildString")&.start_with?("Build #")
+      version = root_data.dig("runtimeInfo", "version")
+      version = "#{version}-SNAPSHOT" if root_data.dig("runtimeInfo", "buildString")&.start_with?("Build #")
       version
     end
 
+    def locale
+      root_data["locale"]
+    end
+
+    def measurement_system
+      root_data["measurementSystem"]
+    end
+
     def items
-      @faraday.get("items").body
+      @faraday.get("items", metadata: ".*").body
     end
 
     def item(name)
@@ -30,5 +37,11 @@ module OpenHAB
     rescue Faraday::ResourceNotFound
       nil
     end
+
+    private
+
+    def root_data
+      @root_data ||= @faraday.get.body
+    end
   end
 end

data/lib/rspec/openhab/core/logger.rb

@@ -15,10 +15,37 @@ module OpenHAB
       levels.each { |level| const_set(level, ch.qos.logback.classic.Level.const_get(level)) }
 
       extend Forwardable
-      delegate %i[level level=] => :@sl4fj_logger
+      delegate %i[level] => :@sl4fj_logger
+
+      def level=(level)
+        if level.is_a?(String) || level.is_a?(Symbol)
+          level = ch.qos.logback.classic.Level.const_get(level.to_s.upcase, false)
+        end
+        @sl4fj_logger.level = level
+      end
+    end
+  end
+
+  module Log
+    class << self
+      def root
+        logger(org.slf4j.Logger::ROOT_LOGGER_NAME)
+      end
+
+      def events
+        logger("openhab.event")
+      end
+
+      def logger(object)
+        logger_name = case object
+                      when String then object
+                      else logger_name(object)
+                      end
+        @loggers[logger_name] ||= Core::Logger.new(logger_name)
+      end
     end
   end
 end
 
-root_logger = org.slf4j.LoggerFactory.get_logger(org.slf4j.Logger::ROOT_LOGGER_NAME)
-root_logger.level = OpenHAB::Core::Logger::INFO
+OpenHAB::Log.root.level = :info
+OpenHAB::Log.events.level = :warn

data/lib/rspec/openhab/dsl/imports.rb

@@ -34,8 +34,11 @@ module OpenHAB
       class BundleContext
         include org.osgi.framework.BundleContext
 
+        attr_reader :bundles
+
         def initialize(event_manager)
           @event_manager = event_manager
+          @bundles = []
         end
 
         def register_service(klass, service, _properties)
@@ -46,6 +49,10 @@ module OpenHAB
 
           @event_manager.add_event_subscriber(service)
         end
+
+        def get_service_reference(klass); end
+        def get_service(klass); end
+        def add_bundle_listener(listener); end
       end
 
       # don't depend on org.openhab.core.test
@@ -100,6 +107,17 @@ module OpenHAB
         end
       end
 
+      class ComponentContext
+        include org.osgi.service.component.ComponentContext
+
+        attr_reader :properties, :bundle_context
+
+        def initialize(bundle_context)
+          @properties = java.util.Hashtable.new
+          @bundle_context = bundle_context
+        end
+      end
+
       # subclass to expose private fields
       class EventManager < org.openhab.core.internal.events.OSGiEventManager
         field_reader :typedEventFactories, :typedEventSubscribers
@@ -108,6 +126,8 @@ module OpenHAB
       @imported = false
 
       class << self
+        attr_accessor :api
+
         def import_presets
           return if @imported
 
@@ -127,14 +147,23 @@ module OpenHAB
           at_exit { eh.close }
           ea = EventAdmin.new(eh)
           ep = org.openhab.core.internal.events.OSGiEventPublisher.new(ea)
+          bc = BundleContext.new(em)
+          cc = ComponentContext.new(bc)
+          cc.properties["measurementSystem"] = api.measurement_system if api
 
           # the registries!
+          ss = VolatileStorageService.new
           mr = org.openhab.core.internal.items.MetadataRegistryImpl.new
           OpenHAB::Core::OSGI.register_service("org.openhab.core.items.MetadataRegistry", mr)
+          mr.managed_provider = mmp = org.openhab.core.internal.items.ManagedMetadataProviderImpl.new(ss)
+          mr.add_provider(mmp)
           ir = org.openhab.core.internal.items.ItemRegistryImpl.new(mr)
-          ss = VolatileStorageService.new
           ir.managed_provider = mip = org.openhab.core.items.ManagedItemProvider.new(ss, nil)
           ir.add_provider(mip)
+          ir.event_publisher = ep
+          up = org.openhab.core.internal.i18n.I18nProviderImpl.new(cc)
+          ir.unit_provider = up
+          ir.item_state_converter = org.openhab.core.internal.items.ItemStateConverterImpl.new(up)
           tr = org.openhab.core.thing.internal.ThingRegistryImpl.new
           mtr = org.openhab.core.automation.internal.type.ModuleTypeRegistryImpl.new
           rr = org.openhab.core.automation.internal.RuleRegistryImpl.new
@@ -203,7 +232,6 @@ module OpenHAB
           em.add_event_factory(ief)
 
           # set up the rules engine part 2
-          bc = BundleContext.new(em)
           k = org.openhab.core.automation.internal.module.factory.CoreModuleHandlerFactory
           # depending on OH version, this class is set up differently
           cmhf = begin
@@ -221,7 +249,12 @@ module OpenHAB
           re.add_module_handler_factory(cmhf)
           re.add_module_handler_factory(scmhf)
           re.add_module_handler_factory(spmhf)
-          re.onReadyMarkerAdded(nil)
+          re.on_ready_marker_added(nil)
+
+          # enable event logging
+          el = org.openhab.core.io.monitor.internal.EventLogger.new(rs)
+          em.add_event_subscriber(el)
+          el.on_ready_marker_added(nil)
         end
       end
     end

data/lib/rspec/openhab/dsl/timers/timer.rb

@@ -15,11 +15,8 @@ module OpenHAB
         Timers.timer_manager.add(self)
       end
 
-      def reschedule(duration = nil)
-        duration ||= @duration
-
+      def reschedule(_duration = nil)
         Timers.timer_manager.add(self)
-        reschedule(OpenHAB::DSL.to_zdt(duration))
       end
 
       #
@@ -34,6 +31,10 @@ module OpenHAB
       def terminated?; end
       alias_method :has_terminated, :terminated?
 
+      def is_active # rubocop:disable Naming/PredicateName
+        false
+      end
+
       private
 
       def timer_block

data/lib/rspec/openhab/items.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/GlobalVars
+module RSpec
+  module OpenHAB
+    module Items
+      class << self
+        def populate_items_from_api(api)
+          all_items = api.items
+
+          gfh = org.openhab.core.internal.items.GroupFunctionHelper.new
+
+          all_items.each do |item_json|
+            type, _dimension = item_json["type"].split(":")
+            if type == "Group"
+              if item_json["groupType"]
+                type, _dimension = item_json["groupType"].split(":")
+                klass = ::OpenHAB::DSL::Items.const_get(:"#{type}Item")
+                base_item = klass.new(item_json["name"])
+              end
+              if item_json["function"]
+                dto = org.openhab.core.items.dto.GroupFunctionDTO.new
+                dto.name = item_json.dig("function", "name")
+                dto.params = item_json.dig("function", "params")
+                function = gfh.create_group_function(dto, base_item)
+              end
+              item = GroupItem.new(item_json["name"], base_item, function)
+            else
+              klass = ::OpenHAB::DSL::Items.const_get(:"#{type}Item")
+              item = klass.new(item_json["name"])
+            end
+
+            item.label = item_json["label"]
+            item_json["tags"].each do |tag|
+              item.add_tag(tag)
+            end
+            item_json["metadata"]&.each do |key, config|
+              item.meta[key] = config["value"], config["config"]
+            end
+
+            $ir.add(item)
+          end
+          all_items.each do |item_json| # rubocop:disable Style/CombinableLoops
+            item_json["groupNames"].each do |group_name|
+              next unless (group = $ir.get(group_name))
+
+              group.add_member($ir.get(item_json["name"]))
+            end
+          end
+        end
+      end
+
+      def autoupdate_all_items
+        @autoupdated_items ||= {}
+        $ir.for_each do |_provider, item|
+          @autoupdated_items[item] = item.meta.delete("autoupdate") if item.meta.key?("autoupdate")
+        end
+      end
+
+      private
+
+      def restore_autoupdate_items
+        return unless instance_variable_defined?(:@autoupdated_items)
+
+        @autoupdated_items.each do |(item, meta)|
+          item.meta["autoupdate"] = meta
+        end
+      end
+
+      ::RSpec.configure do |config|
+        config.include(self)
+        config.after do
+          restore_autoupdate_items
+        end
+      end
+    end
+  end
+end
+# rubocop:enable Style/GlobalVars

data/lib/rspec/openhab/state.rb

@@ -1,9 +1,24 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
+  org.openhab.core.items.GenericItem.field_reader :eventPublisher
+
+  # rubocop:disable Style/GlobalVars
   config.before(:each) do
-    $ir.for_each do |_provider, item| # rubocop:disable Style/GlobalVars
+    ep = $ir.eventPublisher
+
+    # stash event publishers to avoid triggering any rules
+    $ir.for_each do |_provider, item|
+      item.event_publisher = nil
+    end
+
+    $ir.for_each do |_provider, item| # rubocop:disable Style/CombinableLoops
       item.state = NULL # don't use update, to avoid triggering any rules
     end
+  ensure
+    $ir.for_each do |_provider, item|
+      item.event_publisher = ep
+    end
   end
+  # rubocop:enable Style/GlobalVars
 end

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.2"
+    VERSION = "0.0.5"
   end
 end

data/lib/rspec/openhab/wait.rb

@@ -5,12 +5,11 @@ module RSpec
     module Wait
       def wait_for_rules
         loop do
-          break if java.lang.Thread.all_stack_traces.keys.all? do |t|
-            !t.name.match?(/^OH-rule-/) ||
-            [java.lang.Thread::State::WAITING, java.lang.Thread::State::TIMED_WAITING].include?(t.state)
-          end
-
           sleep(0.1)
+          break if java.lang.Thread.all_stack_traces.keys.all? do |t|
+                     !t.name.match?(/^OH-rule-/) ||
+                     [java.lang.Thread::State::WAITING, java.lang.Thread::State::TIMED_WAITING].include?(t.state)
+                   end
         end
       end
     end

data/lib/rspec-openhab-scripting.rb

@@ -38,6 +38,7 @@ maven_require do
   require "jar org.openhab.core.bundles, org.openhab.core.automation, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.automation.module.script, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.automation.module.script.rulesupport, #{openhab_version}"
+  require "jar org.openhab.core.bundles, org.openhab.core.io.monitor, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.core, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.model.script, #{openhab_version}"
   require "jar org.openhab.core.bundles, org.openhab.core.semantics, #{openhab_version}"
@@ -58,6 +59,7 @@ end
 require "openhab/log/logger"
 require "rspec/openhab/core/logger"
 require "openhab/dsl/imports"
+OpenHAB::DSL::Imports.api = api
 OpenHAB::DSL::Imports.import_presets
 
 require "openhab"
@@ -68,46 +70,14 @@ require "rspec/openhab/core/cron_scheduler"
 OpenHAB::DSL.send(:remove_const, :Timer)
 require_relative "rspec/openhab/dsl/timers/timer"
 
-# rubocop:disable Style/GlobalVars
-
 # RSpec additions
 require "rspec/openhab/dsl/rules/rspec"
 require "rspec/openhab/state"
 require "rspec/openhab/trigger"
 require "rspec/openhab/wait"
+require "rspec/openhab/items"
 
-# populate item registry
-all_items = api.items
-all_items.each do |item_json|
-  type, _dimension = item_json["type"].split(":")
-  if type == "Group"
-    if item_json["groupType"]
-      type, _dimension = item_json["groupType"].split(":")
-      klass = OpenHAB::DSL::Items.const_get(:"#{type}Item")
-      base_item = klass.new(item_json["name"])
-    end
-    # TODO: create group function
-    item = GroupItem.new(item_json["name"], base_item)
-  else
-    klass = OpenHAB::DSL::Items.const_get(:"#{type}Item")
-    item = klass.new(item_json["name"])
-  end
-
-  item.label = item_json["label"]
-  item_json["tags"].each do |tag|
-    item.add_tag(tag)
-  end
-  $ir.add(item)
-end
-all_items.each do |item_json| # rubocop:disable Style/CombinableLoops
-  item_json["groupNames"].each do |group_name|
-    next unless (group = $ir.get(group_name))
-
-    group.add_member($ir.get(item_json["name"]))
-  end
-end
-
-# rubocop:enable Style/GlobalVars
+RSpec::OpenHAB::Items.populate_items_from_api(api)
 
 # load rules files
 OPENHAB_AUTOMATION_PATH = "#{org.openhab.core.OpenHAB.config_folder}/automation/jsr223/ruby/personal"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: java
 authors:
 - Cody Cutrer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.42'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -169,6 +183,7 @@ files:
 - lib/rspec/openhab/dsl/imports.rb
 - lib/rspec/openhab/dsl/rules/rspec.rb
 - lib/rspec/openhab/dsl/timers/timer.rb
+- lib/rspec/openhab/items.rb
 - lib/rspec/openhab/state.rb
 - lib/rspec/openhab/trigger.rb
 - lib/rspec/openhab/version.rb