reline 0.0.6 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a8719e2dd161d4d3493907d730981e19b685854247d1da4e8a107a9af88f98
-  data.tar.gz: 57c468696aecaa1752bf0ebacafbb9595ec8810c0dd406beb9bd95f31b8e2d05
+  metadata.gz: d6e100afbceacfa4a270221c7e5158f211dc9972efbbec251108661a380d43b1
+  data.tar.gz: 051ef05dac8d446be2b0268202da3762d702287650dc05a3041aa7910f481624
 SHA512:
-  metadata.gz: 47f940b15f36eb7e410bf9951916258c268375fffadb661766fca64a421cc4e7aeb701a919c0b47dd03ea9b4aa1110c7c5b870328bad704c40f8e6d945a90ba2
-  data.tar.gz: 271926159d49eaa2b6572cc5d3640c81d82cfbc42d03a7320b0731fec276575a96c7491ab192023125a02e44d0a1cf38ee3ffa5045ac29e93f18e83ab9478071
+  metadata.gz: '0068601561915d76b2ce265c7de49252941dbe1e57464db9b08876dfd49da6fc12c3821d90d8240b4f64728a4a55a469726233689fa077ef7296796495025295'
+  data.tar.gz: 4385616c29cba0596c84d98219d658361cae3dc8c9427e8460d1703972995a9adcb242ab252c30fe2abcf712d2d824a4cb41691b44e241a9d711a89da3e0d62d

data/lib/reline.rb

@@ -32,55 +32,69 @@ module Reline
       dig_perfect_match_proc
     ).each(&method(:attr_reader))
 
-    ATTR_ACCESSOR_NAMES = %i(
-      completion_case_fold
-    ).each(&method(:attr_accessor))
-
     attr_accessor :config
     attr_accessor :key_stroke
     attr_accessor :line_editor
     attr_accessor :ambiguous_width
+    attr_accessor :last_incremental_search
     attr_reader :output
 
     def initialize
       self.output = STDOUT
       yield self
+      @completion_quote_character = nil
+    end
+
+    def encoding
+      Reline::IOGate.encoding
     end
 
     def completion_append_character=(val)
       if val.nil?
         @completion_append_character = nil
       elsif val.size == 1
-        @completion_append_character = val.encode(Encoding::default_external)
+        @completion_append_character = val.encode(Reline::IOGate.encoding)
       elsif val.size > 1
-        @completion_append_character = val[0].encode(Encoding::default_external)
+        @completion_append_character = val[0].encode(Reline::IOGate.encoding)
       else
         @completion_append_character = nil
       end
     end
 
     def basic_word_break_characters=(v)
-      @basic_word_break_characters = v.encode(Encoding::default_external)
+      @basic_word_break_characters = v.encode(Reline::IOGate.encoding)
     end
 
     def completer_word_break_characters=(v)
-      @completer_word_break_characters = v.encode(Encoding::default_external)
+      @completer_word_break_characters = v.encode(Reline::IOGate.encoding)
     end
 
     def basic_quote_characters=(v)
-      @basic_quote_characters = v.encode(Encoding::default_external)
+      @basic_quote_characters = v.encode(Reline::IOGate.encoding)
     end
 
     def completer_quote_characters=(v)
-      @completer_quote_characters = v.encode(Encoding::default_external)
+      @completer_quote_characters = v.encode(Reline::IOGate.encoding)
     end
 
     def filename_quote_characters=(v)
-      @filename_quote_characters = v.encode(Encoding::default_external)
+      @filename_quote_characters = v.encode(Reline::IOGate.encoding)
     end
 
     def special_prefixes=(v)
-      @special_prefixes = v.encode(Encoding::default_external)
+      @special_prefixes = v.encode(Reline::IOGate.encoding)
+    end
+
+    def completion_case_fold=(v)
+      @config.completion_ignore_case = v
+    end
+
+    def completion_case_fold
+      @config.completion_ignore_case
+    end
+
+    def completion_quote_character
+      @completion_quote_character
     end
 
     def completion_proc=(p)
@@ -191,7 +205,7 @@ module Reline
       otio = Reline::IOGate.prep
 
       may_req_ambiguous_char_width
