openhab-scripting 4.32.3 → 4.32.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1093824867216ac9015ebc8bba44843f327a03c5c896ae44e8c18a90d3ffba
-  data.tar.gz: b3496046440b79efbc9d8967634337dc8ee035f4e64d596eb64863f4d2f8e617
+  metadata.gz: 34c74d99bb0771d8c4bfda01a96e59565dd3cd204918c0726b4286350b987b8b
+  data.tar.gz: 17414fbbbf1ad48e9645f0bfdda0cd09703270695885d4938b5b74a22b9b1e84
 SHA512:
-  metadata.gz: b4267271e7c487fafc419b874b3a919026c21305c8449836427df7f54361299d91e2f22a26fe7533ca114630862e74e4c671f06828c9a591b485e53da6609eca
-  data.tar.gz: cf88fac5372d571b4e2d68f85e8c395488397b314c260957180d1f60173f082c47ebbbc3670b0daa3f5fed753ca4f11154d4c4f45f678aae573626719236d3d2
+  metadata.gz: 2d79c2e5349ec783bef23e2b47f279052c1602a271d05d0c28e1f46f651aa5303138a0ee092a521db3d452764c05787e0416e16ac1a36c1cb1afcb823d205009
+  data.tar.gz: 20f6d14f431456ab6cfafca83a36fdcc7ef1f7c0f2c2b960f819bfe896916e6b676968dd616fd656288d734ac03e733eea31b0345d122d727dbe43b6978117a9

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

@@ -49,7 +49,7 @@ module OpenHAB
             return super(command) unless duration
 
             # Timer needs access to rule to disable, rule needs access to timer to cancel.
-            # Using a mutux to ensure neither fires before the other is constructed
+            # Using a mutex to ensure neither fires before the other is constructed
             semaphore = Mutex.new
 
             semaphore.synchronize do
@@ -144,7 +144,7 @@ module OpenHAB
             include OpenHAB::Log
             include OpenHAB::Core::ThreadLocal
 
-            def initialize(timed_command_details, semaphore, &block)
+            def initialize(timed_command_details, semaphore, &block) # rubocop:disable Metric/MethodLength
               super()
               @semaphore = semaphore
               @timed_command_details = timed_command_details
@@ -154,7 +154,8 @@ module OpenHAB
               set_name("Cancels implicit timer for #{timed_command_details.item.id}")
               set_triggers([OpenHAB::DSL::Rules::RuleTriggers.trigger(
                 type: OpenHAB::DSL::Rules::Triggers::Changed::ITEM_STATE_CHANGE,
-                config: { 'itemName' => timed_command_details.item.name }
+                config: { 'itemName' => timed_command_details.item.name,
+                          'previousState' => timed_command_details.command.to_s }
               )])
             end
 

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

@@ -34,7 +34,6 @@ module OpenHAB
       # @yield [] Block executed in context of a RuleConfig
       #
       #
-      # rubocop: disable Metrics/MethodLength
       def rule(rule_name, &block)
         thread_local(RULE_NAME: rule_name) do
           @rule_name = rule_name
@@ -43,12 +42,10 @@ module OpenHAB
           config.guard = Guard::Guard.new(run_context: config.caller, only_if: config.only_if, not_if: config.not_if)
           logger.trace { config.inspect }
           process_rule_config(config)
-          nil # Must return something other than the rule object. See https://github.com/boc-tothefuture/openhab-jruby/issues/438
         end
       rescue StandardError => e
         logger.log_exception(e, @rule_name)
       end
-      # rubocop: enable Metrics/MethodLength
 
       #
       # Cleanup rules in this script file
@@ -71,10 +68,10 @@ module OpenHAB
 
         rule = AutomationRule.new(config: config)
         Rules.script_rules << rule
-        add_rule(rule)
+        added_rule = add_rule(rule)
 
         rule.execute(nil, { 'event' => Struct.new(:attachment).new(config.start_attachment) }) if config.on_start?
-        rule
+        added_rule
       end
 
       #

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

@@ -20,8 +20,7 @@ module OpenHAB
         # Invert the type
         # @return [OnOffType] +OFF+ if +ON+, +ON+ if +OFF+
         def !
-          return OFF if on?
-          return ON if off?
+          on? ? OFF : ON
         end
       end
     end

data/lib/openhab/log/logger.rb

@@ -270,8 +270,7 @@ module OpenHAB
       #
       def log_caller
         caller_locations.map(&:path)
-                        .grep_v(/rubygems/)
-                        .grep_v(/openhab-scripting/)
+                        .grep_v(/rubygems|openhab-scripting|<script>/)
                         .first
                         .then { |caller| File.basename(caller, '.*') if caller }
       end

data/lib/openhab/version.rb

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

metadata

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