reline 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb24e6d3114b6debe540928f1299fd10d420ff447f90401c9a8249b12804b7d
-  data.tar.gz: 046dfcfa706a95f62acb152238cae3680f918f9af2c9a52eee4fa4e5771ebdbc
+  metadata.gz: f47cc0525de297744dff41dc87b9a4ac5c9ff1cad21da7f60a41aa4b17bd1b0e
+  data.tar.gz: '04681f2a2dc431f65fa9f2df68c8b7aa1955a7a4032b8d6d5483984e236d4c9b'
 SHA512:
-  metadata.gz: a9a1abfe4febd8da98052386b0cca9a4b3c9f333c0a53c439d5980cad64c3b2f9f75c35d2498e42beadd4cea2f6a7d90c005d0112317b8ea90f89fd45b0f8632
-  data.tar.gz: 6f482d37f4c85ab5f0a5df08e069f81c5289b7bedbcea105a0601a7174bd3ca314c0a04750e2bba91cb31ad7bdc7f56afa4f3b8398bf2bd80e635e356be12615
+  metadata.gz: ad38bf76659bc7553ebf084fd4aeedf6aba7cba1a2860fc78af0683222109216d59bdb3b4bf66962ce9a640b9033d21f707442151834e9ccc21c6fc8d115347b
+  data.tar.gz: 95d9d943870e64897076cdc97750f6110817bc4ad14e958755164aa862785d7e48399465f7997f900547f797e6304cf48d6761f78612651ebe7aa6dca505fab3

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.com/ruby/reline.svg?branch=master)](https://travis-ci.com/ruby/reline)
+
 # Reline
 
 Reline is compatible with the API of Ruby's stdlib 'readline', GNU Readline and Editline by pure Ruby implementation.

data/lib/reline.rb

@@ -1,5 +1,6 @@
 require 'io/console'
 require 'timeout'
+require 'forwardable'
 require 'reline/version'
 require 'reline/config'
 require 'reline/key_actor'
@@ -8,404 +9,390 @@ require 'reline/line_editor'
 require 'reline/history'
 
 module Reline
-  Key = Struct.new('Key', :char, :combined_char, :with_meta)
-
-  extend self
   FILENAME_COMPLETION_PROC = nil
   USERNAME_COMPLETION_PROC = nil
 
-  if RUBY_PLATFORM =~ /mswin|mingw/
-    IS_WINDOWS = true
-  else
-    IS_WINDOWS = false
-  end
-
+  Key = Struct.new('Key', :char, :combined_char, :with_meta)
   CursorPos = Struct.new(:x, :y)
 
-  @@config = Reline::Config.new
-  @@key_stroke = Reline::KeyStroke.new(@@config)
-  @@line_editor = Reline::LineEditor.new(@@config)
-  @@ambiguous_width = nil
-
-  HISTORY = History.new(@@config)
-
-  @@completion_append_character = nil
-  def self.completion_append_character
-    @@completion_append_character
-  end
-  def self.completion_append_character=(val)
-    if val.nil?
-      @@completion_append_character = nil
-    elsif val.size == 1
-      @@completion_append_character = val.encode(Encoding::default_external)
-    elsif val.size > 1
-      @@completion_append_character = val[0].encode(Encoding::default_external)
+  class Core
+    if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      IS_WINDOWS = true
     else
-      @@completion_append_character = nil
+      IS_WINDOWS = false
     end
-  end
-
-  @@basic_word_break_characters = " \t\n`><=;|&{("
-  def self.basic_word_break_characters
-    @@basic_word_break_characters
-  end
-  def self.basic_word_break_characters=(v)
-    @@basic_word_break_characters = v.encode(Encoding::default_external)
-  end
-
-  @@completer_word_break_characters = @@basic_word_break_characters.dup
-  def self.completer_word_break_characters
-    @@completer_word_break_characters
-  end
-  def self.completer_word_break_characters=(v)
-    @@completer_word_break_characters = v.encode(Encoding::default_external)
-  end
-
-  @@basic_quote_characters = '"\''
-  def self.basic_quote_characters
-    @@basic_quote_characters
-  end
-  def self.basic_quote_characters=(v)
-    @@basic_quote_characters = v.encode(Encoding::default_external)
-  end
 
-  @@completer_quote_characters = '"\''
-  def self.completer_quote_characters
-    @@completer_quote_characters
-  end
-  def self.completer_quote_characters=(v)
-    @@completer_quote_characters = v.encode(Encoding::default_external)
-  end
-
-  @@filename_quote_characters = ''
-  def self.filename_quote_characters
-    @@filename_quote_characters
-  end
-  def self.filename_quote_characters=(v)
-    @@filename_quote_characters = v.encode(Encoding::default_external)
-  end
-
-  @@special_prefixes = ''
-  def self.special_prefixes
-    @@special_prefixes
-  end
-  def self.special_prefixes=(v)
-    @@special_prefixes = v.encode(Encoding::default_external)
-  end
-
-  @@completion_case_fold = nil
-  def self.completion_case_fold
-    @@completion_case_fold
-  end
-  def self.completion_case_fold=(v)
-    @@completion_case_fold = v
-  end
+    ATTR_READER_NAMES = %i(
+      completion_append_character
+      basic_word_break_characters
+      completer_word_break_characters
+      basic_quote_characters
+      completer_quote_characters
+      filename_quote_characters
+      special_prefixes
+      completion_proc
+      output_modifier_proc
+      prompt_proc
+      auto_indent_proc
+      pre_input_hook
+      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_reader :output
+
+    def initialize
+      self.output = STDOUT
+      yield self
+    end
 
-  @@completion_proc = nil
-  def self.completion_proc
-    @@completion_proc
-  end
-  def self.completion_proc=(p)
-    raise ArgumentError unless p.is_a?(Proc)
-    @@completion_proc = p
-  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)
+      elsif val.size > 1
+        @completion_append_character = val[0].encode(Encoding::default_external)
+      else
+        @completion_append_character = nil
+      end
+    end
 
-  @@output_modifier_proc = nil
-  def self.output_modifier_proc
-    @@output_modifier_proc
-  end
-  def self.output_modifier_proc=(p)
-    raise ArgumentError unless p.is_a?(Proc)
-    @@output_modifier_proc = p
-  end
+    def basic_word_break_characters=(v)
+      @basic_word_break_characters = v.encode(Encoding::default_external)
+    end
 
-  @@prompt_proc = nil
-  def self.prompt_proc
-    @@prompt_proc
-  end
-  def self.prompt_proc=(p)
-    raise ArgumentError unless p.is_a?(Proc)
-    @@prompt_proc = p
-  end
+    def completer_word_break_characters=(v)
+      @completer_word_break_characters = v.encode(Encoding::default_external)
+    end
 
-  @@auto_indent_proc = nil
-  def self.auto_indent_proc
-    @@auto_indent_proc
-  end
-  def self.auto_indent_proc=(p)
-    raise ArgumentError unless p.is_a?(Proc)
-    @@auto_indent_proc = p
-  end
+    def basic_quote_characters=(v)
+      @basic_quote_characters = v.encode(Encoding::default_external)
+    end
 
-  @@pre_input_hook = nil
-  def self.pre_input_hook
-    @@pre_input_hook
-  end
-  def self.pre_input_hook=(p)
-    @@pre_input_hook = p
-  end
+    def completer_quote_characters=(v)
+      @completer_quote_characters = v.encode(Encoding::default_external)
+    end
 
-  @@dig_perfect_match_proc = nil
-  def self.dig_perfect_match_proc
-    @@dig_perfect_match_proc
-  end
-  def self.dig_perfect_match_proc=(p)
-    raise ArgumentError unless p.is_a?(Proc)
-    @@dig_perfect_match_proc = p
-  end
+    def filename_quote_characters=(v)
+      @filename_quote_characters = v.encode(Encoding::default_external)
+    end
 
-  def self.insert_text(text)
-    @@line_editor&.insert_text(text)
-    self
-  end
+    def special_prefixes=(v)
+      @special_prefixes = v.encode(Encoding::default_external)
+    end
 
-  def self.redisplay
-    @@line_editor&.rerender
-  end
+    def completion_proc=(p)
+      raise ArgumentError unless p.is_a?(Proc)
+      @completion_proc = p
+    end
 
-  def self.line_buffer
-    @@line_editor&.line
-  end
+    def output_modifier_proc=(p)
+      raise ArgumentError unless p.is_a?(Proc)
+      @output_modifier_proc = p
+    end
 
-  def self.point
-    @@line_editor ? @@line_editor.byte_pointer : 0
-  end
+    def prompt_proc=(p)
+      raise ArgumentError unless p.is_a?(Proc)
+      @prompt_proc = p
+    end
 
-  def self.point=(val)
-    @@line_editor.byte_pointer = val
-  end
+    def auto_indent_proc=(p)
+      raise ArgumentError unless p.is_a?(Proc)
+      @auto_indent_proc = p
+    end
 
-  def self.delete_text(start = nil, length = nil)
-    @@line_editor&.delete_text(start, length)
-  end
+    def pre_input_hook=(p)
+      @pre_input_hook = p
+    end
 
-  private_class_method def self.test_mode
-    remove_const('IOGate') if const_defined?('IOGate')
-    const_set('IOGate', Reline::GeneralIO)
-    @@config.instance_variable_set(:@test_mode, true)
-    @@config.reset
-  end
+    def dig_perfect_match_proc=(p)
+      raise ArgumentError unless p.is_a?(Proc)
+      @dig_perfect_match_proc = p
+    end
 
-  def self.input=(val)
-    raise TypeError unless val.respond_to?(:getc) or val.nil?
-    if val.respond_to?(:getc)
-      if defined?(Reline::ANSI) and IOGate == Reline::ANSI
-        Reline::ANSI.input = val
-      elsif IOGate == Reline::GeneralIO
-        Reline::GeneralIO.input = val
+    def input=(val)
+      raise TypeError unless val.respond_to?(:getc) or val.nil?
+      if val.respond_to?(:getc)
+        if defined?(Reline::ANSI) and Reline::IOGate == Reline::ANSI
+          Reline::ANSI.input = val
+        elsif Reline::IOGate == Reline::GeneralIO
+          Reline::GeneralIO.input = val
+        end
       end
     end
-  end
 
-  @@output = STDOUT
-  def self.output=(val)
-    raise TypeError unless val.respond_to?(:write) or val.nil?
-    @@output = val
-    if defined?(Reline::ANSI) and IOGate == Reline::ANSI
-      Reline::ANSI.output = val
+    def output=(val)
+      raise TypeError unless val.respond_to?(:write) or val.nil?
+      @output = val
+      if defined?(Reline::ANSI) and Reline::IOGate == Reline::ANSI
+        Reline::ANSI.output = val
+      end
     end
-  end
-
-  def self.vi_editing_mode
-    @@config.editing_mode = :vi_insert
-    nil
-  end
-
-  def self.emacs_editing_mode
-    @@config.editing_mode = :emacs
-    nil
-  end
 
-  def self.vi_editing_mode?
-    @@config.editing_mode_is?(:vi_insert, :vi_command)
-  end
-
-  def self.emacs_editing_mode?
-    @@config.editing_mode_is?(:emacs)
-  end
+    def vi_editing_mode
+      config.editing_mode = :vi_insert
+      nil
+    end
 
-  def self.get_screen_size
-    Reline::IOGate.get_screen_size
-  end
+    def emacs_editing_mode
+      config.editing_mode = :emacs
+      nil
+    end
 
-  def eof?
-    @@line_editor.eof?
-  end
+    def vi_editing_mode?
+      config.editing_mode_is?(:vi_insert, :vi_command)
+    end
 
-  def readmultiline(prompt = '', add_hist = false, &confirm_multiline_termination)
-    unless confirm_multiline_termination
-      raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
+    def emacs_editing_mode?
+      config.editing_mode_is?(:emacs)
     end
-    inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
 
-    whole_buffer = @@line_editor.whole_buffer.dup
-    whole_buffer.taint
-    if add_hist and whole_buffer and whole_buffer.chomp.size > 0
-      Reline::HISTORY << whole_buffer
+    def get_screen_size
+      Reline::IOGate.get_screen_size
     end
 
-    @@line_editor.reset_line if @@line_editor.whole_buffer.nil?
-    whole_buffer
-  end
+    def readmultiline(prompt = '', add_hist = false, &confirm_multiline_termination)
+      unless confirm_multiline_termination
+        raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
+      end
+      inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
 
-  def readline(prompt = '', add_hist = false)
-    inner_readline(prompt, add_hist, false)
+      whole_buffer = line_editor.whole_buffer.dup
+      whole_buffer.taint
+      if add_hist and whole_buffer and whole_buffer.chomp.size > 0
+        Reline::HISTORY << whole_buffer
+      end
 
-    line = @@line_editor.line.dup
-    line.taint
-    if add_hist and line and line.chomp.size > 0
-      Reline::HISTORY << line.chomp
+      line_editor.reset_line if line_editor.whole_buffer.nil?
+      whole_buffer
     end
 
-    @@line_editor.reset_line if @@line_editor.line.nil?
-    line
-  end
+    def readline(prompt = '', add_hist = false)
+      inner_readline(prompt, add_hist, false)
 
-  def inner_readline(prompt, add_hist, multiline, &confirm_multiline_termination)
-    if ENV['RELINE_STDERR_TTY']
-      $stderr.reopen(ENV['RELINE_STDERR_TTY'], 'w')
-      $stderr.sync = true
-      $stderr.puts "Reline is used by #{Process.pid}"
-    end
-    otio = Reline::IOGate.prep
-
-    may_req_ambiguous_char_width
-    @@line_editor.reset(prompt)
-    if multiline
-      @@line_editor.multiline_on
-      if block_given?
-        @@line_editor.confirm_multiline_termination_proc = confirm_multiline_termination
+      line = line_editor.line.dup
+      line.taint
+      if add_hist and line and line.chomp.size > 0
+        Reline::HISTORY << line.chomp
       end
-    else
-      @@line_editor.multiline_off
+
+      line_editor.reset_line if line_editor.line.nil?
+      line
     end
-    @@line_editor.output = @@output
-    @@line_editor.completion_proc = @@completion_proc
-    @@line_editor.output_modifier_proc = @@output_modifier_proc
-    @@line_editor.prompt_proc = @@prompt_proc
-    @@line_editor.auto_indent_proc = @@auto_indent_proc
-    @@line_editor.dig_perfect_match_proc = @@dig_perfect_match_proc
-    @@line_editor.pre_input_hook = @@pre_input_hook
-    @@line_editor.rerender
-
-    unless @@config.test_mode
-      @@config.read
-      @@config.reset_default_key_bindings
-      Reline::IOGate::RAW_KEYSTROKE_CONFIG.each_pair do |key, func|
-        @@config.add_default_key_binding(key, func)
+
+    private def inner_readline(prompt, add_hist, multiline, &confirm_multiline_termination)
+      if ENV['RELINE_STDERR_TTY']
+        $stderr.reopen(ENV['RELINE_STDERR_TTY'], 'w')
+        $stderr.sync = true
+        $stderr.puts "Reline is used by #{Process.pid}"
+      end
+      otio = Reline::IOGate.prep
+
+      may_req_ambiguous_char_width
+      line_editor.reset(prompt)
+      if multiline
+        line_editor.multiline_on
+        if block_given?
+          line_editor.confirm_multiline_termination_proc = confirm_multiline_termination
+        end
+      else
+        line_editor.multiline_off
+      end
+      line_editor.output = output
+      line_editor.completion_proc = completion_proc
+      line_editor.output_modifier_proc = output_modifier_proc
+      line_editor.prompt_proc = prompt_proc
+      line_editor.auto_indent_proc = auto_indent_proc
+      line_editor.dig_perfect_match_proc = dig_perfect_match_proc
+      line_editor.pre_input_hook = pre_input_hook
+      line_editor.rerender
+
+      unless config.test_mode
+        config.read
+        config.reset_default_key_bindings
+        Reline::IOGate::RAW_KEYSTROKE_CONFIG.each_pair do |key, func|
+          config.add_default_key_binding(key, func)
+        end
       end
-    end
 
-    begin
-      loop do
-        read_io(@@config.keyseq_timeout) { |inputs|
-          inputs.each { |c|
-            @@line_editor.input_key(c)
-            @@line_editor.rerender
+      begin
+        loop do
+          read_io(config.keyseq_timeout) { |inputs|
+            inputs.each { |c|
+              line_editor.input_key(c)
+              line_editor.rerender
+            }
           }
-        }
-        break if @@line_editor.finished?
+          break if line_editor.finished?
+        end
+        Reline::IOGate.move_cursor_column(0)
+      rescue StandardError => e
+        line_editor.finalize
+        Reline::IOGate.deprep(otio)
+        raise e
       end
-      Reline::IOGate.move_cursor_column(0)
-    rescue StandardError => e
-      @@line_editor.finalize
+
+      line_editor.finalize
       Reline::IOGate.deprep(otio)
-      raise e
     end
 
-    @@line_editor.finalize
-    Reline::IOGate.deprep(otio)
-  end
-
-  # Keystrokes of GNU Readline will timeout it with the specification of
-  # "keyseq-timeout" when waiting for the 2nd character after the 1st one.
-  # If the 2nd character comes after 1st ESC without timeout it has a
-  # meta-property of meta-key to discriminate modified key with meta-key
-  # from multibyte characters that come with 8th bit on.
-  #
-  # GNU Readline will wait for the 2nd character with "keyseq-timeout"
-  # milli-seconds but wait forever after 3rd characters.
-  def read_io(keyseq_timeout, &block)
-    buffer = []
-    loop do
-      c = Reline::IOGate.getc
-      buffer << c
-      result = @@key_stroke.match_status(buffer)
-      case result
-      when :matched
-        block.(@@key_stroke.expand(buffer).map{ |c| Reline::Key.new(c, c, false) })
-        break
-      when :matching
-        if buffer.size == 1
-          begin
-            succ_c = nil
-            Timeout.timeout(keyseq_timeout / 1000.0) {
-              succ_c = Reline::IOGate.getc
-            }
-          rescue Timeout::Error # cancel matching only when first byte
-            block.([Reline::Key.new(c, c, false)])
-            break
-          else
-            if @@key_stroke.match_status(buffer.dup.push(succ_c)) == :unmatched
-              if c == "\e".ord
-                block.([Reline::Key.new(succ_c, succ_c | 0b10000000, true)])
-              else
-                block.([Reline::Key.new(c, c, false), Reline::Key.new(succ_c, succ_c, false)])
-              end
+    # Keystrokes of GNU Readline will timeout it with the specification of
+    # "keyseq-timeout" when waiting for the 2nd character after the 1st one.
+    # If the 2nd character comes after 1st ESC without timeout it has a
+    # meta-property of meta-key to discriminate modified key with meta-key
+    # from multibyte characters that come with 8th bit on.
+    #
+    # GNU Readline will wait for the 2nd character with "keyseq-timeout"
+    # milli-seconds but wait forever after 3rd characters.
+    private def read_io(keyseq_timeout, &block)
+      buffer = []
+      loop do
+        c = Reline::IOGate.getc
+        buffer << c
+        result = key_stroke.match_status(buffer)
+        case result
+        when :matched
+          block.(key_stroke.expand(buffer).map{ |c| Reline::Key.new(c, c, false) })
+          break
+        when :matching
+          if buffer.size == 1
+            begin
+              succ_c = nil
+              Timeout.timeout(keyseq_timeout / 1000.0) {
+                succ_c = Reline::IOGate.getc
+              }
+            rescue Timeout::Error # cancel matching only when first byte
+              block.([Reline::Key.new(c, c, false)])
               break
             else
-              Reline::IOGate.ungetc(succ_c)
+              if key_stroke.match_status(buffer.dup.push(succ_c)) == :unmatched
+                if c == "\e".ord
+                  block.([Reline::Key.new(succ_c, succ_c | 0b10000000, true)])
+                else
+                  block.([Reline::Key.new(c, c, false), Reline::Key.new(succ_c, succ_c, false)])
+                end
+                break
+              else
+                Reline::IOGate.ungetc(succ_c)
+              end
             end
           end
+        when :unmatched
+          if buffer.size == 1 and c == "\e".ord
+            read_escaped_key(keyseq_timeout, buffer, block)
+          else
+            block.(buffer.map{ |c| Reline::Key.new(c, c, false) })
+          end
+          break
         end
-      when :unmatched
-        if buffer.size == 1 and c == "\e".ord
-          read_escaped_key(keyseq_timeout, buffer, block)
-        else
-          block.(buffer.map{ |c| Reline::Key.new(c, c, false) })
-        end
-        break
       end
     end
-  end
 
-  def read_escaped_key(keyseq_timeout, buffer, block)
-    begin
-      escaped_c = nil
-      Timeout.timeout(keyseq_timeout / 1000.0) {
-        escaped_c = Reline::IOGate.getc
-      }
-    rescue Timeout::Error # independent ESC
-      block.([Reline::Key.new(c, c, false)])
-    else
-      if escaped_c.nil?
+    private def read_escaped_key(keyseq_timeout, buffer, block)
+      begin
+        escaped_c = nil
+        Timeout.timeout(keyseq_timeout / 1000.0) {
+          escaped_c = Reline::IOGate.getc
+        }
+      rescue Timeout::Error # independent ESC
         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)])
+        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
       end
     end
+
+    private def may_req_ambiguous_char_width
+      @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}"
+      @ambiguous_width = Reline::IOGate.cursor_pos.x
+      Reline::IOGate.move_cursor_column(0)
+      Reline::IOGate.erase_after_cursor
+    end
   end
 
-  def may_req_ambiguous_char_width
-    @@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}"
-    @@ambiguous_width = Reline::IOGate.cursor_pos.x
-    Reline::IOGate.move_cursor_column(0)
-    Reline::IOGate.erase_after_cursor
+  extend Forwardable
+  extend SingleForwardable
+
+  #--------------------------------------------------------
+  # Documented API
+  #--------------------------------------------------------
+
+  (Core::ATTR_READER_NAMES + Core::ATTR_ACCESSOR_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_instance_delegators self, :readline
+
+
+  #--------------------------------------------------------
+  # Undocumented API
+  #--------------------------------------------------------
+
+  # Testable in original
+  def_single_delegators :core, :get_screen_size
+  def_single_delegators :line_editor, :eof?
+  def_instance_delegators self, :eof?
+  def_single_delegators :line_editor, :delete_text
+  def_single_delegator :line_editor, :line, :line_buffer
+  def_single_delegator :line_editor, :byte_pointer, :point
+  def_single_delegator :line_editor, :byte_pointer=, :point=
+
+  def self.insert_text(*args, &block)
+    line_editor.insert_text(*args, &block)
+    self
+  end
+
+  # Untestable in original
+  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, :readmultiline
+  def_instance_delegators self, :readmultiline
+
+  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.basic_word_break_characters = " \t\n`><=;|&{("
+      core.completer_word_break_characters = " \t\n`><=;|&{("
+      core.basic_quote_characters = '"\''
+      core.completer_quote_characters = '"\''
+      core.filename_quote_characters = ""
+      core.special_prefixes = ""
+    }
   end
 
