reline 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67ad796ede485308abba9038bb03672537e8cba1409ef61e921d165db277846d
-  data.tar.gz: 9692f5e08f6ed30722262d70c89e413b4f7d7651f98698d6253f720aea600125
+  metadata.gz: 7f903d3b8f902335117d484007dcfbef5e8846061a8eb3c8820f9975c4c85ea5
+  data.tar.gz: 2ccb2d104c5c52b4e4f8ab1dd8a48ceb738fa03826ab62a7b38483d0f4f1288a
 SHA512:
-  metadata.gz: 4d69f27ac94aecc2f9628e824d4ded200cf0e0e1939b00d28db99b30f5b21baed78bba0edc7ab68105af327803c0e5f8f03853fb629079ae9017be6016bff0d7
-  data.tar.gz: 62af3574af7223c038e3b078708b116af92bcecf1ec9301e32f8653c008fdfea082253f9308aa99067f60aa9c98deecb5382552deee6847966f4e4ceb387f8f3
+  metadata.gz: d8edd5b7d31464fbc150518f94d45d84466837fe78374dbc127f2226005eb73f2c238f274d685ed42c97db56e906fb90b5e6369dd03dbaeac4b6f2019f36cd68
+  data.tar.gz: 317225a1374e59f3dbb654b67a732fd3daf669fd13cab0673d73e0b952cc8d6fad554c4318366479d162890d0c538ca09cc902a1ad2fad0e42e4684b54f81c3e

data/lib/reline/ansi.rb

@@ -1,6 +1,5 @@
 require 'io/console'
 require 'io/wait'
-require 'timeout'
 require_relative 'terminfo'
 
 class Reline::ANSI
@@ -154,11 +153,13 @@ class Reline::ANSI
   end
 
   @@buf = []
-  def self.inner_getc
+  def self.inner_getc(timeout_second)
     unless @@buf.empty?
       return @@buf.shift
     end
     until c = @@input.raw(intr: true) { @@input.wait_readable(0.1) && @@input.getbyte }
+      timeout_second -= 0.1
+      return nil if timeout_second <= 0
       Reline.core.line_editor.resize
     end
     (c == 0x16 && @@input.raw(min: 0, time: 0, &:getbyte)) || c
@@ -172,40 +173,38 @@ class Reline::ANSI
   @@in_bracketed_paste_mode = false
   START_BRACKETED_PASTE = String.new("\e[200~,", encoding: Encoding::ASCII_8BIT)
   END_BRACKETED_PASTE = String.new("\e[200~.", encoding: Encoding::ASCII_8BIT)
-  def self.getc_with_bracketed_paste
+  def self.getc_with_bracketed_paste(timeout_second)
     buffer = String.new(encoding: Encoding::ASCII_8BIT)
-    buffer << inner_getc
+    buffer << inner_getc(timeout_second)
     while START_BRACKETED_PASTE.start_with?(buffer) or END_BRACKETED_PASTE.start_with?(buffer) do
       if START_BRACKETED_PASTE == buffer
         @@in_bracketed_paste_mode = true
-        return inner_getc
+        return inner_getc(timeout_second)
       elsif END_BRACKETED_PASTE == buffer
         @@in_bracketed_paste_mode = false
         ungetc(-1)
-        return inner_getc
+        return inner_getc(timeout_second)
       end
-      begin
-        succ_c = nil
-        Timeout.timeout(Reline.core.config.keyseq_timeout * 100) {
-          succ_c = inner_getc
-        }
-      rescue Timeout::Error
-        break
-      else
+      succ_c = inner_getc(Reline.core.config.keyseq_timeout)
+
+      if succ_c
         buffer << succ_c
+      else
+        break
       end
     end
     buffer.bytes.reverse_each do |ch|
       ungetc ch
     end
-    inner_getc
+    inner_getc(timeout_second)
   end
 
-  def self.getc
+  # if the usage expects to wait indefinitely, use Float::INFINITY for timeout_second
+  def self.getc(timeout_second)
     if Reline.core.config.enable_bracketed_paste
-      getc_with_bracketed_paste
+      getc_with_bracketed_paste(timeout_second)
     else
-      inner_getc
+      inner_getc(timeout_second)
     end
   end
 

data/lib/reline/config.rb

@@ -252,7 +252,7 @@ class Reline::Config
       end
       @skip_section = @if_stack.pop
     when 'include'
-      read(args)
+      read(File.expand_path(args))
     end
   end
 

data/lib/reline/general_io.rb

@@ -1,10 +1,13 @@
-require 'timeout'
 require 'io/wait'
 
 class Reline::GeneralIO
   def self.reset(encoding: nil)
     @@pasting = false
-    @@encoding = encoding
+    if encoding
+      @@encoding = encoding
+    elsif defined?(@@encoding)
+      remove_class_variable(:@@encoding)
+    end
   end
 
   def self.encoding
@@ -35,7 +38,7 @@ class Reline::GeneralIO
     yield
   end
 
