openhab-scripting 4.33.0 → 4.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 806613696649b2b84a4dd23339f58c9e25dff4a9834c5fa952b50effd915307a
-  data.tar.gz: 6faf4c72cae568ae889d188b73040ae74c73f57864b30588d57fdce097f37420
+  metadata.gz: 0b5fd36cfc11c1123c6dc979a7d7072ee7aff804deded7d4bb72716be4c2e216
+  data.tar.gz: f324548ea1075012f58076195a8c25d8cb6bb4afe62344d9752ba4a2415a4394
 SHA512:
-  metadata.gz: '026014989011c7cc84fe58d783766a8a48ee9d4da002ca6724010bbcd873ed26484934c9a6bfc232fe71f073d51e5589fa583e1e621fa29d9c1b4601dcdceedd'
-  data.tar.gz: 9a75b467b814a87bb0efcb10baeed5700a28fd81423f0d87124e072f102280e53688fc2ef8cdea06820dfb4008d0bffefa1c3d250b759c177c8f1ad591342491
+  metadata.gz: 49b5fab340c77c046ad534568efb939206ab11824f6f08c56622a691d066fd4ce79c308e153d4b45d408cb901f461f5b97c6b14b00deceaba70efbdb46475e2c
+  data.tar.gz: 70c98aaec888f7c889a3bcac861caf216fee51b71c0f086c624ad4caf51f497f6db56c4b218e808524fa3b903d2c149a4c580a862878158fd988d12eb2ce8659

data/lib/openhab/core/thread_local.rb

@@ -18,7 +18,7 @@ module OpenHAB
       # @param [Hash] values Keys and values to set for running thread, if hash is nil no values are set
       #
       def self.thread_local(**values)
-        old_values = values.map { |key, _value| [key, Thread.current[key]] }.to_h
+        old_values = values.to_h { |key, _value| [key, Thread.current[key]] }
         values.each { |key, value| Thread.current[key] = value }
         logger.trace "Executing block with thread local context: #{values} - old context: #{old_values}"
         yield

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

@@ -145,7 +145,7 @@ module OpenHAB
             include OpenHAB::Log
             include OpenHAB::Core::ThreadLocal
 
-            def initialize(timed_command_details, semaphore, &block) # rubocop:disable Metric/MethodLength
+            def initialize(timed_command_details, semaphore, &block) # rubocop:disable Metrics/MethodLength
               super()
               @semaphore = semaphore
               @timed_command_details = timed_command_details

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

@@ -42,7 +42,7 @@ module OpenHAB
           @guard = config.guard
           # Convert between to correct range or nil if not set
           between = config.between&.then { between(config.between) }
-          @between = between || OpenHAB::DSL::Between::ALL_DAY
+          @between = between
           @trigger_conditions = config.trigger_conditions
           @attachments = config.attachments
         end
@@ -153,6 +153,8 @@ module OpenHAB
         # Loggging inflates method length
         def check_guards(event:)
           if @guard.should_run? event
+            return true if @between.nil?
+
             now = Time.now
             return true if @between.cover? now
 

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

@@ -13,16 +13,19 @@ module OpenHAB
         #
         # Create a rule that executes at the specified interval
         #
-        # @param [Object] value Symbol or Duration to execute this rule
+        # @param [Object] value String, Symbol, Duration, or MonthDay to execute this rule
         # @param [Object] at TimeOfDay or String representing TimeOfDay in which to execute rule
         # @param [Object] attach object to be attached to the trigger
         #
         #
         def every(value, at: nil, attach: nil)
+          return every(MonthDay.parse(value), at: at, attach: attach) if value.is_a? String
+
           cron_expression = case value
                             when Symbol then Cron.from_symbol(value, at)
                             when Java::JavaTime::Duration then Cron.from_duration(value, at)
-                            else raise ArgumentExpression, 'Unknown interval'
+                            when Java::JavaTime::MonthDay then Cron.from_monthday(value, at)
+                            else raise ArgumentError, 'Unknown interval'
                             end
           cron(cron_expression, attach: attach)
         end
@@ -32,8 +35,18 @@ module OpenHAB
         #
         # @param [String] expression OpenHAB style cron expression
         # @param [Object] attach object to be attached to the trigger
+        # @param [Hash] elements cron expression elements (second, minute, hour, dom, month, dow, year)
         #
-        def cron(expression, attach: nil)
+        def cron(expression = nil, attach: nil, **fields)
+          if fields.any?
+            raise ArgumentError, 'Cron elements cannot be used with a cron expression' if expression
+
+            cron_expression = Cron.from_fields(fields)
+            return cron(cron_expression, attach: attach)
+          end
+
+          raise ArgumentError, 'Missing cron expression or elements' unless expression
+
           cron = Cron.new(rule_triggers: @rule_triggers)
           cron.trigger(config: { 'cronExpression' => expression }, attach: attach)
         end
@@ -59,7 +72,8 @@ module OpenHAB
               hour: '*',
               dom: '?',
               month: '*',
-              dow: '?'
+              dow: '?',
+              year: '*'
             }.freeze
           private_constant :CRON_EXPRESSION_MAP
 
@@ -96,7 +110,7 @@ module OpenHAB
           #
           # Create a cron map from a duration
           #
-          # @param [java::time::Duration] duration
+          # @param [Java::JavaTime::Duration] duration
           # @param [Object] at TimeOfDay or String representing time of day
           #
           # @return [Hash] map describing cron expression
@@ -107,6 +121,20 @@ module OpenHAB
             map_to_cron(duration_to_map(duration))
           end
 
+          #
+          # Create a cron map from a MonthDay
+          #
+          # @param [Java::JavaTime::MonthDay] month_day
+          # @param [Object] at TimeOfDay or String representing time of day
+          #
+          # @return [Hash] map describing cron expression
+          #
+          def self.from_monthday(monthday, at)
+            expression_map = EXPRESSION_MAP[:day].merge(month: monthday.month_value, dom: monthday.day_of_month)
+            expression_map = at_condition(expression_map, at) if at
+            map_to_cron(expression_map)
+          end
+
           #
           # Create a cron map from a symbol
           #
@@ -121,6 +149,19 @@ module OpenHAB
             map_to_cron(expression_map)
           end
 
+          #
+          # Create a cron map from cron elements
+          #
+          # @param [Hash] elements Cron fields (second, minute, hour, dom, month, dow, year)
+          #
+          # @return [Hash] map describing cron expression
+          #
+          def self.from_fields(fields)
+            fields = fields.transform_values { |value| value.to_s.gsub(/\s+/, '') }
+            expression_map = CRON_EXPRESSION_MAP.merge(fields)
+            map_to_cron(expression_map)
+          end
+
           #
           # Map cron expression to to cron string
           #
@@ -129,7 +170,7 @@ module OpenHAB
           # @return [String] OpenHAB cron string
           #
           def self.map_to_cron(map)
-            %i[second minute hour dom month dow].map { |field| map.fetch(field) }.join(' ')
+            %i[second minute hour dom month dow year].map { |field| map.fetch(field) }.join(' ')
           end
 
           #

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.33.0
+  version: 4.34.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler