openhab-scripting 5.46.1 → 5.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185967fd947cf9a2dafa36a14ed1847c46b6c4bf579855d1c26c2c7813164fa1
-  data.tar.gz: 161f3f62083751c1dda257078aac9e229cf9666b47dde175499714a7721b71d0
+  metadata.gz: 489e56f9a2fe2f2e158736a7a03708b99a26f422f5f3640755d4270b010530fb
+  data.tar.gz: 4ccffffac019fd74bda95219dcdd0f126738da018d96f92f4f979a69171c915f
 SHA512:
-  metadata.gz: f754fbb6eb44e1a9e776e80af7dfbc317d06cfa8eb1eb79f1246e022bc027bfa7f163a210ef06c7c1e7920a46e3d6959a8bfee17c25c10c8bfbd9e40eb7318ea
-  data.tar.gz: a9d9095df6de53da7b4b69542b7c49807115a40692242c9abddb91b6a905e697c8c1ba765dd19d275e3a1ee6f744ee3f94407a8f79feb9ae9e9110a82b922781
+  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/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.46.1"
+    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.1
+  version: 5.47.0
 platform: ruby
 authors:
 - Brian O'Connell