openhab-scripting 2.9.2 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612f0dcb06de54823cfacbb59c009ced999f41f0d6751fe7168329eedfd80130
-  data.tar.gz: f1ea6c2072a55dfa3af8e4a2ab86368d7579899a67699277eefba155be120863
+  metadata.gz: a2d12cc054e377bd657e80ef28661155676fa325526ceb2b787cd64772af876b
+  data.tar.gz: 27152a95a1526ebb15bb63224197bbb96d8da6a25a5548b50ae796e4f2371fbd
 SHA512:
-  metadata.gz: 856b15b13e5d844be475fbdc104a3d3f6ec9b0644868e22d1ce99ed821d71a6b09315d7191cc100db7cb2d3c9a9a3fb39b797c23deb20c206eb4a9ad0fe271e4
-  data.tar.gz: 385e0b060f8bca36c175c98a3ad05d130cb57cfbc0e4ea269a56c642e40f7878198437ea719c3df85317ce56da8531517507e8b268d68217004b1bcf55ac5afb
+  metadata.gz: e533069444e06d2d6bbb656c5d43f8295195a9d73c325fa12fa2d16fb0a0296aaa51ce5d036233429703f9b8d4c9f22f7298673f3579f6e1c1c6dadb841d8821
+  data.tar.gz: 48ef8d6d80f28d974b1e42da67b904c4ac524b687ef1f4be1ea50edf970e8c48de0dac3503a97043130a1d6c88cb915a1c3b972d093961e174208435f0a03a56

data/lib/openhab/core/dsl/gems.rb

@@ -1,29 +1,4 @@
 # frozen_string_literal: true
 
 require 'core/log'
-
-begin
-  require 'bundler/inline'
-
-  include Logging
-  logger.debug('Bundler required')
-rescue LoadError
-  include Logging
-  logger.debug('Bundler not found installing')
-
-  begin
-    require 'rubygems/commands/install_command'
-    cmd = Gem::Commands::InstallCommand.new
-    cmd.handle_options ['--no-document', 'bundler', '-v', '2.1.4']
-    cmd.execute
-    logger.debug('Bundler is installed')
-    require 'bundler/inline'
-  rescue Gem::SystemExitException => e
-    if e.exit_code.zero?
-      logger.debug('Bundler is installed')
-      require 'bundler/inline'
-    else
-      logger.error("Error installing bundler, exit code: #{e}")
-    end
-  end
-end
+require 'bundler/inline'

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

@@ -22,7 +22,17 @@ module OpenHAB
             item = $ir.getItem(name)
             # rubocop: enable Style/GlobalVars
             (item.is_a? GroupItem) ? nil : item
+          rescue Java::OrgOpenhabCoreItems::ItemNotFoundException
+            nil
           end
+
+          # Returns true if the given item name exists
+          # @param name [String] Item name to check
+          # @return [Boolean] true if the item exists, false otherwise
+          def include?(name)
+            !$ir.getItems(name).empty?
+          end
+          alias key? include?
         end
 
         java_import org.openhab.core.items.GroupItem

data/lib/openhab/core/dsl/rule/item.rb

@@ -97,6 +97,7 @@ module OpenHAB
           #
           def updated(*items, to: nil)
             items.flatten.each do |item|
+              item = item.group if item.is_a? Group
               logger.trace("Creating updated trigger for item(#{item}) to(#{to})")
               [to].flatten.each do |to_state|
                 case item

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

@@ -303,6 +303,23 @@ module OpenHAB
             false
           end
 
+          #
+          # Patch event to include event.item when it doesn't exist
+          # This is to patch a bug see https://github.com/boc-tothefuture/openhab-jruby/issues/75
+          # It may be fixed in the openhab core in the future, in which case, this patch will no longer be necessary
+          #
+          # @param [OpenHAB Event] event to check for item accessor
+          # @param [OpenHAB Event Inputs] inputs inputs to running rule
+          #
+          def add_event_item(event, inputs)
+            return if event.nil? || defined?(event.item)
+
+            class << event
+              attr_accessor :item
+            end
+            event.item = inputs&.dig('triggeringItem')
+          end
+
           #
           # Process the run queue
           #
@@ -317,7 +334,7 @@ module OpenHAB
               when RuleConfig::Run
 
                 event = inputs&.dig('event')
-
+                add_event_item(event, inputs)
                 logger.trace { "Executing rule '#{name}' run block with event(#{event})" }
                 task.block.call(event)
               when RuleConfig::Trigger

data/lib/openhab/core/duration.rb

@@ -64,6 +64,15 @@ module OpenHAB
           @amount * 1000 * 60 * 60
         end
       end
+
+      #
+      # Return a string representation of the duration
+      #
+      # @return [String] Duration in string
+      #
+      def to_s
+        "#{@amount} #{(@amount == 1) ? @temporal_unit.to_s.downcase.delete_suffix('s') : @temporal_unit.to_s.downcase}"
+      end
     end
   end
 end

data/lib/openhab/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.12.0
 platform: ruby
 authors:
 - Brian O'Connell
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
-dependencies: []
+date: 2021-02-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: JRuby Helper Libraries for OpenHAB Scripting
 email:
 - broconne@gmail.com
@@ -74,7 +88,7 @@ metadata:
   homepage_uri: https://boc-tothefuture.github.io/openhab-jruby/
   source_code_uri: https://github.com/boc-tothefuture/openhab-jruby
   changelog_uri: https://github.com/boc-tothefuture/openhab-jruby/blob/main/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -89,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.7.6.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: JRuby Helper Libraries for OpenHAB Scripting
 test_files: []