openhab-scripting 5.46.0 → 5.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6351743424c867636542a49ecdb2ef2eca63824d2009ae517763d256f7fab20
-  data.tar.gz: 72d778a25df32f555763c38539c1bb7d34ae2f24c70120d069504d18e036eaac
+  metadata.gz: 489e56f9a2fe2f2e158736a7a03708b99a26f422f5f3640755d4270b010530fb
+  data.tar.gz: 4ccffffac019fd74bda95219dcdd0f126738da018d96f92f4f979a69171c915f
 SHA512:
-  metadata.gz: a6d35c4a0489003faeabf001e3215bb8f4e9e805cdffb69ba0b10d9261127f08f07f1c0e61cc072ff849eab6dc70c88d9b11003c9f830c53e93ff92ce5ae03ce
-  data.tar.gz: 0be0d9f6149485518eabb0b4c08bb4a73ce7fdf7c9d231e9c9ee590f132a74f647dcbb4c3e3d1087dd2be10a1f487736e45214af2037e2093f019de3d3aeadda
+  metadata.gz: d577c0e485492f29c72662a7ec16d15d2db88851ff194f460d754162290aa173d7304959805ef3bf6295001960d2a3dcc67111a34d6e0e56afea954cc3a5a759
+  data.tar.gz: 47093891a302abe04e205584880f000664183ab1cd064a9d7eb145439b4a2bde37f3553520cf9dbf4ee86a68b3388e7d480ddac07b06f122c381bfc13ec2b9a4

data/lib/openhab/console/irb.rb

@@ -67,6 +67,7 @@ module OpenHAB
 
         def completion_candidates(_preposing, target, _postposing, bind:)
           return super unless defined?(OpenHAB::Core::EntityLookup)
+          return super if target.empty?
           return super unless VALID_ENTITY_PREFIXES.include?(target[0])
 
           this = bind.eval("self")
@@ -88,8 +89,8 @@ module OpenHAB
   end
 end
 
-# disable Reline for now; it's not working
-IRB.conf[:USE_MULTILINE] = false
+# Uncomment to disable Reline and use Readline or StdioInputMethod
+# IRB.conf[:USE_MULTILINE] = false
 # Uncomment to disable Readline and force StdioInputMethod
 # IRB.conf[:USE_SINGLELINE] = false
 

data/lib/openhab/console/stdio.rb

@@ -39,6 +39,11 @@ module OpenHAB
 
         @byte_stream = terminal.input
         @buffer = StringIO.new.set_encoding(external_encoding)
+        @eof = false
+      end
+
+      def eof?
+        @buffer.eof? && @eof
       end
 
       def getbyte
@@ -47,6 +52,7 @@ module OpenHAB
           @buffer.truncate(0) if @buffer.eof?
           return b
         end
+        return nil if eof?
 
         b = @byte_stream.read
         return nil if b.negative?
@@ -60,6 +66,8 @@ module OpenHAB
           @buffer.truncate(0) if @buffer.eof?
           return c
         end
+        return nil if eof?
+
         bytes = (+"").force_encoding(Encoding::BINARY)
         loop do
           b = getbyte
@@ -110,7 +118,9 @@ module OpenHAB
       end
 
       def read(bytes)
-        r = readpartial(bytes)
+        r = readpartial(bytes) if !eof? || (@buffer.size - @buffer.tell).positive?
+        return nil if r.nil?
+
         r.concat(readpartial(bytes - r.bytesize)) while r.bytesize < bytes
         r
       end
@@ -124,6 +134,8 @@ module OpenHAB
           return r
         end
 
+        raise EOFError, "end of file reached" if eof?
+
         buffer = Java::byte[bytes].new
         read = @byte_stream.read_buffered(buffer)
         buffer = buffer[0..read] if read != bytes
@@ -134,19 +146,43 @@ module OpenHAB
       def wait_readable(timeout = nil)
         return true if (@buffer.size - @buffer.tell).positive?
 
-        timeout = timeout ? 0 : timeout * 1000
+        return @byte_stream.available.positive? ? self : nil if timeout == 0 # rubocop:disable Style/NumericPredicate
+
+        timeout = timeout ? timeout * 1000 : 0
         char = @byte_stream.read(timeout)
