openhab-scripting 4.36.0 → 4.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f8ae7a88299903d5fe44ecc1a1bf2f16bdeb659545a567d1e86dfc908367694
-  data.tar.gz: 94db08cd7ee03e382db6d7b4ebed8b240ae4e354a7b62073b0a81cc1b7228cdd
+  metadata.gz: 152174c3766a83b620a0ec7df6e692bb914e187c788d9c5eecfcedd42bfd641c
+  data.tar.gz: 44084d3557abd293faf97858470414cf5f3dd65e07faa8f74e8f40e0d6ea8edb
 SHA512:
-  metadata.gz: 6f8ea8b5f0ab16e602f002cf749102c4250bb3525fc6f7e18f11eafe294125d198d6a85c5565bfc29629024dad0f5823ef0a298e7e90f7aa776030b84df4a25f
-  data.tar.gz: 9a04fb5c20858fbe6b1e63dbdff39207f8de7a7809b26000eef663cc3ff146e75e9e6717df1e2485b087fe92736af248f9352085b472d64e931008d60b7eb89c
+  metadata.gz: 617deb9b4f75a92a407cf8db6ff695f409ac5f006690751c10100919d414851dc83758ec0560badf3d40097cc896d86de132a215d22a3f505b8e97bff26a8ad2
+  data.tar.gz: 5a2c037047ce9db79d57a153e5df94c631144d511ac716b1862a8a6c4fc567d01c6efa15d93583f2bc80a792c47c85e30dda65ec481a1f14f6a588765638d56f

data/lib/openhab/dsl/dsl.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'imports'
+
+OpenHAB::DSL.import_presets
+
 require 'openhab/log/logger'
 
 # the order of these is important

data/lib/openhab/dsl/imports.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module DSL
+    include OpenHAB::Log
+    #
+    # Import required java classes
+    #
+    def self.import_presets # rubocop:disable Metrics/AbcSize
+      return if Object.const_get(:ZonedDateTime).is_a?(Class)
+
+      # Fix the import problem in OpenHAB 3.2 addon. Not required in 3.3+
+      [java.time.Duration,
+       java.time.ZonedDateTime,
+       java.time.ZoneId,
+       java.time.temporal.ChronoUnit].each do |klass|
+        Object.const_set(klass.java_class.simple_name.to_sym, klass)
+      end
+    end
+  end
+end

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

@@ -171,6 +171,7 @@ module OpenHAB
             # rubocop: disable Metrics/AbcSize
             # There is no feasible way to break this method into smaller components
             def execute(_mod = nil, inputs = nil)
+              OpenHAB::DSL.import_presets
               @semaphore.synchronize do
                 thread_local(@thread_locals) do
                   logger.trace "Canceling implicit timer #{@timed_command_details.timer} for "\

data/lib/openhab/dsl/openhab.rb

@@ -3,6 +3,15 @@
 require 'pathname'
 
 module OpenHAB
+  #
+  # Return the OpenHAB conf directory as a ruby pathname
+  #
+  # @return [Pathname] OpenHAB conf path
+  #
+  def self.conf_root
+    Pathname.new(ENV['OPENHAB_CONF'])
+  end
+
   module DSL
     #
     # Provides access to OpenHAB attributes
@@ -12,13 +21,9 @@ module OpenHAB
 
       module_function
 
-      #
-      # Return the OpenHAB conf directory as a ruby pathname
-      #
-      # @return [Pathname] OpenHAB conf path
-      #
+      # @deprecated Please use {OpenHAB.conf_root} instead
       def __conf__
-        Pathname.new(ENV['OPENHAB_CONF'])
+        OpenHAB.conf_root
       end
     end
   end

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

@@ -23,7 +23,6 @@ module OpenHAB
         include OpenHAB::Log
         include OpenHAB::Core::ThreadLocal
         include OpenHAB::DSL::Between
-        java_import java.time.ZonedDateTime
 
         #
         # Create a new Rule
@@ -55,6 +54,7 @@ module OpenHAB
         #
         #
         def execute(mod = nil, inputs = nil)
+          OpenHAB::DSL.import_presets
           thread_local(RULE_NAME: name) do
             logger.trace { "Execute called with mod (#{mod&.to_string}) and inputs (#{inputs.inspect})" }
             logger.trace { "Event details #{inputs['event'].inspect}" } if inputs&.key?('event')

data/lib/openhab/dsl/timers/manager.rb

@@ -95,11 +95,24 @@ module OpenHAB
       class TimerSet < Set
         #
         # A shorthand to cancel all the timer objects held within the set
-        # so that timers[timer_id].cancel_all is equivalent to timers[timer_id].each(&:cancel)
+        # so that timers[timer_id].cancel is equivalent to timers[timer_id].each(&:cancel)
         #
-        def cancel_all
+        def cancel
           each(&:cancel)
         end
+        # @deprecated Please use {cancel} instead
+        alias cancel_all cancel
+
+        #
+        # A shorthand to reschedule all the timer objects held within the set
+        #
+        # @param [Duration] duration An optional duration to reschedule
+        #
+        # @return [TimerSet] Set of timers
+        #
+        def reschedule(duration = nil)
+          each { |timer| timer.reschedule duration }
+        end
       end
     end
   end

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

@@ -9,7 +9,6 @@ require 'openhab/core/thread_local'
 module OpenHAB
   module DSL
     java_import org.openhab.core.model.script.actions.ScriptExecution
-    java_import java.time.ZonedDateTime
 
     # Ruby wrapper for OpenHAB Timer
     # This class implements delegator to delegate methods to the OpenHAB timer
@@ -80,6 +79,7 @@ module OpenHAB
       #
       def timer_block(semaphore)
         proc {
+          OpenHAB::DSL.import_presets
           semaphore.synchronize do
             Timers.timer_manager.delete(self)
             thread_local(@thread_locals) do

data/lib/openhab/dsl/types/date_time_type.rb

@@ -8,7 +8,6 @@ module OpenHAB
   module DSL
     module Types
       DateTimeType = org.openhab.core.library.types.DateTimeType
-      java_import java.time.ZonedDateTime # This is needed for the addon prior to ruby_class fix (OH 3.2.0)
 
       # global alias - required for jrubyscripting addon <= OH3.2.0
       ::DateTimeType = DateTimeType if ::DateTimeType.is_a?(Java::JavaLang::Class)

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.36.0
+  version: 4.37.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - lib/openhab/dsl/dsl.rb
 - lib/openhab/dsl/gems.rb
 - lib/openhab/dsl/group.rb
+- lib/openhab/dsl/imports.rb
 - lib/openhab/dsl/items/color_item.rb
 - lib/openhab/dsl/items/comparable_item.rb
 - lib/openhab/dsl/items/contact_item.rb