-  def self.ambiguous_width
-    @@ambiguous_width
+  def self.line_editor
+    core.line_editor
   end
+
+  HISTORY = History.new(core.config)
 end
 
-if Reline::IS_WINDOWS
+if Reline::Core::IS_WINDOWS
   require 'reline/windows'
   Reline::IOGate = Reline::Windows
 else

data/lib/reline/ansi.rb

@@ -106,6 +106,11 @@ class Reline::ANSI
     print "\e[1;1H"
   end
 
+  @@old_winch_handler = nil
+  def self.set_winch_handler(&handler)
+    @@old_winch_handler = Signal.trap('WINCH', &handler)
+  end
+
   def self.prep
     int_handle = Signal.trap('INT', 'IGNORE')
     otio = `stty -g`.chomp
@@ -123,5 +128,6 @@ class Reline::ANSI
     int_handle = Signal.trap('INT', 'IGNORE')
     `stty #{otio}`
     Signal.trap('INT', int_handle)
+    Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler
   end
 end

data/lib/reline/config.rb

@@ -126,20 +126,19 @@ class Reline::Config
       no += 1
 
       line = line.chomp.lstrip
-      if line[0, 1] == '$'
+      if line.start_with?('$')
         handle_directive(line[1..-1], file, no)
         next
       end
 
       next if @skip_section
 