+        if char == -1
+          @eof = true
+          # this is not normal behavior for wait_readable, but it seems like when the SSH client
+          # disconnects, JLine just "closes" the NonBlockingPumpInputStream, and doesn't trigger
+          # any signals. On the other end, Reline just keeps calling this repetitively forever
+          # if we're at EOF, with the only way to break out to be check signals. So raise an exception
+          # here.
+          raise EOFError, "end of file reached"
+        end
         return nil if char.negative? # timeout
 
         ungetc(char.chr(external_encoding))
         self
       end
 
-      def raw(*)
-        previous_attributes = @terminal.enter_raw_mode
+      def raw(min: nil, time: nil, intr: nil)
+        previous_attributes = @terminal.attributes
+        new_attributes = @terminal.attributes
+        new_attributes.set_local_flags(java.util.EnumSet.of(org.jline.terminal.Attributes::LocalFlag::ICANON,
+                                                            org.jline.terminal.Attributes::LocalFlag::ECHO,
+                                                            org.jline.terminal.Attributes::LocalFlag::IEXTEN),
+                                       false)
+        new_attributes.set_local_flag(org.jline.terminal.Attributes::LocalFlag::ISIG, !!intr) # rubocop:disable Style/DoubleNegation
+        new_attributes.set_input_flags(java.util.EnumSet.of(org.jline.terminal.Attributes::InputFlag::IXON,
+                                                            org.jline.terminal.Attributes::InputFlag::ICRNL,
+                                                            org.jline.terminal.Attributes::InputFlag::INLCR),
+                                       false)
+        new_attributes.set_control_char(org.jline.terminal.Attributes::ControlChar::VMIN, min || 1)
+        new_attributes.set_control_char(org.jline.terminal.Attributes::ControlChar::VTIME, ((time || 0) * 10).to_i)
+        @terminal.attributes = new_attributes
         yield self
       ensure
-        @terminal.set_attributes(previous_attributes)
+        @terminal.set_attributes(previous_attributes) if previous_attributes
       end
     end
 

data/lib/openhab/core/items/semantics/semantic_tag.rb

@@ -54,13 +54,13 @@ module OpenHAB
           # @!visibility private
           def <(other)
             check_type(other)
-            uid != other.uid && uid.start_with?(other.uid)
+            uid.start_with?("#{other.uid}_")
           end
 
           # @!visibility private
           def <=(other)
             check_type(other)
-            uid.start_with?(other.uid)
+            uid == other.uid || uid.start_with?("#{other.uid}_")
           end
 
           # @!visibility private
@@ -72,13 +72,13 @@ module OpenHAB
           # @!visibility private
           def >=(other)
             check_type(other)
-            other.uid.start_with?(uid)
+            other <= self
           end
 
           # @!visibility private
           def >(other)
             check_type(other)
-            uid != other.uid && other.uid.start_with?(uid)
+            other < self
           end
 
           # @return [String]

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

@@ -381,7 +381,7 @@ module OpenHAB
         #   Property = SemanticTag
 
         # put ourself into the global namespace, replacing the action
-        Object.send(:remove_const, :Semantics)
+        Object.send(:remove_const, :Semantics) if Object.const_defined?(:Semantics)
         ::Semantics = self # rubocop:disable Naming/ConstantName
 
         #

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

@@ -132,18 +132,20 @@ module OpenHAB
 
           # @!visibility private
           def add(builder)
-            if DSL.items.key?(builder.name)
+            if (old_item = DSL.items[builder.name])
               raise ArgumentError, "Item #{builder.name} already exists" unless @update
 
               # Use provider.get because openHAB's ManagedProvider does not support the #[] method.
-              unless (old_item = provider.get(builder.name))
-                raise FrozenError, "Item #{builder.name} is managed by #{DSL.items[builder.name].provider}"
+              # Note that ManagedProvider stores PersistableItem objects, not the actual item,
+              # so we cannot use provider.get as old_item. We'll get it from the Item Registry instead.
+              unless provider.get(builder.name)
+                raise FrozenError, "Item #{builder.name} is managed by #{old_item.provider}"
               end
 
               item = builder.build
