openhab-scripting 4.45.1 → 4.46.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219ff31be5a2a08d9c0fcfdac6a15a1703e056928ce3fcea17e10da6824a26d8
-  data.tar.gz: 5b7be5678b869b4b3f469c5039d4663d153206433f91f178832f9812ff24838c
+  metadata.gz: c6843041898c2a83a667d7e64e3233b6d8d88cf86909f683ce13ccd3e1194289
+  data.tar.gz: ce84f8f828d2c7b193b830c1818a2a3f9333455a1381ffbb7be33d64d0be0210
 SHA512:
-  metadata.gz: aa2881c99476b13c112dcde86e0c2a2b52e5c8af2504340254ebba5a6461aed04ee49d2098a84281b38160cd1bd3933ee17d663bda40f84b1c9e45648408574f
-  data.tar.gz: 3393c479d762c7442cb6af4605efd90cab156d413eebe87757338c035af93aa9d41500dcfb4d67c11e677cd26592dfae64a0ffe1ecb1bbace42584ae1194514f
+  metadata.gz: 225f88032d55646e9b397a75e698df1b52e6f5eff09b3ac2cfed672436ffaea40cee492b9216a38d0a051f3a834072ae51919e0d5a3f6d6b93e2fc289707c61e
+  data.tar.gz: b464df4e24dbada506a9b14a80b82e714a6fd0e534fbe186de4b6257b0c0bb3a90de7a775d220156d1988b902f9580f3f3824324c8013b816c94b73ebc1241a7

data/lib/openhab/dsl/items/ensure.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ruby2_keywords'
+require 'openhab/log/logger'
 require_relative 'generic_item'
 
 module OpenHAB
@@ -81,14 +83,13 @@ module OpenHAB
         end
 
         # activate +ensure_states+ before forwarding to the wrapped object
-        def method_missing(method, *args, &block)
+        ruby2_keywords def method_missing(method, *args, &block)
           return super unless @item.respond_to?(method)
 
           ensure_states do
             @item.__send__(method, *args, &block)
           end
         end
-        ruby2_keywords :method_missing if respond_to? :ruby2_keywords
 
         # .
         def respond_to_missing?(method, include_private = false)

data/lib/openhab/dsl/items/item_registry.rb

@@ -46,7 +46,7 @@ module OpenHAB
         # Explicit conversion to array
         # @return [Array]
         def to_a
-          $ir.items.to_a
+          $ir.items.map { |item| OpenHAB::Core::ItemProxy.new(item) }
         end
       end
     end

data/lib/openhab/dsl/items/timed_command.rb

@@ -174,7 +174,7 @@ module OpenHAB
               OpenHAB::DSL.import_presets
               @semaphore.synchronize do
                 thread_local(**@thread_locals) do
-                  logger.trace "Canceling implicit timer #{@timed_command_details.timer} for "\
+                  logger.trace "Canceling implicit timer #{@timed_command_details.timer} for " \
                                "#{@timed_command_details.item.id}  because received event #{inputs}"
                   @timed_command_details.timer.cancel
                   # Disabled due to OpenHAB design

data/lib/openhab/dsl/openhab.rb

@@ -9,7 +9,7 @@ module OpenHAB
   # @return [Pathname] OpenHAB conf path
   #
   def self.conf_root
-    Pathname.new(ENV['OPENHAB_CONF'])
+    Pathname.new(ENV.fetch('OPENHAB_CONF', nil))
   end
 
   module DSL

data/lib/openhab/dsl/rules/automation_rule.rb

@@ -162,7 +162,7 @@ module OpenHAB
             now = Time.now
             return true if @between.cover? now
 
