rspec-openhab-scripting 0.0.3-java → 0.0.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a757dc4165cbe3769b13d7a24b444d6d3d66fa7e6fdae117fa76bd87c230c03
-  data.tar.gz: 0243f89dc45dad378693e7a73b3b842aa11563f18a464936a6b42971f4f76f07
+  metadata.gz: 36b9bb280e4fd6893f93a5ca0197dd4a7a08c286b4cc6835c44f81c487e497fe
+  data.tar.gz: 6390495a9d8ff5a522f86f4e1d50155bf93d45a14a59b9ba3b9147c49cd27548
 SHA512:
-  metadata.gz: 6b6461bf0bfc7120efef2611e2d6ae18d09c1da6a33a9d9e1825ede880329475d9d0ccbfd445ebcc427eb265a68e785fa98c157e0676c62a772a814af586e076
-  data.tar.gz: 600900bcceda586ea77aa16f6fd925b6a1960615ce64a6e0e3054250c2fb444c5cddfe73223341397f6f88d0eba4b6a2b3453b2f896d7572c7fed66c3c0251ee
+  metadata.gz: c571aa03ed3fc7521be9e65924b274204a7ab4382101467af88847350632a7cc159795cbb238765af6fd6b0abb41b2934b656037571de5a3936972905784255e
+  data.tar.gz: 757a9bcfbbe1d5361500413b5e6cd74b6a1eda00df2483abb22e200f4d1ae3845fa6bfafcb4501b3b1060f91710a721e1727db3a695447a90aa7f91ef3b8643a

data/lib/rspec/openhab/api.rb

@@ -15,12 +15,19 @@ 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", metadata: ".*").body
     end
@@ -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/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,6 +147,9 @@ 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
@@ -137,6 +160,10 @@ module OpenHAB
           ir = org.openhab.core.internal.items.ItemRegistryImpl.new(mr)
           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
@@ -205,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

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

@@ -1,47 +1,79 @@
 # frozen_string_literal: true
 
+# rubocop:disable Style/GlobalVars
 module RSpec
   module OpenHAB
     module Items
-      module_function
-
-      # rubocop:disable Style/GlobalVars
-      def populate_items_from_api(api)
-        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(":")
+      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")
-              base_item = klass.new(item_json["name"])
+              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)
+            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
-          item_json["metadata"]&.each do |key, config|
-            item.meta[key] = config["value"], config["config"]
+          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
 
-          $ir.add(item)
+      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
-        all_items.each do |item_json| # rubocop:disable Style/CombinableLoops
-          item_json["groupNames"].each do |group_name|
-            next unless (group = $ir.get(group_name))
+      end
 
-            group.add_member($ir.get(item_json["name"]))
-          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
-      # rubocop:enable Style/GlobalVars
     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.3"
+    VERSION = "0.0.6"
   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

@@ -59,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"
@@ -78,10 +79,16 @@ require "rspec/openhab/items"
 
 RSpec::OpenHAB::Items.populate_items_from_api(api)
 
+# make bundler/inline _not_ destroy the already existing load path
+module Bundler
+  module SharedHelpers
+    def clean_load_path; end
+  end
+end
+
 # load rules files
 OPENHAB_AUTOMATION_PATH = "#{org.openhab.core.OpenHAB.config_folder}/automation/jsr223/ruby/personal"
 
-# set up some environment the rules files expect
 Dir["#{OPENHAB_AUTOMATION_PATH}/*.rb"].each do |f|
   load f
 rescue Exception => e # rubocop:disable Lint/RescueException

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 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:
@@ -158,7 +172,6 @@ extra_rdoc_files: []
 files:
 - lib/rspec-openhab-scripting.rb
 - lib/rspec-openhab-scripting_jars.rb
-- lib/rspec/bundler/inline.rb
 - lib/rspec/openhab/api.rb
 - lib/rspec/openhab/core/cron_scheduler.rb
 - lib/rspec/openhab/core/load_path.rb

data/lib/rspec/bundler/inline.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class DummyDsl
-    def source(*); end
-  end
-end
-
-def gemfile(*, &block)
-  # needs to be a no-op, since we're already running in the context of bundler
-  Bundler::DummyDsl.new.instance_eval(&block)
-end