-              if item.config_eql?(old_item)
+              if item.config_eql?(old_item.__getobj__)
                 logger.debug { "Not replacing existing item #{item.uid} because it is identical" }
-                item = old_item
+                item = old_item.__getobj__
               else
                 logger.debug { "Replacing existing item #{item.uid} because it is not identical" }
                 provider.update(item)
@@ -169,6 +171,7 @@ module OpenHAB
               if !channel.include?(":") &&
                  (thing = builder.thing ||
                   thing = builder.groups.find { |g| g.is_a?(GroupItemBuilder) && g.thing }&.thing)
+                thing = thing.uid if thing.respond_to?(:uid)
                 channel = "#{thing}:#{channel}"
               end
 
@@ -248,7 +251,7 @@ module OpenHAB
         # Autoupdate setting
         # @return [true, false, nil]
         attr_accessor :autoupdate
-        # @return [String, Core::Things::Thing, Core::Things::ThingUID, nil]
+        # @return [String, Core::Things::Thing, Core::Things::ThingUID, DSL::Things::Builder::ThingBuilder, nil]
         #   {Core::Things::ThingUID Thing} from which to resolve relative channel ids
         attr_accessor :thing
         # @return [Core::Items::Metadata::NamespaceHash]
@@ -302,7 +305,7 @@ module OpenHAB
         # @param tags [String, Symbol, Semantics::Tag, Array<String, Symbol, Semantics::Tag>, nil]
         #        Fluent alias for `tag`.
         # @param autoupdate [true, false, nil] Autoupdate setting (see {ItemBuilder#autoupdate})
-        # @param thing [String, Core::Things::Thing, Core::Things::ThingUID, nil]
+        # @param thing [String, Core::Things::Thing, Core::Things::ThingUID, DSL::Things::Builder::ThingBuilder, nil]
         #   A Thing to be used as the base for the channel.
         # @param channel [String, Symbol, Core::Things::ChannelUID, Core::Things::Channel, nil]
         #   Channel to link the item to (see {ItemBuilder#channel}).
@@ -786,7 +789,7 @@ module OpenHAB
         # @return [String, nil]
         attr_accessor :function
         # A thing to be used as the base for the channel of any member items
-        # @return [Core::Things::ThingUID, Core::Things::Thing, String, nil]
+        # @return [Core::Things::ThingUID, Core::Things::Thing, DSL::Things::Builder::ThingBuilder, String, nil]
         attr_accessor :thing
         # A prefix to be added to the name of any member items
         # @return [String, nil]
@@ -800,7 +803,7 @@ module OpenHAB
 
         # @param type [Symbol, nil] The base type for the group
         # @param function [String, nil] The combiner function for this group
-        # @param thing [Core::Things::ThingUID, Core::Things::Thing, String, nil]
+        # @param thing [Core::Things::ThingUID, Core::Things::Thing, DSL::Things::Builder::ThingBuilder, String, nil]
         #        A Thing to be used as the base for the channel for any contained items.
         # @param (see ItemBuilder#initialize)
         def initialize(*, type: nil, function: nil, thing: nil, **)

data/lib/openhab/dsl/things/builder.rb

@@ -95,16 +95,13 @@ module OpenHAB
           builder.instance_eval(&block) if block
           thing = builder.build
 
-          if DSL.things.key?(thing.uid)
+          if (old_thing = DSL.things[thing.uid])
             raise ArgumentError, "Thing #{thing.uid} already exists" unless @update
+            raise FrozenError, "Thing #{thing.uid} is managed by #{thing.provider}" unless provider.get(thing.uid)
 
-            unless (old_thing = provider.get(thing.uid))
-              raise FrozenError, "Thing #{thing.uid} is managed by #{thing.provider}"
-            end
-
-            if thing.config_eql?(old_thing)
+            if thing.config_eql?(old_thing.__getobj__)
               logger.debug { "Not replacing existing thing #{thing.uid}" }
-              thing = old_thing
+              thing = old_thing.__getobj__
             else
               provider.update(thing)
             end

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.46.0"
+    VERSION = "5.47.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.46.0
+  version: 5.47.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.4
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []