rspec-openhab-scripting 0.0.2-java → 0.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb06cd0d4f2eb7710a678cf6b080ae636d81ef9faa4012a755ed8b73117a158a
-  data.tar.gz: 3ed1a44e4cc9802054e6697807e75adafa75e6069647f917b809e20cbdb2e92a
+  metadata.gz: 2a757dc4165cbe3769b13d7a24b444d6d3d66fa7e6fdae117fa76bd87c230c03
+  data.tar.gz: 0243f89dc45dad378693e7a73b3b842aa11563f18a464936a6b42971f4f76f07
 SHA512:
-  metadata.gz: 4ee95923dc2c84ca4253112fcb0d6b351cb14d3a1879dcbcdd5e67dfcf095fdfdd0ab8f3c9d4b617fe2db13393a727f2687194531436c9572857066fcc57a62d
-  data.tar.gz: 05245aa976b20f462002b87c9451b16c9aa1609f145981f259ee1637270e82a9ca295a55fcb15c6bc66a295664e313e0ffb5b280f193e624fc411ccf3138be2d
+  metadata.gz: 6b6461bf0bfc7120efef2611e2d6ae18d09c1da6a33a9d9e1825ede880329475d9d0ccbfd445ebcc427eb265a68e785fa98c157e0676c62a772a814af586e076
+  data.tar.gz: 600900bcceda586ea77aa16f6fd925b6a1960615ce64a6e0e3054250c2fb444c5cddfe73223341397f6f88d0eba4b6a2b3453b2f896d7572c7fed66c3c0251ee

data/lib/rspec/openhab/api.rb

@@ -22,7 +22,7 @@ module OpenHAB
     end
 
     def items
-      @faraday.get("items").body
+      @faraday.get("items", metadata: ".*").body
     end
 
     def item(name)

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

@@ -129,10 +129,12 @@ module OpenHAB
           ep = org.openhab.core.internal.events.OSGiEventPublisher.new(ea)
 
           # 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)
           tr = org.openhab.core.thing.internal.ThingRegistryImpl.new
@@ -221,7 +223,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/items.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+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(":")
+              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
+          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
+      # rubocop:enable Style/GlobalVars
+    end
+  end
+end

data/lib/rspec/openhab/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module OpenHAB
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   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}"
@@ -68,46 +69,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: java
 authors:
 - Cody Cutrer
@@ -169,6 +169,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