-      if line.match(/^set +([^ ]+) +([^ ]+)/i)
+      case line
+      when /^set +([^ ]+) +([^ ]+)/i
         var, value = $1.downcase, $2.downcase
         bind_variable(var, value)
         next
-      end
-
-      if line =~ /\s*("#{KEYSEQ_PATTERN}+")\s*:\s*(.*)\s*$/
+      when /\s*("#{KEYSEQ_PATTERN}+")\s*:\s*(.*)\s*$/o
         key, func_name = $1, $2
         keystroke, func = bind_key(key, func_name)
         next unless keystroke

data/lib/reline/general_io.rb

@@ -56,6 +56,9 @@ class Reline::GeneralIO
   def self.set_screen_size(rows, columns)
   end
 
+  def self.set_winch_handler(&handler)
+  end
+
   def self.prep
   end
 

data/lib/reline/line_editor.rb

@@ -69,6 +69,63 @@ class Reline::LineEditor
       Reline::IOGate.move_cursor_column(0)
       @old_trap.call if @old_trap.respond_to?(:call) # can also be string, ex: "DEFAULT"
     }
+    Reline::IOGate.set_winch_handler do
+      @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
+      old_screen_size = @screen_size
+      @screen_size = Reline::IOGate.get_screen_size
+      if old_screen_size.last < @screen_size.last # columns increase
+        @rerender_all = true
+        rerender
+      else
+        special_prompt = nil
+        if @vi_arg
+          prompt = "(arg: #{@vi_arg}) "
+          prompt_width = calculate_width(prompt)
+          special_prompt = prompt
+        elsif @searching_prompt
+          prompt = @searching_prompt
+          prompt_width = calculate_width(prompt)
+          special_prompt = prompt
+        else
+          prompt = @prompt
+          prompt_width = calculate_width(prompt, true)
+        end
+        back = 0
+        new_buffer = whole_lines
+        prompt_list = nil
+        if @prompt_proc
+          prompt_list = @prompt_proc.(new_buffer)
+          prompt_list[@line_index] = special_prompt if special_prompt
+          prompt = prompt_list[@line_index]
+          prompt_width = calculate_width(prompt, true)
+        end
+        new_buffer.each_with_index do |line, index|
+          prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc
+          width = prompt_width + calculate_width(line)
+          height = calculate_height_by_width(width)
+          back += height
+        end
+        @highest_in_all = back
+        @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
+        @first_line_started_from =
+          if @line_index.zero?
+            0
+          else
+            @buffer_of_lines[0..(@line_index - 1)].inject(0) { |result, line|
+              result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list
+            }
+          end
+        if @prompt_proc
+          prompt = prompt_list[@line_index]
+          prompt_width = calculate_width(prompt, true)
+        end
+        calculate_nearest_cursor
+        @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
+        Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
+        @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
+        @rerender_all = true
+      end
+    end
   end
 
   def finalize
@@ -241,7 +298,7 @@ class Reline::LineEditor
     @byte_pointer = new_byte_pointer
   end
 
-  def rerender # TODO: support physical and logical lines
+  def rerender
     return if @line.nil?
     if @menu_info
       scroll_down(@highest_in_all - @first_line_started_from)
@@ -255,12 +312,15 @@ class Reline::LineEditor
       move_cursor_up(@highest_in_all - 1 - @first_line_started_from)
       @menu_info = nil
     end
+    special_prompt = nil
     if @vi_arg
       prompt = "(arg: #{@vi_arg}) "
       prompt_width = calculate_width(prompt)
+      special_prompt = prompt
     elsif @searching_prompt
       prompt = @searching_prompt
       prompt_width = calculate_width(prompt)
+      special_prompt = prompt
     else
       prompt = @prompt
       prompt_width = calculate_width(prompt, true)
@@ -272,6 +332,7 @@ class Reline::LineEditor
       prompt_list = nil
       if @prompt_proc
         prompt_list = @prompt_proc.(whole_lines)
+        prompt_list[@line_index] = special_prompt if special_prompt
         prompt = prompt_list[@line_index]
         prompt_width = calculate_width(prompt, true)
       end
@@ -303,6 +364,7 @@ class Reline::LineEditor
       prompt_list = nil
       if @prompt_proc
         prompt_list = @prompt_proc.(new_lines)
