openhab-scripting 2.10.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4874a7bd0f0c84c6ef638e6dcc5093af7c3c560add561a2a63b4913a1c36b79a
-  data.tar.gz: 89b32ce2da5eefaefa14dd1994c9278d1f838ddc451e3c6935dfb047182898fb
+  metadata.gz: 9e3db2fe066cd7fe8c314eda96c2ce182611c1af9be801fb179896eaeebbca6e
+  data.tar.gz: a91ab773ddff831028cf3ef9839cca92f8772f3e9c10eb6c49d610282a4f998b
 SHA512:
-  metadata.gz: d68aaaacfa1c1023d12ea76cbf2f5455689524767e4636c2185b703dd83dca81e9becfe4e7b91160bd06bc03cd3f1d507f00f5ba4d1c5bb0b8cb6aec7b71e8ac
-  data.tar.gz: 536a41efc2b2de46e05b5fd5528f385862022e4d0b033bfe4af3861660df4771d38ac2001dd887c281106ee456f0b82d4ae85d1bcdf85d23906ee03e2b36de3e
+  metadata.gz: a7ada2d4a291c47f44531f47e7556799c800f83ec9fa2d23d3cd708ddba11bd958a84d0df74c999ca49e0f14f5f9067a7a5c7d5ac766bab31bdc5e969bab236f
+  data.tar.gz: b06aae6303a62bf4b53144c9cf0e1ad0d2457be0a76e1930f1558d156259ccd1dbe89ed9a1121c1ffb0a728052665c57cc5736ed1932d78cc61ff88bbdcc2c24

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/monkey_patch/items/dimmer_item.rb

@@ -14,6 +14,7 @@ Dimmer = DimmerItem
 #
 # rubocop:disable Style/ClassAndModuleChildren
 class Java::OrgOpenhabCoreLibraryItems::DimmerItem
+  include Comparable
   # rubocop:enable Style/ClassAndModuleChildren
   java_import org.openhab.core.library.types.DecimalType
   java_import org.openhab.core.library.types.IncreaseDecreaseType
@@ -85,6 +86,38 @@ class Java::OrgOpenhabCoreLibraryItems::DimmerItem
     target
   end
 
+  #
+  # Compare DimmerItem to supplied object
+  #
+  # @param [Object] other object to compare to
+  #
+  # @return [Integer] -1,0,1 or nil depending on value supplied, nil comparison to supplied object is not possible.
+  #
+  def <=>(other)
+    logger.trace("Comparing #{self} to #{other}")
+    case other
+    when DimmerItem, NumberItem
+      state <=> other.state
+    when DecimalType
+      state <=> other
+    else
+      to_i <=> other.to_i
+    end
+  end
+
+  #
+  # Compare DimmerItem to supplied object.
+  # The == operator needs to be overridden because the parent java object
+  # has .equals which overrides the <=> operator above
+  #
+  # @param [Object] other object to compare to
+  #
+  # @return [Integer] true if the two objects contain the same value, false otherwise
+  #
+  def ==(other)
+    (self <=> other).zero?
+  end
+
   #
   # Check if dimmer has a state and state is not zero
   #
@@ -105,6 +138,15 @@ class Java::OrgOpenhabCoreLibraryItems::DimmerItem
 
   alias to_int to_i
 
+  #
+  # Return the string representation of the dimmer item
+  #
+  # @return [String] String version of the dimmer value
+  #
+  def to_s
+    to_i.to_s
+  end
+
   #
   # Check if dimmer is on
   #

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.10.0'
+  VERSION = '2.13.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-30 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