rb-readline 0.4.0 → 0.4.1

data/CHANGES

@@ -1,3 +1,14 @@
+=== 0.4.1 / 2011-07-29
+
+* Bugfixes:
+  * Fix crash with double tab and an empty line buffer. GH-26 [phasis68]
+  * Accessing rl_line_buffer before initialization. GH-27 [phasis68]
+  * Fix hanging bug when completer finds a quote char. [Spakman]
+  * Filename completion on paths with directory components. GH-35 [Spakman]
+  * Attempted completion function now returns correct array. GH-34 [Spakman]
+  * Ensure @rl_filname_dequoting_function is used if defined. [Spakman]
+  * Remove deprecations with recent versions of RubyGems. [luislavena]
+
 === 0.4.0 / 2011-01-10
 
 * Enhancements:
@@ -40,4 +51,4 @@
   * Accept 'dumb' as valid terminal. Closes GH-7
   * Fix crash when performing reverse look search. Closes GH-6
 
-=== 0.1.2 / 2009-05-18
+=== 0.1.2 / 2009-05-18

data/README

@@ -10,9 +10,9 @@ of the standard library.
 
   loop do
     line = Readline::readline('> ')
+    break if line.nil? || line == 'quit'
     Readline::HISTORY.push(line)
     puts "You typed: #{line}"
-    break if line == 'quit'
   end
 
 = Motivation
@@ -43,8 +43,10 @@ authors to write their own interface as they see fit.
 = Tutorial
 
 For an excellent tutorial on how to use Readline in practice, please see
-Joseph Pecoraro's examples at http://bogojoker.com/readline/. There is also
-documentation by Michael Fellinger at http://p.ramaze.net/18421.md.
+Joseph Pecoraro's examples at http://bogojoker.com/readline/.
+
+You can also take a look at Ruby 1.9 stdlib Readline documentation located
+at http://rubydoc.info/stdlib/readline/1.9.2/frames
 
 = Alternatives
 
@@ -58,3 +60,4 @@ compatibility mode.
 * Park Heesob (C translation, code donated as part of bounty)
 * Daniel Berger (Documentation and testing)
 * Luis Lavena (Maintainer)
+* Mark Somerville (Contributor/Maintainer)

data/Rakefile

@@ -28,7 +28,6 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   # documentation
-  s.has_rdoc = true
   s.rdoc_options << '--main'  << 'README' << '--title' << 'Rb-Readline - Documentation'
 
   s.extra_rdoc_files = %w(README LICENSE CHANGES)
@@ -38,8 +37,8 @@ spec = Gem::Specification.new do |s|
   s.licenses          = ['BSD']
 
   # author and contributors
-  s.authors     = ['Park Heesob', 'Daniel Berger', 'Luis Lavena']
-  s.email       = ['phasis@gmail.com', 'djberg96@gmail.com', 'luislavena@gmail.com']
+  s.authors     = ['Park Heesob', 'Daniel Berger', 'Luis Lavena', 'Mark Somerville']
+  s.email       = ['phasis@gmail.com', 'djberg96@gmail.com', 'luislavena@gmail.com', 'mark@scottishclimbs.com']
 end
 
 Gem::PackageTask.new(spec) do |pkg|
@@ -50,3 +49,13 @@ Rake::TestTask.new do |t|
   t.warning = true
   t.verbose = true
 end