+        prompt_list[@line_index] = special_prompt if special_prompt
         prompt = prompt_list[@line_index]
         prompt_width = calculate_width(prompt, true)
       end
@@ -372,6 +434,7 @@ class Reline::LineEditor
       prompt_list = nil
       if @prompt_proc
         prompt_list = @prompt_proc.(new_buffer)
+        prompt_list[@line_index] = special_prompt if special_prompt
         prompt = prompt_list[@line_index]
         prompt_width = calculate_width(prompt, true)
       end
@@ -429,6 +492,7 @@ class Reline::LineEditor
       prompt_list = nil
       if @prompt_proc
         prompt_list = @prompt_proc.(whole_lines)
+        prompt_list[@line_index] = special_prompt if special_prompt
         prompt = prompt_list[@line_index]
         prompt_width = calculate_width(prompt, true)
       end
@@ -801,17 +865,25 @@ class Reline::LineEditor
     rest = nil
     break_pointer = nil
     quote = nil
+    closing_quote = nil
+    escaped_quote = nil
     i = 0
     while i < @byte_pointer do
       slice = @line.byteslice(i, @byte_pointer - i)
-      if quote and slice.start_with?(/(?!\\)#{Regexp.escape(quote)}/) # closing "
+      unless slice.valid_encoding?
+        i += 1
+        next
+      end
+      if quote and slice.start_with?(closing_quote)
         quote = nil
         i += 1
-      elsif quote and slice.start_with?(/\\#{Regexp.escape(quote)}/) # escaped \"
+      elsif quote and slice.start_with?(escaped_quote)
         # skip
         i += 2
       elsif slice =~ quote_characters_regexp # find new "
         quote = $&
+        closing_quote = /(?!\\)#{Regexp.escape(quote)}/
+        escaped_quote = /\\#{Regexp.escape(quote)}/
         i += 1
       elsif not quote and slice =~ word_break_regexp
         rest = $'
@@ -839,11 +911,7 @@ class Reline::LineEditor
     else
       temp_buffer[@line_index] = @line
     end
-    if temp_buffer.any?{ |l| l.chomp != '' }
-      @confirm_multiline_termination_proc.(temp_buffer.join("\n") + "\n")
-    else
-      false
-    end
+    @confirm_multiline_termination_proc.(temp_buffer.join("\n") + "\n")
   end
 
   def insert_text(text)
@@ -1697,8 +1765,8 @@ class Reline::LineEditor
   end
 
   private def ed_delete_next_char(key, arg: 1)
-    unless @line.empty?
-      byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
+    byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
+    unless @line.empty? || byte_size == 0
       @line, mbchar = byteslice!(@line, @byte_pointer, byte_size)
       copy_for_vi(mbchar)
       width = Reline::Unicode.get_mbchar_width(mbchar)

data/lib/reline/unicode/east_asian_width.rb

@@ -1,6 +1,6 @@
 class Reline::Unicode::EastAsianWidth
   # This is based on EastAsianWidth.txt
-  # http://www.unicode.org/Public/10.0.0/ucd/EastAsianWidth.txt
+  # http://www.unicode.org/Public/12.1.0/ucd/EastAsianWidth.txt
 
   # Fullwidth
   TYPE_F = /^(

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/reline/windows.rb

@@ -51,7 +51,9 @@ class Reline::Windows
 
   VK_MENU = 0x12
   VK_SHIFT = 0x10
+  STD_INPUT_HANDLE = -10
   STD_OUTPUT_HANDLE = -11
+  WINDOW_BUFFER_SIZE_EVENT = 0x04
   @@getwch = Win32API.new('msvcrt', '_getwch', [], 'I')
   @@kbhit = Win32API.new('msvcrt', '_kbhit', [], 'I')
   @@GetKeyState = Win32API.new('user32', 'GetKeyState', ['L'], 'L')
@@ -61,6 +63,9 @@ class Reline::Windows
   @@FillConsoleOutputCharacter = Win32API.new('kernel32', 'FillConsoleOutputCharacter', ['L', 'L', 'L', 'L', 'P'], 'L')
   @@ScrollConsoleScreenBuffer = Win32API.new('kernel32', 'ScrollConsoleScreenBuffer', ['L', 'P', 'P', 'L', 'P'], 'L')
   @@hConsoleHandle = @@GetStdHandle.call(STD_OUTPUT_HANDLE)
+  @@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE)
+  @@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L')
+  @@ReadConsoleInput = Win32API.new('kernel32', 'ReadConsoleInput', ['L', 'P', 'L', 'P'], 'L')
   @@buf = []
 
   def self.getwch
@@ -81,6 +86,17 @@ class Reline::Windows
   end
 
   def self.getc
+    num_of_events = 0.chr * 8
+    while @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) != 0 and num_of_events.unpack('L').first > 0
+      input_record = 0.chr * 18
+      read_event = 0.chr * 4
+      if @@ReadConsoleInput.(@@hConsoleInputHandle, input_record, 1, read_event) != 0
+        event = input_record[0, 2].unpack('s*').first
+        if event == WINDOW_BUFFER_SIZE_EVENT
+          @@winch_handler.()
+        end
+      end
+    end
     unless @@buf.empty?
       return @@buf.shift
     end
@@ -122,16 +138,16 @@ class Reline::Windows
   end
 
   def self.get_screen_size
-    csbi = 0.chr * 24
+    csbi = 0.chr * 22
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
     csbi[0, 4].unpack('SS').reverse
   end
 
   def self.cursor_pos
-    csbi = 0.chr * 24
+    csbi = 0.chr * 22
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
     x = csbi[4, 2].unpack('s*').first
-    y = csbi[6, 4].unpack('s*').first
+    y = csbi[6, 2].unpack('s*').first
     Reline::CursorPos.new(x, y)
   end
 
@@ -181,6 +197,10 @@ class Reline::Windows
     raise NotImplementedError
   end
 
+  def self.set_winch_handler(&handler)
+    @@winch_handler = handler
+  end
+
   def self.prep
     # do nothing
     nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - aycabta
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.