rb-readline 0.4.1 → 0.4.2

data/CHANGES

@@ -1,3 +1,8 @@
+=== 0.4.2 / 2011-11-01
+
+* Bugfixes:
+  * Use encoding for Ruby 1.9.x to solve non-ascii input. GH-58 [phasis68]
+
 === 0.4.1 / 2011-07-29
 
 * Bugfixes:

data/lib/rbreadline.rb

@@ -15,7 +15,7 @@ module RbReadline
 
    RL_LIBRARY_VERSION = "5.2"
    RL_READLINE_VERSION  = 0x0502
-   RB_READLINE_VERSION = "0.4.1"
+   RB_READLINE_VERSION = "0.4.2"
 
    EOF = "\xFF"
    ESC = "\C-["
@@ -3805,7 +3805,12 @@ module RbReadline
 
    # Write COUNT characters from STRING to the output stream.
    def _rl_output_some_chars(string,start,count)
-      @_rl_out_stream.write(string[start,count])
+      case @encoding
+      when 'X'
+         @_rl_out_stream.write(string[start, count].force_encoding(@encoding_name))
+      else
+         @_rl_out_stream.write(string[start,count])
+      end
    end
 
    # Tell the update routines that we have moved onto a new line with the

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rb-readline
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Park Heesob
@@ -17,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 +01:00
-default_executable: 
+date: 2011-11-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -28,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -48,27 +49,22 @@ extra_rdoc_files:
 - LICENSE
 - CHANGES
 files: 
-- examples/shell2.rb
-- examples/multi-line.rb
-- examples/prompt.rb
+- examples/example_readline.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_completion.rb
-- test/test_readline.rb
 - test/filesystem_completion_helper.rb
-- test/test_rbreadline.rb
+- test/test_completion.rb
 - test/test_filename_completion_proc.rb
+- test/test_rbreadline.rb
+- test/test_readline.rb
 - README
 - LICENSE
 - CHANGES
 - Rakefile
 - setup.rb
-has_rdoc: true
 homepage: http://github.com/luislavena/rb-readline
 licenses: 
 - BSD
@@ -85,6 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
       segments: 
       - 1
       - 8
@@ -95,6 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 17
       segments: 
       - 1
       - 3
@@ -103,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Pure-Ruby Readline Implementation

data/examples/multi-line.rb

@@ -1,61 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,58 +0,0 @@
-#!/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

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