-            logger.trace("Skipped execution of rule '#{name}' because the current time #{now} "\
+            logger.trace("Skipped execution of rule '#{name}' because the current time #{now} " \
                          "is not between #{@between.begin} and #{@between.end}")
           else
             logger.trace("Skipped execution of rule '#{name}' because of guard #{@guard}")

data/lib/openhab/dsl/rules/triggers/changed.rb

@@ -112,7 +112,7 @@ module OpenHAB
           #
           def wait_trigger(item:, duration:, to: nil, from: nil, attach: nil)
             item_name = item.respond_to?(:name) ? item.name : item.to_s
-            logger.trace("Creating Changed Wait Change Trigger for Item(#{item_name}) Duration(#{duration}) "\
+            logger.trace("Creating Changed Wait Change Trigger for Item(#{item_name}) Duration(#{duration}) " \
                          "To(#{to}) From(#{from}) Attach(#{attach})")
             conditions = Conditions::Duration.new(to: to, from: from, duration: duration)
             changed_trigger(item: item, to: nil, from: nil, attach: attach, conditions: conditions)

data/lib/openhab/dsl/rules/triggers/conditions/duration.rb

@@ -36,7 +36,7 @@ module OpenHAB
               @conditions = Conditions::Proc.new(to: to, from: from)
               @duration = duration
               @timer = nil
-              logger.trace "Created Duration Condition To(#{to}) From(#{from}) "\
+              logger.trace "Created Duration Condition To(#{to}) From(#{from}) " \
                            "Conditions(#{@conditions}) Duration(#{@duration})"
             end
 

data/lib/openhab/dsl/time/month_day.rb

@@ -102,16 +102,6 @@ module OpenHAB
         end
       end
 
-      java_import java.time.Month
-      # Extend Month with helper method
-      class Month
-        # Calcalute and memoize the maximum number of days in a year before this month
-        # @return [Number] maximum nummber of days in a year before this month
-        def max_days_before
-          @max_days_before ||= Month.values.select { |month| month < self }.sum(&:max_length)
-        end
-      end
-
       java_import java.time.MonthDay
       # Extend MonthDay java object with some helper methods
       class MonthDay
@@ -131,6 +121,12 @@ module OpenHAB
           MonthDay.of(m, d)
         end
 
+        # Calcalute the maximum number of days in a year before a supplied month
+        # @return [Number] maximum nummber of days in a year before this month
+        def max_days_before(month)
+          java.time.Month.values.select { |i| i < month }.sum(&:max_length)
+        end
+
         # Parse MonthDay string as defined with by Monthday class without leading double dash "--"
         def self.parse(string)
           logger.trace("#{self.class}.parse #{string} (#{string.class})")
@@ -146,7 +142,7 @@ module OpenHAB
 
         # Get the maximum (supports leap years) day of the year this month day could be
         def max_day_of_year
-          day_of_month + month.max_days_before
+          day_of_month + max_days_before(month)
         end
 
         # Remove -- from MonthDay string representation
@@ -173,7 +169,7 @@ module OpenHAB
             self.<=>(MonthDay.parse(other))
           when OpenHAB::DSL::Between::MonthDayRange::DayOfYear
             # Compare with DayOfYear and invert result
-            -other.<=>(self)
+            -(other <=> self)
           else
             super
           end

data/lib/openhab/dsl/time/time_of_day.rb

@@ -189,9 +189,9 @@ module OpenHAB
         def <=>(other)
           other_second_of_day = to_second_of_day(other)
           logger.trace do
-            "SOD(#{sod}) "\
-              "other SOD(#{other_second_of_day}) "\
-              "Other Class (#{other.class}) "\
+            "SOD(#{sod}) " \
+              "other SOD(#{other_second_of_day}) " \
+              "Other Class (#{other.class}) " \
               "Result (#{sod <=> other_second_of_day})"
           end
           sod <=> other_second_of_day

data/lib/openhab/log/logger.rb

@@ -208,8 +208,8 @@ module OpenHAB
       # @param [Object] object to derive class name for
       # @return [String] name of class for logging
       def klass_name(object)
-        object.then(&:class)
-              .then { |klass| java_klass(klass) }
+        object = object.class unless object.is_a?(Class)
+        object.then { |klass| java_klass(klass) }
               .then(&:name)
               .then { |name| filter_base_classes(name) }
               .then { |name| ".#{name}" unless name.nil? } # name is frozen in jruby 9.4
@@ -222,7 +222,8 @@ module OpenHAB
       def java_klass(klass)
         if klass.respond_to?(:java_class) &&
            klass.java_class &&
-           !klass.java_class.name.start_with?('org.jruby.Ruby')
+           !klass.java_class.name.start_with?('org.jruby.Ruby') &&
+           !klass.java_class.name.start_with?('org.jruby.gen')
           klass = klass.java_class
         end
         klass

data/lib/openhab/version.rb

@@ -5,5 +5,5 @@
 #
 module OpenHAB
   # @return [String] Version of OpenHAB helper libraries
-  VERSION = '4.45.1'
+  VERSION = '4.46.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.45.1
+  version: 4.46.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 description: JRuby Helper Libraries for OpenHAB Scripting
 email:
 - broconne@gmail.com