openhab-scripting 4.32.2 → 4.32.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d988eed567dd4fb75d8f43550f005cc1e09264310157c6ec7f267f82d68f6af
-  data.tar.gz: f790a909228f3671204fe6e00c27064ee25ab69154f4b54a21efe233d36d6b2b
+  metadata.gz: bf1f1c2ae201fe502bf830cdfd68be82d9489931f4122e2ab196581ac0b2793a
+  data.tar.gz: 7b85b254e1ef2cf2d26a50c94719b2cbe12a7140eba86f9b9d70a428ccd7a960
 SHA512:
-  metadata.gz: bf7f712761e6b051f674c0709abba39f13ca3cbc52db417cb7a5c40f013425f860b52bd8ff840f1bb60a81cbda845899c348a9da2045ad0b0480816e70478f4d
-  data.tar.gz: 9c40d8bb624713aba27f93edc5c0dac12d003c14d3db47a37715954b7c788cf0d0f195e32797cd3a454eb984d57a05eb650660e585f476aff7ded57c4e6c5fff
+  metadata.gz: 4299bc30c7f47b534653808258263a9d1bca1cf5284a86e94bdece0f6084989a25db5ccba277c44b0fc1d59cb54e30eddccc0e63535cbe98669ced090860baad
+  data.tar.gz: 52acd07934bc24858bdfeebe257b423909db886549582b32a66e8efea6fa213be7259b9e7829def39e9a1c01ac8e9f4869ad209553cd7bcb0a99bbf1e5b734d5

data/lib/openhab/dsl/monkey_patch/actions/script_thing_actions.rb

@@ -9,12 +9,10 @@ module OpenHAB
       # Patches OpenHAB actions
       #
       module Actions
-        java_import Java::OrgOpenhabCoreAutomationModuleScriptInternalDefaultscope::ScriptThingActions
-
         #
         # MonkeyPatching ScriptThingActions
         #
-        class ScriptThingActions
+        class << $actions # rubocop:disable Style/GlobalVars
           field_reader :THING_ACTIONS_MAP
 
           #
@@ -23,7 +21,7 @@ module OpenHAB
           # @return [Set] of keys for defined actions in the form of 'scope-thing_uid'
           #
           def action_keys
-            ScriptThingActions.THING_ACTIONS_MAP.keys
+            self.class.THING_ACTIONS_MAP.keys
           end
         end
       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.2'
+  VERSION = '4.32.5'
 end

metadata

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