openhab-scripting 4.8.0 → 4.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b0441f0cce1fb707bfb5d74d051135ce37c63128359cfa98cdae2573b920d2
-  data.tar.gz: 0101f396a6bce5e6d52f3191973fb6db2f3cb3be93f00229b4cc5297f04488bf
+  metadata.gz: 85403da3b59930bb61a16e74f658e2257209c13a962d4f66a7ab4167a382f48b
+  data.tar.gz: 75e19bdace713e9386828cf9e3be1e21000314d7d774cc703a1ae62141f93222
 SHA512:
-  metadata.gz: ac154dd9d98ca0305c30770286554cb0b4bc863f1af95e7e03a32090aac7cc8f13633a42d2bcd8da7bc8b585f377a4db74d8a4ef668675ac0704fed9627f9973
-  data.tar.gz: bc241f0713e34124057fb124658dd13b4437bbe455bbf975c616aefd6a05b49a8d224039e23175dd7c1c350a17fa782eec2c8d22748e56f24cf8e618774396a2
+  metadata.gz: d4a975ad351673ff58f1e8cf43b86bc5002fdb036217a70a8ff2e7c1351eca827544319f4ebbcd50939c8eda4679d2aa3516c41f1e8edb4f1912798e3f1708a3
+  data.tar.gz: f48db351969332ea07d8b8bfb2c2b538e247427dae3124d3b1c76cf29d6c2adee498eefd0c40b913b9f76db3ebc95993469b3bd13d2e5e91862352d002fafe11

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/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/dsl/types/hsb_type.rb

@@ -78,7 +78,7 @@ module OpenHAB
             args[0] = if hue.is_a?(DecimalType)
                         hue
                       elsif hue.is_a?(QuantityType)
-                        DecimalType.new(hue.to_unit(::Units::DEGREE_ANGLE).to_big_decimal)
+                        DecimalType.new(hue.to_unit(org.openhab.core.library.unit.Units::DEGREE_ANGLE).to_big_decimal)
                       elsif hue.respond_to?(:to_d)
                         DecimalType.new(hue)
                       end
@@ -150,7 +150,7 @@ module OpenHAB
         # @!attribute [r] hue
         # @return [QuantityType]
         def hue
-          QuantityType.new(raw_hue.to_big_decimal, ::Units::DEGREE_ANGLE)
+          QuantityType.new(raw_hue.to_big_decimal, org.openhab.core.library.unit.Units::DEGREE_ANGLE)
         end
 
         # Convert to a packed 32-bit RGB value representing the color in the default sRGB color model.

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.0'
+  VERSION = '4.8.4'
 end

metadata

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