-  def self.getc
+  def self.getc(_timeout_second)
     unless @@buf.empty?
       return @@buf.shift
     end

data/lib/reline/line_editor.rb

@@ -2696,6 +2696,7 @@ class Reline::LineEditor
       @cursor_max -= width
     end
   end
+  alias_method :kill_word, :em_delete_next_word
 
   private def ed_delete_prev_word(key)
     if @byte_pointer > 0
@@ -2707,6 +2708,7 @@ class Reline::LineEditor
       @cursor_max -= width
     end
   end
+  alias_method :backward_kill_word, :ed_delete_prev_word
 
   private def ed_transpose_chars(key)
     if @byte_pointer > 0

data/lib/reline/unicode/east_asian_width.rb

@@ -1,6 +1,6 @@
 class Reline::Unicode::EastAsianWidth
   # This is based on EastAsianWidth.txt
-  # EastAsianWidth.txt
+  # UNICODE_VERSION = '15.1.0'
 
   # Fullwidth
   TYPE_F = /^[#{ %W(
@@ -60,14 +60,14 @@ class Reline::Unicode::EastAsianWidth
     \u{2E80}-\u{2E99}
     \u{2E9B}-\u{2EF3}
     \u{2F00}-\u{2FD5}
-    \u{2FF0}-\u{2FFB}
+    \u{2FF0}-\u{2FFF}
     \u{3001}-\u{303E}
     \u{3041}-\u{3096}
     \u{3099}-\u{30FF}
     \u{3105}-\u{312F}
     \u{3131}-\u{318E}
     \u{3190}-\u{31E3}
-    \u{31F0}-\u{321E}
+    \u{31EF}-\u{321E}
     \u{3220}-\u{3247}
     \u{3250}-\u{4DBF}
     \u{4E00}-\u{A48C}

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.3.7'
+  VERSION = '0.3.9'
 end

data/lib/reline/windows.rb

@@ -295,7 +295,7 @@ class Reline::Windows
     yield
   end
 
-  def self.getc
+  def self.getc(_timeout_second)
     check_input_event
     @@output_buf.shift
   end

data/lib/reline.rb

@@ -1,5 +1,4 @@
 require 'io/console'
-require 'timeout'
 require 'forwardable'
 require 'reline/version'
 require 'reline/config'
@@ -397,7 +396,7 @@ module Reline
     private def read_io(keyseq_timeout, &block)
       buffer = []
       loop do
-        c = io_gate.getc
+        c = io_gate.getc(Float::INFINITY)
         if c == -1
           result = :unmatched
           @bracketed_paste_finished = true
@@ -434,15 +433,8 @@ module Reline
     end
 
     private def read_2nd_character_of_key_sequence(keyseq_timeout, buffer, c, block)
-      begin
-        succ_c = nil
-        Timeout.timeout(keyseq_timeout / 1000.0) {
-          succ_c = io_gate.getc
-        }
-      rescue Timeout::Error # cancel matching only when first byte
-        block.([Reline::Key.new(c, c, false)])
-        return :break
-      else
+      succ_c = io_gate.getc(keyseq_timeout.fdiv(1000))
+      if succ_c
         case key_stroke.match_status(buffer.dup.push(succ_c))
         when :unmatched
           if c == "\e".ord
@@ -462,27 +454,23 @@ module Reline
           block.(expanded)
           return :break
         end
+      else
+        block.([Reline::Key.new(c, c, false)])
+        return :break
       end
     end
 
     private def read_escaped_key(keyseq_timeout, c, block)
-      begin
-        escaped_c = nil
-        Timeout.timeout(keyseq_timeout / 1000.0) {
-          escaped_c = io_gate.getc
-        }
-      rescue Timeout::Error # independent ESC
+      escaped_c = io_gate.getc(keyseq_timeout.fdiv(1000))
+
+      if escaped_c.nil?
         block.([Reline::Key.new(c, c, false)])
+      elsif escaped_c >= 128 # maybe, first byte of multi byte
+        block.([Reline::Key.new(c, c, false), Reline::Key.new(escaped_c, escaped_c, false)])
+      elsif escaped_c == "\e".ord # escape twice
+        block.([Reline::Key.new(c, c, false), Reline::Key.new(c, c, false)])
       else
-        if escaped_c.nil?
-          block.([Reline::Key.new(c, c, false)])
-        elsif escaped_c >= 128 # maybe, first byte of multi byte
-          block.([Reline::Key.new(c, c, false), Reline::Key.new(escaped_c, escaped_c, false)])
-        elsif escaped_c == "\e".ord # escape twice
-          block.([Reline::Key.new(c, c, false), Reline::Key.new(c, c, false)])
-        else
-          block.([Reline::Key.new(escaped_c, escaped_c | 0b10000000, true)])
-        end
+        block.([Reline::Key.new(escaped_c, escaped_c | 0b10000000, true)])
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console