openhab-scripting 4.8.1 → 4.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d0594ce30afe7ee9653b705d23d24bc48489f7c0d264a0dd246d59d4266dc82
-  data.tar.gz: 2bec61de8afbaf4bbe180f510f6b797a9ab59449c506fc41f374d485c128698c
+  metadata.gz: 19b14c62e681500abaa99858522f7592e0a4d93f6966a5cf8e99157b0944cbe6
+  data.tar.gz: 071556f83604d539af3620a0796eef993edfc0bb224ad3dd08cf7d5a71e9d593
 SHA512:
-  metadata.gz: 419fd04010222b680c6d8a3c6c5c78752add3a7d0912333e9623a20b4ffe83d8fcc5a3ec62c9df811e3fb794611e3d5bf8961776af9ee3d74c2239fd8c10160e
-  data.tar.gz: f4e06ae879aee439acc8c6103093edd871f06e9c9ed89fb04fa74e5550849ea7e897e2e26b12c776aa93a2eacc4d9f0c00f2c3039ca73351e857cabd105d8577
+  metadata.gz: '01429a840f1af1e81886988f00ad628fa01dd7a7423ef2e20c59eb1d40822b573115d12a0c8c6fc093012ad29a70666bf280de52a789a8dc8cf6b0c7d2eb1867'
+  data.tar.gz: 28aab00e8742851f08fee9535b39c913f78f4c7200f2bdbd8788e4d6c8ac8ae6f202a7f3e4675e0e02af2bbc953b6a10114b93987eff5c6ec37e1d6ad0f8ddeb

data/lib/openhab/core/osgi.rb

@@ -11,7 +11,6 @@ module OpenHAB
     class OSGI
       include OpenHAB::Log
 
-      java_import org.openhab.core.model.script.actions.ScriptExecution
       java_import org.osgi.framework.FrameworkUtil
 
       #

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

@@ -83,6 +83,7 @@ module OpenHAB
         def state?
           !raw_state.is_a?(Types::UnDefType)
         end
+        alias truthy? state?
 
         #
         # Get the item state

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

@@ -21,7 +21,7 @@ module OpenHAB
         #
         #
         def update_from_file(file, mime_type: nil)
-          file_data = IO.binread(file)
+          file_data = File.binread(file)
           mime_type ||= Marcel::MimeType.for(Pathname.new(file)) || Marcel::MimeType.for(file_data)
           update_from_bytes(file_data, mime_type: mime_type)
         end

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

@@ -77,7 +77,6 @@ module OpenHAB
         # Create the run queue based on guards
         #
         # @param [Map] inputs rule inputs
-        #
         # @return [Queue] <description>
         #
         def create_queue(inputs)
@@ -243,6 +242,8 @@ module OpenHAB
         #
         # @return [Boolean] True if guards says rule should execute, false otherwise
         #
+        # rubocop:disable Metrics/MethodLength
+        # Loggging inflates method length
         def check_guards(event:)
           if @guard.should_run? event
             now = TimeOfDay::TimeOfDay.now
@@ -254,7 +255,10 @@ module OpenHAB
             logger.trace("Skipped execution of rule '#{name}' because of guard #{@guard}")
           end
           false
+        rescue StandardError => e
+          print_backtrace(e)
         end
+        # rubocop:enable Metrics/MethodLength
 
         #
         # Process the run queue

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

@@ -31,18 +31,18 @@ module OpenHAB
         # @return [Trigger] OpenHAB trigger
         #
         def changed(*items, to: nil, from: nil, for: nil)
-          separate_groups(items).each do |item|
+          separate_groups(items).map do |item|
             logger.trace("Creating changed trigger for entity(#{item}), to(#{to}), from(#{from})")
             # for is a reserved word in ruby, so use local_variable_get :for
             if (wait_duration = binding.local_variable_get(:for))
               changed_wait(item, to: to, from: from, duration: wait_duration)
             else
               # Place in array and flatten to support multiple to elements or single or nil
-              [to].flatten.each do |to_state|
-                [from].flatten.each { |from_state| create_changed_trigger(item, from_state, to_state) }
+              [to].flatten.map do |to_state|
+                [from].flatten.map { |from_state| create_changed_trigger(item, from_state, to_state) }
               end
             end
-          end
+          end.flatten
         end
 
         private
@@ -55,12 +55,13 @@ module OpenHAB
         # @param [Item State] to OpenHAB Item State item or group needs to change to
         # @param [Item State] from OpenHAB Item State item or group needs to be coming from
         #
-        # @return [Array] Array of current TriggerDelay objects
+        # @return [Trigger] OpenHAB trigger
         #
         def changed_wait(item, duration:, to: nil, from: nil)
           trigger = create_changed_trigger(item, nil, nil)
           logger.trace("Creating Changed Wait Change Trigger for #{item}")
           @trigger_delays[trigger.id] = TriggerDelay.new(to: to, from: from, duration: duration)
+          trigger
         end
 
         #

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

@@ -22,14 +22,14 @@ module OpenHAB
         #
         #
         def received_command(*items, command: nil, commands: nil)
-          separate_groups(items).each do |item|
+          separate_groups(items).map do |item|
             logger.trace("Creating received command trigger for item(#{item})"\
                          "command(#{command}) commands(#{commands})")
 
             # Combine command and commands, doing union so only a single nil will be in the combined array.
             combined_commands = combine_commands(command, commands)
             create_received_trigger(combined_commands, item)
-          end
+          end.flatten
         end
 
         private
@@ -42,7 +42,7 @@ module OpenHAB
         #
         #
         def create_received_trigger(commands, item)
-          commands.each do |command|
+          commands.map do |command|
             if item.is_a? OpenHAB::DSL::Items::GroupItem::GroupMembers
               config, trigger = create_group_command_trigger(item)
             else

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

@@ -10,9 +10,6 @@ module OpenHAB
       # Cron type rules
       #
       module Triggers
-        java_import org.openhab.core.automation.util.TriggerBuilder
-        java_import org.openhab.core.config.core.Configuration
-
         #
         # Returns a default map for cron expressions that fires every second
         # This map is usually updated via merge by other methods to refine cron type triggers.

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

@@ -20,13 +20,13 @@ module OpenHAB
         # @return [Trigger] Trigger for updated entity
         #
         def updated(*items, to: nil)
-          separate_groups(items).each do |item|
+          separate_groups(items).map do |item|
             logger.trace("Creating updated trigger for item(#{item}) to(#{to})")
-            [to].flatten.each do |to_state|
+            [to].flatten.map do |to_state|
               trigger, config = create_update_trigger(item, to_state)
               append_trigger(trigger, config)
             end
-          end
+          end.flatten
         end
 
         private

data/lib/openhab/dsl/things.rb

@@ -47,7 +47,7 @@ module OpenHAB
 
         private
 
-        java_import 'org.openhab.core.automation.annotation.RuleAction'
+        java_import org.openhab.core.automation.annotation.RuleAction
 
         #
         # Define methods from actions mapped to this thing

data/lib/openhab/log/logger.rb

@@ -73,7 +73,7 @@ module OpenHAB
         return error if debug_enabled?
 
         if error.respond_to? :backtrace_locations
-          backtrace = error.backtrace_locations.map(&:to_s).reject { |line| INTERNAL_CALL_REGEX.match? line }
+          backtrace = error.backtrace_locations.map(&:to_s).grep_v(INTERNAL_CALL_REGEX)
           error.set_backtrace(backtrace)
         elsif error.respond_to? :stack_trace
           backtrace = error.stack_trace.reject { |line| JAVA_INTERNAL_CALL_REGEX.match? line.to_s }

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.8.5
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler