reline 0.0.0 → 0.0.1

data/lib/reline/ansi.rb

@@ -1,35 +1,75 @@
-module Reline
-  def getc
+class Reline::ANSI
+  RAW_KEYSTROKE_CONFIG = {
+    [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
+  }.each_key(&:freeze).freeze
+
+  @@input = STDIN
+  def self.input=(val)
+    @@input = val
+  end
+
+  @@output = STDOUT
+  def self.output=(val)
+    @@output = val
+  end
+
+  @@buf = []
+  def self.getc
+    unless @@buf.empty?
+      return @@buf.shift
+    end
     c = nil
-    until c
-      return nil if @line_editor.finished?
-      result = select([$stdin], [], [], 0.1)
+    loop do
+      result = select([@@input], [], [], 0.1)
       next if result.nil?
-      c = $stdin.read(1)
+      c = @@input.read(1)
+      break
     end
-    c.ord
+    c&.ord
+  end
+
+  def self.ungetc(c)
+    @@buf.unshift(c)
   end
 
   def self.get_screen_size
-    $stdin.winsize
+    @@input.winsize
+  rescue Errno::ENOTTY
+    [24, 80]
   end
 
   def self.set_screen_size(rows, columns)
-    $stdin.winsize = [rows, columns]
+    @@input.winsize = [rows, columns]
+    self
+  rescue Errno::ENOTTY
     self
   end
 
   def self.cursor_pos
-    res = ''
-    $stdin.raw do |stdin|
-      $stdout << "\e[6n"
-      $stdout.flush
-      while (c = stdin.getc) != 'R'
-        res << c if c
+    begin
+      res = ''
+      @@input.raw do |stdin|
+        @@output << "\e[6n"
+        @@output.flush
+        while (c = stdin.getc) != 'R'
+          res << c if c
+        end
       end
+      m = res.match(/(?<row>\d+);(?<column>\d+)/)
+      column = m[:column].to_i - 1
+      row = m[:row].to_i - 1
+    rescue Errno::ENOTTY
+      buf = @@output.pread(@@output.pos, 0)
+      row = buf.count("\n")
+      column = buf.rindex("\n") ? (buf.size - buf.rindex("\n")) - 1 : 0
     end
-    m = res.match(/(?<row>\d+);(?<column>\d+)/)
-    CursorPos.new(m[:column].to_i - 1, m[:row].to_i - 1)
+    Reline::CursorPos.new(column, row)
   end
 
   def self.move_cursor_column(x)
@@ -66,11 +106,11 @@ module Reline
     print "\e[1;1H"
   end
 
-  def prep
+  def self.prep
     int_handle = Signal.trap('INT', 'IGNORE')
     otio = `stty -g`.chomp
     setting = ' -echo -icrnl cbreak'
-    if (`stty -a`.scan(/-parenb\b/).first == '-parenb')
+    if /-parenb\b/ =~ `stty -a`
       setting << ' pass8'
     end
     setting << ' -ixoff'
@@ -79,7 +119,7 @@ module Reline
     otio
   end
 
-  def deprep(otio)
+  def self.deprep(otio)
     int_handle = Signal.trap('INT', 'IGNORE')
     `stty #{otio}`
     Signal.trap('INT', int_handle)

data/lib/reline/config.rb

@@ -1,23 +1,70 @@
 require 'pathname'
 
 class Reline::Config
-  DEFAULT_PATH = Pathname.new(Dir.home).join('.inputrc')
+  attr_reader :test_mode
+
+  DEFAULT_PATH = '~/.inputrc'
+
+  KEYSEQ_PATTERN = /\\(?:C|Control)-[A-Za-z_]|\\(?:M|Meta)-[0-9A-Za-z_]|\\(?:C|Control)-(?:M|Meta)-[A-Za-z_]|\\(?:M|Meta)-(?:C|Control)-[A-Za-z_]|\\e|\\[\\\"\'abdfnrtv]|\\\d{1,3}|\\x\h{1,2}|./
+
+  class InvalidInputrc < RuntimeError
+    attr_accessor :file, :lineno
+  end
+
+  VARIABLE_NAMES = %w{
+    bind-tty-special-chars
+    blink-matching-paren
+    byte-oriented
+    completion-ignore-case
+    convert-meta
+    disable-completion
+    enable-keypad
+    expand-tilde
+    history-preserve-point
+    history-size
+    horizontal-scroll-mode
+    input-meta
+    keyseq-timeout
+    mark-directories
+    mark-modified-lines
+    mark-symlinked-directories
+    match-hidden-files
+    meta-flag
+    output-meta
+    page-completions
+    prefer-visible-bell
+    print-completions-horizontally
+    show-all-if-ambiguous
+    show-all-if-unmodified
+    visible-stats
+  }
+  VARIABLE_NAME_SYMBOLS = VARIABLE_NAMES.map { |v| :"#{v.tr(?-, ?_)}" }
+  VARIABLE_NAME_SYMBOLS.each do |v|
+    attr_accessor v
+  end
 
   def initialize
+    @additional_key_bindings = {} # from inputrc
+    @default_key_bindings = {} # environment-dependent
     @skip_section = nil
-    @if_stack = []
+    @if_stack = nil
     @editing_mode_label = :emacs
     @keymap_label = :emacs
     @key_actors = {}
     @key_actors[:emacs] = Reline::KeyActor::Emacs.new
     @key_actors[:vi_insert] = Reline::KeyActor::ViInsert.new
     @key_actors[:vi_command] = Reline::KeyActor::ViCommand.new
+    @history_size = 500
+    @keyseq_timeout = 500
+    @test_mode = false
   end
 
   def reset
     if editing_mode_is?(:vi_command)
       @editing_mode_label = :vi_insert
     end
+    @additional_key_bindings = {}
+    @default_key_bindings = {}
   end
 
   def editing_mode
@@ -36,29 +83,51 @@ class Reline::Config
     @key_actors[@keymap_label]
   end
 
-  def read(file = DEFAULT_PATH)
+  def read(file = nil)
+    file ||= File.expand_path(ENV['INPUTRC'] || DEFAULT_PATH)
     begin
       if file.respond_to?(:readlines)
         lines = file.readlines
       else
-          File.open(file, 'rt') do |f|
-            lines = f.readlines
-          end
+        lines = File.readlines(file)
       end
     rescue Errno::ENOENT
-      $stderr.puts "no such file #{file}"
       return nil
     end
 
-    read_lines(lines)
+    read_lines(lines, file)
     self
+  rescue InvalidInputrc => e
+    warn e.message
+    nil
+  end
+
+  def key_bindings
+    # override @default_key_bindings with @additional_key_bindings
+    @default_key_bindings.merge(@additional_key_bindings)
   end
 
-  def read_lines(lines)
-    lines.each do |line|
-      line = line.chomp.gsub(/^\s*/, '')
+  def add_default_key_binding(keystroke, target)
+    @default_key_bindings[keystroke] = target
+  end
+
+  def reset_default_key_bindings
+    @default_key_bindings = {}
+  end
+
+  def read_lines(lines, file = nil)
+    conditions = [@skip_section, @if_stack]
+    @skip_section = nil
+    @if_stack = []
+
+    lines.each_with_index do |line, no|
+      next if line.match(/\A\s*#/)
+
+      no += 1
+
+      line = line.chomp.lstrip
       if line[0, 1] == '$'
-        handle_directive(line[1..-1])
+        handle_directive(line[1..-1], file, no)
         next
       end
 
@@ -70,14 +139,21 @@ class Reline::Config
         next
       end
 
-      if line =~ /\s*(.*)\s*:\s*(.*)\s*$/
+      if line =~ /\s*("#{KEYSEQ_PATTERN}+")\s*:\s*(.*)\s*$/
         key, func_name = $1, $2
-        bind_key(key, func_name)
+        keystroke, func = bind_key(key, func_name)
+        next unless keystroke
+        @additional_key_bindings[keystroke] = func
       end
     end
+    unless @if_stack.empty?
+      raise InvalidInputrc, "#{file}:#{@if_stack.last[1]}: unclosed if"
+    end
+  ensure
+    @skip_section, @if_stack = conditions
   end
 
-  def handle_directive(directive)
+  def handle_directive(directive, file, no)
     directive, args = directive.split(' ')
     case directive
     when 'if'
@@ -88,18 +164,20 @@ class Reline::Config
       when 'version'
       else # application name
         condition = true if args == 'Ruby'
+        condition = true if args == 'Reline'
       end
-      unless @skip_section.nil?
-        @if_stack << @skip_section
-      end
+      @if_stack << [file, no, @skip_section]
       @skip_section = !condition
     when 'else'
+      if @if_stack.empty?
+        raise InvalidInputrc, "#{file}:#{no}: unmatched else"
+      end
       @skip_section = !@skip_section
     when 'endif'
-      @skip_section = nil
-      unless @if_stack.empty?
-        @skip_section = @if_stack.pop
+      if @if_stack.empty?
+        raise InvalidInputrc, "#{file}:#{no}: unmatched endif"
       end
+      @skip_section = @if_stack.pop
     when 'include'
       read(args)
     end
@@ -107,31 +185,7 @@ class Reline::Config
 
   def bind_variable(name, value)
     case name
-    when %w{
-        bind-tty-special-chars
-        blink-matching-paren
-        byte-oriented
-        completion-ignore-case
-        convert-meta
-        disable-completion
-        enable-keypad
-        expand-tilde
-        history-preserve-point
-        horizontal-scroll-mode
-        input-meta
-        mark-directories
-        mark-modified-lines
-        mark-symlinked-directories
-        match-hidden-files
-        meta-flag
-        output-meta
-        page-completions
-        prefer-visible-bell
-        print-completions-horizontally
-        show-all-if-ambiguous
-        show-all-if-unmodified
-        visible-stats
-      } then
+    when VARIABLE_NAMES then
       variable_name = :"@#{name.tr(?-, ?_)}"
       instance_variable_set(variable_name, value.nil? || value == '1' || value == 'on')
     when 'bell-style'
@@ -170,65 +224,63 @@ class Reline::Config
       when 'vi-insert'
         @keymap_label = :vi_insert
       end
+    when 'keyseq-timeout'
+      @keyseq_timeout = value.to_i
     end
   end
 
   def bind_key(key, func_name)
-    if key =~ /"(.*)"/
-      keyseq = parse_keyseq($1).force_encoding('ASCII-8BIT')
+    if key =~ /\A"(.*)"\z/
+      keyseq = parse_keyseq($1)
     else
       keyseq = nil
     end
     if func_name =~ /"(.*)"/
-      func = parse_keyseq($1).force_encoding('ASCII-8BIT')
+      func = parse_keyseq($1)
     else
-      func = func_name.to_sym # It must be macro.
+      func = func_name.tr(?-, ?_).to_sym # It must be macro.
     end
     [keyseq, func]
   end
 
-  def key_notation_to_char(notation)
+  def key_notation_to_code(notation)
     case notation
-    when /\\C-([A-Za-z_])/
-      (1 + $1.downcase.ord - ?a.ord).chr('ASCII-8BIT')
-    when /\\M-([0-9A-Za-z_])/
+    when /\\(?:C|Control)-([A-Za-z_])/
+      (1 + $1.downcase.ord - ?a.ord)
+    when /\\(?:M|Meta)-([0-9A-Za-z_])/
       modified_key = $1
-      code =
-        case $1
-        when /[0-9]/
-          ?\M-0.bytes.first + (modified_key.ord - ?0.ord)
-        when /[A-Z]/
-          ?\M-A.bytes.first + (modified_key.ord - ?A.ord)
-        when /[a-z]/
-          ?\M-a.bytes.first + (modified_key.ord - ?a.ord)
-        end
-      code.chr('ASCII-8BIT')
-    when /\\C-M-[A-Za-z_]/, /\\M-C-[A-Za-z_]/
+      case $1
+      when /[0-9]/
+        ?\M-0.bytes.first + (modified_key.ord - ?0.ord)
+      when /[A-Z]/
+        ?\M-A.bytes.first + (modified_key.ord - ?A.ord)
+      when /[a-z]/
+        ?\M-a.bytes.first + (modified_key.ord - ?a.ord)
+      end
+    when /\\(?:C|Control)-(?:M|Meta)-[A-Za-z_]/, /\\(?:M|Meta)-(?:C|Control)-[A-Za-z_]/
     # 129 M-^A
-    when /\\(\d{1,3})/ then $1.to_i(8).chr # octal
-    when /\\x(\h{1,2})/ then $1.to_i(16).chr # hexadecimal
-    when "\\e" then ?\e
-    when "\\\\" then ?\\
-    when "\\\"" then ?"
-    when "\\'" then ?'
-    when "\\a" then ?\a
-    when "\\b" then ?\b
-    when "\\d" then ?\d
-    when "\\f" then ?\f
-    when "\\n" then ?\n
-    when "\\r" then ?\r
-    when "\\t" then ?\t
-    when "\\v" then ?\v
-    else notation
+    when /\\(\d{1,3})/ then $1.to_i(8) # octal
+    when /\\x(\h{1,2})/ then $1.to_i(16) # hexadecimal
+    when "\\e" then ?\e.ord
+    when "\\\\" then ?\\.ord
+    when "\\\"" then ?".ord
+    when "\\'" then ?'.ord
+    when "\\a" then ?\a.ord
+    when "\\b" then ?\b.ord
+    when "\\d" then ?\d.ord
+    when "\\f" then ?\f.ord
+    when "\\n" then ?\n.ord
+    when "\\r" then ?\r.ord
+    when "\\t" then ?\t.ord
+    when "\\v" then ?\v.ord
+    else notation.ord
     end
   end
 
   def parse_keyseq(str)
-    # TODO: Control- and Meta-
-    ret = String.new(encoding: 'ASCII-8BIT')
-    while str =~ /(\\C-[A-Za-z_]|\\M-[0-9A-Za-z_]|\\C-M-[A-Za-z_]|\\M-C-[A-Za-z_]|\\e|\\\\|\\"|\\'|\\a|\\b|\\d|\\f|\\n|\\r|\\t|\\v|\\\d{1,3}|\\x\h{1,2}|.)/
-      ret << key_notation_to_char($&)
-      str = $'
+    ret = []
+    str.scan(KEYSEQ_PATTERN) do
+      ret << key_notation_to_code($&)
     end
     ret
   end

data/lib/reline/general_io.rb

@@ -0,0 +1,64 @@
+require 'timeout'
+
+class Reline::GeneralIO
+  RAW_KEYSTROKE_CONFIG = {}.freeze
+
+  @@buf = []
+
+  def self.input=(val)
+    @@input = val
+  end
+
+  def self.getc
+    unless @@buf.empty?
+      return @@buf.shift
+    end
+    c = nil
+    loop do
+      result = select([@@input], [], [], 0.1)
+      next if result.nil?
+      c = @@input.read(1)
+      break
+    end
+    c&.ord
+  end
+
+  def self.ungetc(c)
+    @@buf.unshift(c)
+  end
+
+  def self.get_screen_size
+    [1, 1]
+  end
+
+  def self.cursor_pos
+    Reline::CursorPos.new(1, 1)
+  end
+
+  def self.move_cursor_column(val)
+  end
+
+  def self.move_cursor_up(val)
+  end
+
+  def self.move_cursor_down(val)
+  end
+
+  def self.erase_after_cursor
+  end
+
+  def self.scroll_down(val)
+  end
+
+  def self.clear_screen
+  end
+
+  def self.set_screen_size(rows, columns)
+  end
+
+  def self.prep
+  end
+
+  def self.deprep(otio)
+  end
+end