-      line_editor.reset(prompt)
+      line_editor.reset(prompt, encoding: Reline::IOGate.encoding)
       if multiline
         line_editor.multiline_on
         if block_given?
@@ -202,6 +216,7 @@ module Reline
       end
       line_editor.output = output
       line_editor.completion_proc = completion_proc
+      line_editor.completion_append_character = completion_append_character
       line_editor.output_modifier_proc = output_modifier_proc
       line_editor.prompt_proc = prompt_proc
       line_editor.auto_indent_proc = auto_indent_proc
@@ -321,7 +336,7 @@ module Reline
       @ambiguous_width = 2 if Reline::IOGate == Reline::GeneralIO or STDOUT.is_a?(File)
       return if ambiguous_width
       Reline::IOGate.move_cursor_column(0)
-      print "\u{25bd}"
+      output.write "\u{25bd}"
       @ambiguous_width = Reline::IOGate.cursor_pos.x
       Reline::IOGate.move_cursor_column(0)
       Reline::IOGate.erase_after_cursor
@@ -335,12 +350,14 @@ module Reline
   # Documented API
   #--------------------------------------------------------
 
-  (Core::ATTR_READER_NAMES + Core::ATTR_ACCESSOR_NAMES).each { |name|
+  (Core::ATTR_READER_NAMES).each { |name|
     def_single_delegators :core, "#{name}", "#{name}="
   }
   def_single_delegators :core, :input=, :output=
   def_single_delegators :core, :vi_editing_mode, :emacs_editing_mode
   def_single_delegators :core, :readline
+  def_single_delegators :core, :completion_case_fold, :completion_case_fold=
+  def_single_delegators :core, :completion_quote_character
   def_instance_delegators self, :readline
   private :readline
 
@@ -367,16 +384,22 @@ module Reline
   def_single_delegator :line_editor, :rerender, :redisplay
   def_single_delegators :core, :vi_editing_mode?, :emacs_editing_mode?
   def_single_delegators :core, :ambiguous_width
+  def_single_delegators :core, :last_incremental_search
+  def_single_delegators :core, :last_incremental_search=
 
   def_single_delegators :core, :readmultiline
   def_instance_delegators self, :readmultiline
   private :readmultiline
 
+  def self.encoding_system_needs
+    self.core.encoding
+  end
+
   def self.core
     @core ||= Core.new { |core|
       core.config = Reline::Config.new
       core.key_stroke = Reline::KeyStroke.new(core.config)
-      core.line_editor = Reline::LineEditor.new(core.config)
+      core.line_editor = Reline::LineEditor.new(core.config, Reline::IOGate.encoding)
 
       core.basic_word_break_characters = " \t\n`><=;|&{("
       core.completer_word_break_characters = " \t\n`><=;|&{("
@@ -390,14 +413,11 @@ module Reline
   def self.line_editor
     core.line_editor
   end
-
-  HISTORY = History.new(core.config)
 end
 
 if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
   require 'reline/windows'
-  if Reline::Windows.get_screen_size == [0, 0]
-    # Maybe Mintty on Cygwin
+  if Reline::Windows.msys_tty?
     require 'reline/ansi'
     Reline::IOGate = Reline::ANSI
   else
@@ -407,4 +427,5 @@ else
   require 'reline/ansi'
   Reline::IOGate = Reline::ANSI
 end
+Reline::HISTORY = Reline::History.new(Reline.core.config)
 require 'reline/general_io'

data/lib/reline/ansi.rb

@@ -1,16 +1,49 @@
+require 'io/console'
+
 class Reline::ANSI
+  def self.encoding
+    Encoding.default_external
+  end
+
+  def self.win?
+    false
+  end
+
   RAW_KEYSTROKE_CONFIG = {
+    # Console (80x25)
+    [27, 91, 49, 126] => :ed_move_to_beg, # Home
+    [27, 91, 52, 126] => :ed_move_to_end, # End
+    [27, 91, 51, 126] => :key_delete,     # Del
     [27, 91, 65] => :ed_prev_history,     # ↑
     [27, 91, 66] => :ed_next_history,     # ↓
     [27, 91, 67] => :ed_next_char,        # →
     [27, 91, 68] => :ed_prev_char,        # ←
-    [27, 91, 51, 126] => :key_delete,     # Del
-    [27, 91, 49, 126] => :ed_move_to_beg, # Home
-    [27, 91, 52, 126] => :ed_move_to_end, # End
+
+    # KDE
     [27, 91, 72] => :ed_move_to_beg,      # Home
     [27, 91, 70] => :ed_move_to_end,      # End
+    # Del is 0x08
+    [27, 71, 65] => :ed_prev_history,     # ↑
+    [27, 71, 66] => :ed_next_history,     # ↓
+    [27, 71, 67] => :ed_next_char,        # →
+    [27, 71, 68] => :ed_prev_char,        # ←
+
+    # GNOME
+    [27, 79, 72] => :ed_move_to_beg,      # Home
+    [27, 79, 70] => :ed_move_to_end,      # End
+    # Del is 0x08
+    # Arrow keys are the same of KDE
+
+    # others
     [27, 32] => :em_set_mark,             # M-<space>
     [24, 24] => :em_exchange_mark,        # C-x C-x TODO also add Windows
+    [27, 91, 49, 59, 53, 67] => :em_next_word, # Ctrl+→
+    [27, 91, 49, 59, 53, 68] => :ed_prev_word, # Ctrl+←
+
+    [27, 79, 65] => :ed_prev_history,     # ↑
+    [27, 79, 66] => :ed_next_history,     # ↓
+    [27, 79, 67] => :ed_next_char,        # →
+    [27, 79, 68] => :ed_prev_char,        # ←
   }
 
   @@input = STDIN
@@ -28,7 +61,8 @@ class Reline::ANSI
     unless @@buf.empty?
       return @@buf.shift
     end
-    @@input.getbyte
+    c = @@input.raw(intr: true, &:getbyte)
+    (c == 0x16 && @@input.raw(min: 0, tim: 0, &:getbyte)) || c
   end
 
   def self.ungetc(c)
@@ -36,16 +70,23 @@ class Reline::ANSI
   end
 
   def self.retrieve_keybuffer
+    begin
       result = select([@@input], [], [], 0.001)
       return if result.nil?
       str = @@input.read_nonblock(1024)
       str.bytes.each do |c|
         @@buf.push(c)
       end
+    rescue EOFError
+    end
   end
 
   def self.get_screen_size
-    @@input.winsize
+    s = @@input.winsize
+    return s if s[0] > 0 && s[1] > 0
+    s = [ENV["LINES"].to_i, ENV["COLUMNS"].to_i]
+    return s if s[0] > 0 && s[1] > 0
+    [24, 80]
   rescue Errno::ENOTTY
     [24, 80]
   end
@@ -60,14 +101,18 @@ class Reline::ANSI
   def self.cursor_pos
     begin
       res = ''
+      m = nil
       @@input.raw do |stdin|
         @@output << "\e[6n"
         @@output.flush
         while (c = stdin.getc) != 'R'
           res << c if c
         end
+        m = res.match(/\e\[(?<row>\d+);(?<column>\d+)/)
+        (m.pre_match + m.post_match).chars.reverse_each do |ch|
+          stdin.ungetc ch
+        end
       end
-      m = res.match(/(?<row>\d+);(?<column>\d+)/)
       column = m[:column].to_i - 1
       row = m[:row].to_i - 1
     rescue Errno::ENOTTY
@@ -79,12 +124,12 @@ class Reline::ANSI
   end
 
   def self.move_cursor_column(x)
-    print "\e[#{x + 1}G"
+    @@output.write "\e[#{x + 1}G"
   end
 
   def self.move_cursor_up(x)
     if x > 0
-      print "\e[#{x}A" if x > 0
+      @@output.write "\e[#{x}A" if x > 0
     elsif x < 0
       move_cursor_down(-x)
     end
@@ -92,24 +137,24 @@ class Reline::ANSI
 
   def self.move_cursor_down(x)
     if x > 0
-      print "\e[#{x}B" if x > 0
+      @@output.write "\e[#{x}B" if x > 0
     elsif x < 0
       move_cursor_up(-x)
     end
   end
 
   def self.erase_after_cursor
-    print "\e[K"
+    @@output.write "\e[K"
   end
 
   def self.scroll_down(x)
     return if x.zero?
-    print "\e[#{x}S"
+    @@output.write "\e[#{x}S"
   end
 
   def self.clear_screen
-    print "\e[2J"
-    print "\e[1;1H"
+    @@output.write "\e[2J"
+    @@output.write "\e[1;1H"
   end
 
   @@old_winch_handler = nil
@@ -120,24 +165,12 @@ class Reline::ANSI
   def self.prep
     retrieve_keybuffer
     int_handle = Signal.trap('INT', 'IGNORE')
-    otio = `stty -g`.chomp
-    setting = ' -echo -icrnl cbreak'
-    stty = `stty -a`
-    if /-parenb\b/ =~ stty
-      setting << ' pass8'
-    end
-    if /\bdsusp *=/ =~ stty
-      setting << ' dsusp undef'
-    end
-    setting << ' -ixoff'
-    `stty #{setting}`
     Signal.trap('INT', int_handle)
-    otio
+    nil
   end
 
   def self.deprep(otio)
     int_handle = Signal.trap('INT', 'IGNORE')
-    system("stty #{otio}", err: File::NULL)
     Signal.trap('INT', int_handle)
     Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler
   end

data/lib/reline/config.rb

@@ -157,7 +157,7 @@ class Reline::Config
     case directive
     when 'if'
       condition = false
-      case args # TODO: variables
+      case args
       when 'mode'
       when 'term'
       when 'version'
@@ -184,9 +184,8 @@ class Reline::Config
 
   def bind_variable(name, value)
     case name
-    when VARIABLE_NAMES then
-      variable_name = :"@#{name.tr(?-, ?_)}"
-      instance_variable_set(variable_name, value.nil? || value == '1' || value == 'on')
+    when 'history-size'
+      @history_size = value.to_i
     when 'bell-style'
       @bell_style =
         case value
@@ -225,6 +224,9 @@ class Reline::Config
       end
     when 'keyseq-timeout'
       @keyseq_timeout = value.to_i
+    when *VARIABLE_NAMES then
+      variable_name = :"@#{name.tr(?-, ?_)}"
+      instance_variable_set(variable_name, value.nil? || value == '1' || value == 'on')
     end
   end
 

data/lib/reline/general_io.rb

@@ -1,6 +1,14 @@
 require 'timeout'
 
 class Reline::GeneralIO
+  def self.encoding
+    RUBY_PLATFORM =~ /mswin|mingw/ ? Encoding::UTF_8 : Encoding::default_external
+  end
+
+  def self.win?
+    false
+  end
+
   RAW_KEYSTROKE_CONFIG = {}
 
   @@buf = []

data/lib/reline/history.rb

@@ -13,13 +13,13 @@ class Reline::History < Array
   end
 
   def [](index)
-    index = check_index(index)
+    index = check_index(index) unless index.is_a?(Range)
     super(index)
   end
 
   def []=(index, val)
     index = check_index(index)
-    super(index, String.new(val, encoding: Encoding::default_external))
+    super(index, String.new(val, encoding: Reline.encoding_system_needs))
   end
 
   def concat(*val)
@@ -39,12 +39,12 @@ class Reline::History < Array
         val.shift(diff)
       end
     end
-    super(*(val.map{ |v| String.new(v, encoding: Encoding::default_external) }))
+    super(*(val.map{ |v| String.new(v, encoding: Reline.encoding_system_needs) }))
   end
 
   def <<(val)
     shift if size + 1 > @config.history_size
-    super(String.new(val, encoding: Encoding::default_external))
+    super(String.new(val, encoding: Reline.encoding_system_needs))
   end
 
   private def check_index(index)

data/lib/reline/key_actor/emacs.rb

@@ -9,7 +9,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
     #   3 ^C
     :ed_ignore,
     #   4 ^D
-    :em_delete_or_list,
+    :em_delete,
     #   5 ^E
     :ed_move_to_end,
     #   6 ^F
@@ -39,7 +39,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
     #  18 ^R
     :ed_search_prev_history,
     #  19 ^S
-    :ed_ignore,
+    :ed_search_next_history,
     #  20 ^T
     :ed_transpose_chars,
     #  21 ^U