+
+desc "Install the gem locally"
+task :install => :gem do
+  Dir.chdir(File.dirname(__FILE__)) do
+    sh %{gem install --local pkg/#{spec.name}-#{spec.version}}
+  end
+end
+
+desc "The default is to test everything."
+task :default => :test

data/examples/multi-line.rb

@@ -0,0 +1,61 @@
+require 'rb-readline'
+
+module RbReadline
+  def self.return_key(count, key)
+    if rl_line_buffer.split("\n").size > 2
+      @rl_done = true
+      puts
+    else
+      rl_insert(count, "\n")
+      rl_redisplay
+      rl_insert(1, "#{" " * (@rl_visible_prompt_length-2)}> ") unless @rl_done
+    end
+  end
+
+  def self.multiline_prompt
+    ' ' * (@rl_visible_prompt_length-2) + "> "
+  end
+
+  def self.up_a_line(count, key)
+    lines = (multiline_prompt + rl_line_buffer[0...@rl_point]).split("\n")
+    return if lines.size == 1
+
+    current_line, previous_line = lines.pop, lines.pop
+
+    chars_back = current_line.length + 1
+    if previous_line.length >= @_rl_last_c_pos
+      chars_back += (previous_line.length - @_rl_last_c_pos)
+    end
+    
+    @rl_point -= chars_back
+    rl_redisplay
+  end
+
+  def self.down_a_line(count, key)
+    lines = (multiline_prompt + rl_line_buffer).split("\n")
+    return if @_rl_last_v_pos == (lines.size - 1)
+
+    current_line, next_line = lines[@_rl_last_v_pos], lines[@_rl_last_v_pos+1]
+
+    chars_forward = current_line.length - @_rl_last_c_pos + 1
+    if next_line.length < @_rl_last_c_pos
+      chars_forward += next_line.length
+    else
+      chars_forward += @_rl_last_c_pos
+    end
+    
+    @rl_point += chars_forward
+    rl_redisplay
+  end
+end
+
+RbReadline.rl_bind_key "\r", :return_key
+RbReadline.rl_bind_key "\n", :return_key
+RbReadline.rl_bind_key "\e[A", :up_a_line
+RbReadline.rl_bind_key "\e[B", :down_a_line
+
+loop do
+  line = Readline.readline("Multi> ", true)
+  line = line.lines.to_a.map { |l| l.sub(/^ +> /, "") }.join
+  p line
+end

data/examples/prompt.rb

@@ -0,0 +1,18 @@
+require 'rb-readline'
+
+Cyan = "\001\e[0;36m\002"
+Green = "\001\e[1;32m\002"
+Reset = "\001\e[0m\002"
+prompt = "\001\e[0;36m\002screwy\001\e[m\002 % "
+prompt = "\001\e[0;36m\002this is long enough to cause a problem\001\e[m\002 % "
+prompt = "[ ] > "
+
+loop do
+  Readline.readline(prompt, true)
+  RbReadline.rl_set_prompt "[*] > "
+# RbReadline.rl_maybe_replace_line
+# RbReadline.rl_redisplay
+  RbReadline.rl_refresh_line nil, nil
+  sleep 2
+  puts
+end

data/examples/shell2.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+#$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib/"
+require 'readline'
+
+RbReadline.rl_completer_quote_characters = "\\" if defined? RbReadline
+RbReadline.rl_filename_quote_characters = " " if defined? RbReadline
+
+module RbReadline
+  # IMPORTANT - this somehow gets changed...
+  @rl_completion_quote_character = "\\"
+
+  @rl_filename_dequoting_function = :dequote_filename
+  @rl_filename_quoting_function = :quote_filename
+  @rl_char_is_quoted_p = :char_is_quoted?
+
+  def self.char_is_quoted?(buffer, point)
+    buffer[point-1,1] == "\\" || buffer[point,1] == "\\"
+  end
+
+  def self.dequote_filename(filename, quote_char)
+    quote_char = "\\" if quote_char == 0.chr
+    filename.delete quote_char
+#   @filename.gsub!(quote_char, "") if @filename
+  end
+
+# def self.directory_completion_hook(filename)
+#   @dirname.gsub!("\\", "") if @dirname
+# end
+
+  def self.quote_filename(filename, mtype, quote_char)
+#   if mtype == SINGLE_MATCH
+#     @rl_filename_quote_characters.each_char do |c|
+#       filename.sub!(//, "\\#{c}")
+#     end
+#   elsif mtype == MULT_MATCH
+    f = filename.dup
+    @rl_filename_quote_characters.each_char do |c|
+      f.gsub!(c, "\\#{c}")
+    end
+    f
+#     @rl_filename_quote_characters.each_char do |c|
+#      #p c
+#       index = filename.rindex(c)
+#       filename.insert(index, '\\') unless filename[index-1,1] == '\\'
+#       filename.gsub!(//, "\\#{c}")
+#     end
+#   end
+#   filename
+  end
+end
+
+
+loop do
+  line = Readline::readline('> ')
+  Readline::HISTORY.push(line)
+  puts "You typed: #{line}"
+  break if line == 'quit'
+end

data/examples/term.rb

@@ -0,0 +1,3 @@
+require "termios"
+
+Termios.tcsetattr(STDIN, Termios::TCSADRAIN, @terminal_modes)

data/lib/rbreadline.rb

@@ -15,7 +15,7 @@ module RbReadline
 
    RL_LIBRARY_VERSION = "5.2"
    RL_READLINE_VERSION  = 0x0502
-   RB_READLINE_VERSION = "0.4.0"
+   RB_READLINE_VERSION = "0.4.1"
 
    EOF = "\xFF"
    ESC = "\C-["
@@ -774,7 +774,7 @@ module RbReadline
    @rl_num_chars_to_read = 0
 
    # Line buffer and maintenence.
-   @rl_line_buffer = nil
+   @rl_line_buffer = ""
 
    # Key sequence `contexts'
    @_rl_kscxt = nil
@@ -1104,10 +1104,11 @@ module RbReadline
    :rl_readline_name,:history_length,:history_base
 
    module_function
+
    # Okay, now we write the entry_function for filename completion.  In the
-   #   general case.  Note that completion in the shell is a little different
-   #   because of all the pathnames that must be followed when looking up the
-   #   completion for a command.
+   # general case.  Note that completion in the shell is a little different
+   # because of all the pathnames that must be followed when looking up the
+   # completion for a command.
    def rl_filename_completion_function(text, state)
       # If we don't have any state, then do some initialization.
       if (state == 0)
@@ -1117,12 +1118,23 @@ module RbReadline
             @directory.close
             @directory = nil
          end
+
          text.delete!(0.chr)
-         @filename = text.dup
          if text.length == 0
-            text = "."
+            @dirname = "."
+            @filename = ""
+         elsif text.rindex(File::SEPARATOR) == text.length-1
+            @dirname = text
+            @filename = ""
+         else
+            @dirname, @filename = File.split(text)
+
+            # This preserves the "./" when the user types "./dirname<tab>".
+            if @dirname == "." && text[0,2] == ".#{File::SEPARATOR}"
+              @dirname += File::SEPARATOR
+            end
          end
-         @dirname = File.dirname(text)
+
          # We aren't done yet.  We also support the "~user" syntax.
 
          # Save the version of the directory that the user typed.
@@ -1138,16 +1150,20 @@ module RbReadline
             @users_dirname = @dirname.dup
          elsif (@rl_completion_found_quote && @rl_filename_dequoting_function)
             # delete single and double quotes
-            @temp = send(@rl_filename_dequoting_function,@users_dirname, @rl_completion_quote_character)
+            temp = send(@rl_filename_dequoting_function, @users_dirname, @rl_completion_quote_character)
             @users_dirname = temp
+            @dirname = @users_dirname.dup
          end
 
-         @directory = Dir.new(@dirname)
+         begin
+            @directory = Dir.new(@dirname)
+         rescue Errno::ENOENT, Errno::ENOTDIR
+         end
 
          # Now dequote a non-null filename.
          if (@filename && @filename.length>0 && @rl_completion_found_quote && @rl_filename_dequoting_function)
             # delete single and double quotes
-            temp = send(@rl_filename_dequoting_function,@filename, @rl_completion_quote_character)
+            temp = send(@rl_filename_dequoting_function, @filename, @rl_completion_quote_character)
             @filename = temp
          end
 
@@ -1197,13 +1213,13 @@ module RbReadline
          if (@dirname != '.')
             if (@rl_complete_with_tilde_expansion && @users_dirname[0,1] == "~")
                temp = @dirname
-               if(temp[-1,1] != '/')
-                  temp += '/'
+               if(temp[-1,1] != File::SEPARATOR)
+                  temp += File::SEPARATOR
                end
             else
                temp = @users_dirname
-               if(temp[-1,1] != '/')
-                  temp += '/'
+               if(temp[-1,1] != File::SEPARATOR)
+                  temp += File::SEPARATOR
                end
             end
             temp += entry
@@ -4845,7 +4861,7 @@ module RbReadline
          text = nil
       end
       @rl_end -= diff
-      @rl_line_buffer[@rl_end] = 0.chr
+      @rl_line_buffer[@rl_end,1] = 0.chr
       return (diff)
    end
 
@@ -6074,6 +6090,12 @@ module RbReadline
          scan = 0
          pass_next = false
          while scan < _end
+            if !@rl_byte_oriented
+               scan = _rl_find_next_mbchar(@rl_line_buffer, scan, 1, MB_FIND_ANY)
+            else
+               scan += 1
+            end
+
             if (pass_next)
                pass_next = false
                next
@@ -6111,11 +6133,6 @@ module RbReadline
                   found_quote |= RL_QF_OTHER_QUOTE
                end
             end
-            if !@rl_byte_oriented
-               scan = _rl_find_next_mbchar(@rl_line_buffer, scan, 1, MB_FIND_ANY)
-            else
-               scan += 1
-            end
          end
       end
 

data/lib/readline.rb

@@ -1,5 +1,5 @@
 # readline.rb -- GNU Readline module
-# Copyright (C) 1997-2001  Shugo Maed
+# Copyright (C) 1997-2001  Shugo Maeda
 #
 # Ruby translation by Park Heesob phasis@gmail.com
 
@@ -110,6 +110,17 @@ module Readline
       @completion_case_fold
    end
 
+   # Returns nil if no matches are found or an array of strings:
+   #
+   #   [0] is the replacement for text
+   #   [1..n] the possible matches
+   #   [n+1] nil
+   #
+   # The possible matches should not include [0].
+   #
+   # If this method sets RbReadline.rl_attempted_completion_over to true,
+   # then the default completion function will not be called when this
+   # function returns nil.
    def self.readline_attempted_completion_function(text,start,_end)
       proc = @completion_proc
       return nil if proc.nil?
@@ -134,6 +145,7 @@ module Readline
 
       if(matches==1)
          result[0] = result[1].dup
+         result[1] = nil
       else
          i = 1
          low = 100000

data/test/filesystem_completion_helper.rb

@@ -0,0 +1,53 @@
+require "fileutils"
+
+module FilesystemCompletionHelper
+  SEP = File::SEPARATOR
+  COMP_TEST_DIR = "comp_test#{SEP}"
+  SUB_DIR = "#{COMP_TEST_DIR}a_sub_dir#{SEP}"
+  SUB_SUB_DIR = "#{SUB_DIR}another_sub_dir#{SEP}"
+  DIR_WITH_SPACES = "#{COMP_TEST_DIR}dir with spaces#{SEP}"
+  SUB_DIR_WITH_SPACES = "#{DIR_WITH_SPACES}sub dir with spaces#{SEP}"
+
+  # This creates:
+  #
+  #   comp_test/
+  #     abc
+  #     aaa
+  #     a_sub_dir/
+  #       abc
+  #       aaa
+  #       another_sub_dir/
+  #         aaa
+  #     dir with spaces/
+  #       filename with spaces
+  #       sub dir with spaces/
+  #         another filename with spaces
+  def setup_filesystem_for_completion
+    FileUtils.mkdir_p("#{SUB_SUB_DIR}")
+    FileUtils.mkdir_p("#{SUB_DIR_WITH_SPACES}")
+    @comp_test_dir = Dir.new COMP_TEST_DIR
+    @sub_dir = Dir.new SUB_DIR
+    @sub_sub_dir = Dir.new SUB_SUB_DIR
+    @dir_with_spaces = Dir.new DIR_WITH_SPACES
+    @sub_dir_with_spaces = Dir.new SUB_DIR_WITH_SPACES
+
+    FileUtils.touch("#{@comp_test_dir.path}abc")
+    FileUtils.touch("#{@comp_test_dir.path}aaa")
+    FileUtils.touch("#{@sub_dir.path}abc")
+    FileUtils.touch("#{@sub_dir.path}aaa")
+    FileUtils.touch("#{@sub_sub_dir.path}aaa")
+    FileUtils.touch("#{@dir_with_spaces.path}filename with spaces")
+    FileUtils.touch("#{@sub_dir_with_spaces.path}another filename with spaces")
+
+    # The previous Dir.new calls seem to cache the dir entries on Windows.
+    @comp_test_dir = Dir.new COMP_TEST_DIR
+    @sub_dir = Dir.new SUB_DIR
+    @sub_sub_dir = Dir.new SUB_SUB_DIR
+    @sub_dir_with_spaces = Dir.new SUB_DIR_WITH_SPACES
+    @dir_with_spaces = Dir.new DIR_WITH_SPACES
+  end
+
+  def teardown_filesystem_after_completion
+    FileUtils.rm_r(COMP_TEST_DIR)
+  end
+end

data/test/test_completion.rb

@@ -0,0 +1,103 @@
+require "test/unit"
+require 'timeout'
+require "readline"
+require "#{File.expand_path(File.dirname(__FILE__))}/filesystem_completion_helper"
+
+class TestCompletion < Test::Unit::TestCase
+  include RbReadline
+  include FilesystemCompletionHelper
+
+  def filename_quoting_function(filename, mtype, quote_char)
+    quoted_filename = filename.dup
+    @rl_filename_quote_characters.split("").each do |c|
+      quoted_filename.gsub!(c, "\\#{c}")
+    end
+    quoted_filename
+  end
+
+  def filename_dequoting_function(filename, quote_char = "\\")
+    filename.delete quote_char
+  end
+
+  def setup
+    @rl_completion_word_break_hook, @rl_char_is_quoted_p = nil
+    @rl_basic_quote_characters, @rl_special_prefixes = nil
+    @rl_completer_word_break_characters = Readline.basic_word_break_characters
+    @rl_completer_quote_characters = "\\"
+    @rl_completion_quote_character = "\\"
+    @rl_filename_quote_characters = " "
+    @rl_byte_oriented = true
+    @rl_filename_quoting_desired = true
+    @rl_filename_completion_desired = true
+    @rl_complete_with_tilde_expansion = true
+    @_rl_match_hidden_files = false
+    @rl_completion_found_quote = false
+    @_rl_completion_case_fold = false
+    @directory = nil
+
+    @rl_filename_quoting_function = :filename_quoting_function
+    @rl_filename_dequoting_function = :filename_dequoting_function
+    @rl_directory_completion_hook = nil
+
+    setup_filesystem_for_completion
+  end
+
+  def teardown
+    teardown_filesystem_after_completion
+  end
+
+  def set_line_buffer(text)
+    @rl_line_buffer = text
+    @rl_point = @rl_line_buffer.size
+    @rl_line_buffer << 0.chr
+  end
+
+  def test__find_completion_word_doesnt_hang_on_completer_quote_character
+    set_line_buffer "#{@dir_with_spaces.path}filename\\ w"
+
+    assert_nothing_raised do
+      Timeout::timeout(3) do
+        assert_equal([ "\000", true, "\000" ], _rl_find_completion_word)
+      end
+    end
+  end
+
+  def test__find_completion_word_without_quote_characters
+    set_line_buffer "#{@comp_test_dir.path}a"
+    assert_equal([ "\000", false, "\000" ], _rl_find_completion_word)
+  end
+
+  def test_make_quoted_replacement_calls_filename_quoting_function
+    match = RbReadline::SINGLE_MATCH
+
+    assert_equal "dir/with\\ space", make_quoted_replacement("dir/with space", RbReadline::SINGLE_MATCH, 0.chr)
+  end
+
+  def test_rl_filname_completion_function_calls_dequoting_function
+    @rl_completion_found_quote = true
+    dir = filename_quoting_function(@dir_with_spaces.path, nil, 0.chr)
+
+    # rl_filename_completion_function is called with an increasing state in
+    # order to iterate through directory entries.
+
+    entries = [ "#{@dir_with_spaces.path}sub dir with spaces", "#{@dir_with_spaces.path}filename with spaces" ]
+
+    assert entries.include?(rl_filename_completion_function(dir, 0))
+    assert entries.include?(rl_filename_completion_function(dir, 1))
+    assert_nil rl_filename_completion_function(dir, 2)
+  ensure
+    @rl_completion_found_quote = false
+  end
+
+  def test_completing_path_starting_dot_slash
+    assert_equal "./#{COMP_TEST_DIR.chop}", rl_filename_completion_function("./#{COMP_TEST_DIR.chop}", 0)
+  end
+
+  def test_completing_non_existant_directory
+    assert_nil rl_filename_completion_function("/this/dir/does/not/exist", 0)
+  end
+
+  def test_completing_a_file_as_a_directory
+    assert_nil rl_filename_completion_function("#{File.expand_path(__FILE__)}/", 0)
+  end
+end

data/test/test_filename_completion_proc.rb

@@ -0,0 +1,69 @@
+require 'test/unit'
+require 'fileutils'
+require 'readline'
+require "#{File.expand_path(File.dirname(__FILE__))}/filesystem_completion_helper"
+
+class TC_FILENAME_COMPLETION_PROC < Test::Unit::TestCase
+  include FilesystemCompletionHelper
+
+  def setup
+    FileUtils.mkdir_p("#{SUB_SUB_DIR}")
+    FileUtils.mkdir_p("#{SUB_DIR_WITH_SPACES}")
+    @comp_test_dir = Dir.new COMP_TEST_DIR
+    @sub_dir = Dir.new SUB_DIR
+    @sub_sub_dir = Dir.new SUB_SUB_DIR
+    @dir_with_spaces = Dir.new DIR_WITH_SPACES
+    @sub_dir_with_spaces = Dir.new SUB_DIR_WITH_SPACES
+
+    FileUtils.touch("#{@comp_test_dir.path}abc")
+    FileUtils.touch("#{@comp_test_dir.path}aaa")
+    FileUtils.touch("#{@sub_dir.path}abc")
+    FileUtils.touch("#{@sub_dir.path}aaa")
+    FileUtils.touch("#{@sub_sub_dir.path}aaa")
+    FileUtils.touch("#{@dir_with_spaces.path}filename with spaces")
+    FileUtils.touch("#{@sub_dir_with_spaces.path}another filename with spaces")
+
+    # The previous Dir.new calls seem to cache the dir entries on Windows.
+    @comp_test_dir = Dir.new COMP_TEST_DIR
+    @sub_dir = Dir.new SUB_DIR
+    @sub_sub_dir = Dir.new SUB_SUB_DIR
+    @dir_with_spaces = Dir.new DIR_WITH_SPACES
+    @sub_dir_with_spaces = Dir.new SUB_DIR_WITH_SPACES
+    setup_filesystem_for_completion
+  end
+
+  def teardown
+    teardown_filesystem_after_completion
+  end
+
+  def test_listing_files_in_cwd
+    Dir.chdir(COMP_TEST_DIR) do
+      entries = Dir.entries(".").select { |e| e[0,1] == "a" }
+      assert_equal entries, Readline::FILENAME_COMPLETION_PROC.call("a")
+    end
+  end
+
+  def test_list_files_in_sub_directories
+    entries = @sub_dir.entries.select { |e| e[0,1] == "a" }
+    entries.map! { |e| "#{@sub_dir.path}#{e}" }
+    assert_equal entries, Readline::FILENAME_COMPLETION_PROC.call("#{@sub_dir.path}a")
+
+    entries = @sub_sub_dir.entries - %w( . .. )
+    entries.map! { |e| "#{@sub_sub_dir.path}#{e}" }
+    assert_equal entries, Readline::FILENAME_COMPLETION_PROC.call("#{@sub_sub_dir.path}")
+  end
+
+  def test_list_files_and_directories_with_spaces
+    entries = @comp_test_dir.entries.select { |e| e[0,1] == "d" }
+    entries.map! { |e| @comp_test_dir.path + e }
+    assert_equal entries, Readline::FILENAME_COMPLETION_PROC.call("#{@comp_test_dir.path}d")
+
+    entries = @dir_with_spaces.entries - %w( . .. )
+    entries.map! { |e| @dir_with_spaces.path + e }
+    assert_equal entries, Readline::FILENAME_COMPLETION_PROC.call("#{@dir_with_spaces.path}")
+  end
+
+  def test_list_files_in_current_directory
+    assert_equal((Dir.entries(".") - %w( . .. )).sort, Readline::FILENAME_COMPLETION_PROC.call("").sort)
+  end
+end

data/test/test_readline.rb

@@ -124,6 +124,44 @@ class TC_Readline < Test::Unit::TestCase
       assert_nothing_raised{ Readline.basic_quote_characters = "\"'" }
    end
 
+   def test_attempted_comp_func_returns_nil_when_no_completion_proc_set
+     assert_equal nil, Readline.readline_attempted_completion_function("12", 0, 1)
+   end
+
+   def test_attempted_comp_func_case_folding
+     Readline.completion_proc = Proc.new do |word|
+       %w( 123456 123abc abc123 ).grep(/^#{word}/i)
+     end
+
+     Readline.completion_case_fold = true
+
+     assert_equal [ "123", "123456", "123abc", nil ], Readline.readline_attempted_completion_function("123", 0, 3)
+
+     assert_equal [ "123abc", nil, nil ], Readline.readline_attempted_completion_function("123A", 0, 3)
+
+   ensure
+     Readline.module_eval do
+       @completion_proc = nil
+     end
+   end
+
+   def test_attempted_comp_func_removes_replacement_from_possible_matches
+     Readline.completion_proc = Proc.new do |word|
+       %w( 123456 123abc abc123 ).grep(/^#{word}/)
+     end
+
+     assert_equal [ "123", "123456", "123abc", nil ], Readline.readline_attempted_completion_function("12", 0, 1)
+
+     assert_equal [ "123", "123456", "123abc", nil ], Readline.readline_attempted_completion_function("123", 0, 2)
+
+     assert_equal [ "123456", nil, nil ], Readline.readline_attempted_completion_function("1234", 0, 3)
+
+   ensure
+     Readline.module_eval do
+       @completion_proc = nil
+     end
+   end
+
    def teardown
       @proc = nil
    end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: rb-readline
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Park Heesob
 - Daniel Berger
 - Luis Lavena
+- Mark Somerville
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -03:00
+date: 2011-07-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,6 +38,7 @@ email:
 - phasis@gmail.com
 - djberg96@gmail.com
 - luislavena@gmail.com
+- mark@scottishclimbs.com
 executables: []
 
 extensions: []
@@ -48,14 +48,21 @@ extra_rdoc_files:
 - LICENSE
 - CHANGES
 files: 
-- examples/example_readline.rb
+- examples/shell2.rb
+- examples/multi-line.rb
+- examples/prompt.rb
 - examples/example_readline_with_completion.rb
 - examples/tinyirb.rb
+- examples/example_readline.rb
+- examples/term.rb
 - lib/rb-readline.rb
 - lib/rbreadline.rb
 - lib/readline.rb
-- test/test_rbreadline.rb
+- test/test_completion.rb
 - test/test_readline.rb
+- test/filesystem_completion_helper.rb
+- test/test_rbreadline.rb
+- test/test_filename_completion_proc.rb
 - README
 - LICENSE
 - CHANGES
@@ -78,7 +85,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
       segments: 
       - 1
       - 8
@@ -89,7 +95,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
       segments: 
       - 1
       - 3
@@ -98,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Pure-Ruby Readline Implementation