rb-readline 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4d13c41012b1013ec975862515264f6fd631054
-  data.tar.gz: 346bac63e5dbb35e44c9874f7709145dfc293072
+  metadata.gz: c3159d70047f7143ac3691670bf88e0d49962c03
+  data.tar.gz: bc91ac5ba0ac0c0a09da8f6e60d42be1044df171
 SHA512:
-  metadata.gz: b95940171a294f7380b325363a01dbb2489c5c701b5909cac3de86dc038fbb2263c3b1620209cf3ff86a01cf7821097d86833a1d72ed1c94153658bd62e44a48
-  data.tar.gz: f8717f77149f38446ba5947edf8578facad9e53685880237fdd9e02fa1899dc8b5441ac29ceb0494d37c1a290cfa25bfd91662ab671954005c029c21071e7cc6
+  metadata.gz: f81bd2d07418af204da27451fa28ad7ea58ea91f3c5e222fa8dff96afa6957233d72aa8512b1754e5aeefc5c8ca6020968e7b315f85bbefdc080335d42cd6828
+  data.tar.gz: c1a2292dd3db790d667a60b5b5af9d4ffb39bc8b8b86d9f839c572097cee256d3112c55c74fe9629d01f0ed6d40ef276230b4e6af31aaf58c4c5defe09614b9f

data/{README.rdoc → README.md}

@@ -1,28 +1,38 @@
-= Description
+# Description
 
 The readline library provides a pure Ruby implementation of the GNU
 readline C library, as well as the Readline extension that ships as part
 of the standard library.
 
-= Synopsis
+## Installation
 
-  require 'readline'
+    gem install rb-readline
+  
+Or in a `Gemfile`:
+  
+    gem 'rb-readline'
 
-  loop do
-    line = Readline::readline('> ')
-    break if line.nil? || line == 'quit'
-    Readline::HISTORY.push(line)
-    puts "You typed: #{line}"
-  end
+## Synopsis
 
-= Compatibility
+```ruby
+require 'readline'
+
+loop do
+  line = Readline::readline('> ')
+  break if line.nil? || line == 'quit'
+  Readline::HISTORY.push(line)
+  puts "You typed: #{line}"
+end
+```
+
+## Compatibility
 
 rb-readline should work on all Unix-like systems and Windows. It is regularly
 used with MRI 1.8/1.9 and Rubinius. JRuby is not supported and there are no
 plans to support it in the future - it comes bundled with a Java implementation
 of Readline.
 
-= Motivation
+## Motivation
 
 First, building the GNU readline library on MS Windows with Visual C++ is
 almost impossible. However, certain libraries depend on readline. By providing
@@ -47,7 +57,7 @@ weak, and only provides a very limited subset of the actual GNU readline
 library. By providing a pure Ruby implementation we allow 3rd party library
 authors to write their own interface as they see fit.
 
-= Tutorial
+## Tutorial
 
 For an excellent tutorial on how to use Readline in practice, please see
 Joseph Pecoraro's examples at http://bogojoker.com/readline/.
@@ -55,14 +65,14 @@ 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
+## Alternatives
 
 See Rawline for a library that began life in pure Ruby and provides an
 interface that's probably more comfortable to Ruby programmer. It has certain
 features that Readline does not. In addition, it provides a Readline
 compatibility mode.
 
-= Authors
+## Authors
 
 * Park Heesob (C translation, code donated as part of bounty)
 * Daniel Berger (Documentation and testing)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems/package_task'
 require 'rake/testtask'
+require 'bundler/gem_tasks'
 
 spec = Gem::Specification.load "rb-readline.gemspec"
 

data/lib/rbreadline/version.rb

@@ -1,3 +1,3 @@
 module RbReadline
-  RB_READLINE_VERSION = "0.5.3"
+  RB_READLINE_VERSION = "0.5.5"
 end

data/lib/rbreadline.rb

@@ -10,7 +10,7 @@
 
 require "rbreadline/version"
 
-class Fixnum
+class Integer
   def ord; self; end
 end
 
@@ -1555,7 +1555,7 @@ module RbReadline
     end
 
     if @hConsoleHandle
-      csbi = 0.chr * 24
+      csbi = Fiddle::Pointer.malloc(24)
       @GetConsoleScreenBufferInfo.Call(@hConsoleHandle,csbi)
       x,y = csbi[4,4].unpack('SS')
       x = dpos
@@ -1812,7 +1812,7 @@ module RbReadline
 
   def get_term_capabilities(buffer)
     hash = {}
-      `infocmp -C`.split(':').select{|x| x =~ /(.*)=(.*)/ and hash[$1]=$2.gsub('\\E',"\e").gsub(/\^(.)/){($1[0].ord ^ ((?a..?z).include?($1[0]) ? 0x60 : 0x40)).chr}}
+      `infocmp -C`.split(':').select{|x| x =~ /(.*)=(.*)/ and hash[$1]=$2.gsub("\\r", "\r").gsub('\\E',"\e").gsub(/\^(.)/){($1[0].ord ^ ((?a..?z).include?($1[0]) ? 0x60 : 0x40)).chr}}
       @_rl_term_at7          =     hash["@7"]
       @_rl_term_DC           =     hash["DC"]
       @_rl_term_IC           =     hash["IC"]
@@ -1859,7 +1859,7 @@ module RbReadline
   def _rl_get_screen_size(tty, ignore_env)
 
     if @hConsoleHandle
-      csbi = 0.chr * 24
+      csbi = Fiddle::Pointer.malloc(24)
       @GetConsoleScreenBufferInfo.Call(@hConsoleHandle,csbi)
       wc,wr = csbi[0,4].unpack('SS')
       # wr,wc, = `mode con`.scan(/\d+\n/).map{|x| x.to_i}
@@ -2392,9 +2392,54 @@ module RbReadline
     nil
   end
 
+  def rl_translate_keyseq(seq)
+    require 'strscan'
+
+    ss = StringScanner.new(seq)
+    new_seq = ''
+
+    until ss.eos?
+      char = ss.getch
+      next new_seq << char unless char == '\\'
+
+      char = ss.getch
+      new_seq << case char
+                 when 'a'
+                   "\007"
+                 when 'b'
+                   "\b"
+                 when 'd'
+                   RUBOUT
+                 when 'e'
+                   ESC
+                 when 'f'
+                   "\f"
+                 when 'n'
+                   NEWLINE
+                 when 'r'
+                   RETURN
+                 when 't'
+                   TAB
+                 when 'v'
+                   0x0B
+                 when '\\'
+                   '\\'
+                 when 'x'
+                   ss.scan(/\d\d/).to_i(16).chr
+                 when '0'..'7'
+                   ss.pos -= 1
+                   ss.scan(/\d\d\d/).to_i(8).chr
+                 else
+                   char
+                 end
+    end
+
+    new_seq
+  end
+
   # Bind KEY to FUNCTION.  Returns non-zero if KEY is out of range.
   def rl_bind_key(key, function)
-    @_rl_keymap[key] = function
+    @_rl_keymap[rl_translate_keyseq(key)] = function
     @rl_binding_keymap = @_rl_keymap
     0
   end
@@ -2648,7 +2693,7 @@ module RbReadline
   end
 
   def vis_pos(line)
-    @vis_lbreaks[line]
+    @vis_lbreaks[line] || 0
   end
 
   def vis_line(line)
@@ -4022,7 +4067,7 @@ module RbReadline
   def _rl_isearch_dispatch(cxt, c)
     f = nil
 
-    if c.class == Fixnum && c < 0
+    if c.is_a?(Integer) && c < 0
       cxt.sflags |= SF_FAILED
       cxt.history_pos = cxt.last_found_line
       return -1
@@ -4391,7 +4436,7 @@ module RbReadline
 
         def call(*args)
           args.each_with_index do |x, i|
-            args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if @proto[i] == "S"
+            args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if @proto[i] == "S" && !x.is_a?(Fiddle::Pointer)
             args[i], = [x].pack("I").unpack("i") if @proto[i] == "I"
           end
           @func.call(*args).to_i || 0
@@ -4613,10 +4658,10 @@ module RbReadline
   #   number of character spaces to clear,
   def space_to_eol(count)
     if @hConsoleHandle
-      csbi = 0.chr * 24
+      csbi = Fiddle::Pointer.malloc(24)
       @GetConsoleScreenBufferInfo.Call(@hConsoleHandle,csbi)
       cursor_pos = csbi[4,4].unpack('L').first
-      written = 0.chr * 4
+      written = Fiddle::Pointer.malloc(4)
       @FillConsoleOutputCharacter.Call(@hConsoleHandle,0x20,count,cursor_pos,written)
     else
       @rl_outstream.write(' ' * count)
@@ -5615,7 +5660,7 @@ module RbReadline
     c = rl_read_key()
     rl_unsetstate(RL_STATE_MOREINPUT)
 
-    if c.class == Fixnum && c < 0
+    if c.is_a?(Integer) && c < 0
       return -1
     end
 
@@ -6087,7 +6132,7 @@ module RbReadline
 
   def alloc_history_entry(string, ts)
     temp = Struct.new(:line,:data,:timestamp).new
-    temp.line = string ? string.delete(0.chr) : string
+    temp.line = string ? string.encode('UTF-8', invalid: :replace, undef: :replace, replace: '').delete(0.chr) : string
     temp.data = nil
     temp.timestamp = ts
 
@@ -6494,7 +6539,7 @@ module RbReadline
   end
 
   def _rl_internal_pager(lines)
-    @rl_outstream.puts "--More--"
+    @rl_outstream.write("--More--")
     @rl_outstream.flush
     i = get_y_or_n(1)
     _rl_erase_entire_line()
@@ -6610,7 +6655,7 @@ module RbReadline
       if (c == 'n' || c == 'N' || c == RUBOUT)
         return (0)
       end
-      if (c == ABORT_CHAR || (c.class == Fixnum && c < 0))
+      if (c == ABORT_CHAR || (c.is_a?(Integer) && c < 0))
         _rl_abort_internal()
       end
       if (for_pager && (c == NEWLINE || c == RETURN))
@@ -6971,7 +7016,7 @@ module RbReadline
 
     setting << " -ixoff"
 
-    rl_bind_key(@_rl_tty_chars.t_start, :rl_restart_output)
+    rl_bind_key(@_rl_tty_chars.t_start, :rl_restart_output) unless @_rl_tty_chars.t_start.nil?
     @_rl_eof_char = @_rl_tty_chars.t_eof
 
     #setting << " -isig"
@@ -7592,7 +7637,7 @@ module RbReadline
     mbchar = ''
     mb_len = _rl_read_mbchar(mbchar, MB_LEN_MAX)
 
-    if (mbchar.class == Fixnum && c < 0) || mbchar == 0.chr
+    if (mbchar.is_a?(Integer) && c < 0) || mbchar == 0.chr
       return -1
     end
 
@@ -7777,7 +7822,7 @@ module RbReadline
         rl_restore_prompt()
         rl_clear_message()
         rl_unsetstate(RL_STATE_NUMERICARG)
-        if key.class == Fixnum && key < 0
+        if key.is_a?(Integer) && key < 0
           return -1
         end
         return (_rl_dispatch(key, @_rl_keymap))
@@ -8735,7 +8780,7 @@ module RbReadline
       c = rl_read_key()
       rl_unsetstate(RL_STATE_MOREINPUT)
 
-      break if c.class == Fixnum && c < 0
+      break if c.is_a?(Integer) && c < 0
 
       mbchar << c
       mb_len += 1
@@ -8765,7 +8810,7 @@ module RbReadline
         # Read more for multibyte character
         rl_setstate(RL_STATE_MOREINPUT)
         c = rl_read_key()
-        break if c.class == Fixnum && c < 0
+        break if c.is_a?(Integer) && c < 0
         rl_unsetstate(RL_STATE_MOREINPUT)
       else
         break

data/lib/readline.rb

@@ -316,6 +316,16 @@ module Readline
     RbReadline.rl_point
   end
 
+  # Temporarily disable warnings and call a block
+  #
+  def self.silence_warnings(&block)
+    warn_level = $VERBOSE
+    $VERBOSE = nil
+    result = block.call
+    $VERBOSE = warn_level
+    result
+  end
+
   # The History class encapsulates a history of all commands entered by
   # users at the prompt, providing an interface for inspection and retrieval
   # of all commands.
@@ -455,7 +465,7 @@ module Readline
 
   end
 
-  HISTORY = History
+  silence_warnings { HISTORY = History }
 
   # The Fcomp class provided to encapsulate typical filename completion
   # procedure. You will not typically use this directly, but will instead
@@ -483,7 +493,7 @@ module Readline
     end
   end
 
-  FILENAME_COMPLETION_PROC = Fcomp
+  silence_warnings { FILENAME_COMPLETION_PROC = Fcomp }
 
   # The Ucomp class provided to encapsulate typical filename completion
   # procedure. You will not typically use this directly, but will instead
@@ -514,13 +524,13 @@ module Readline
     end
   end
 
-  USERNAME_COMPLETION_PROC = Ucomp
+  silence_warnings { USERNAME_COMPLETION_PROC = Ucomp }
 
   RbReadline.rl_readline_name = "Ruby"
 
   RbReadline.using_history()
 
-  VERSION = RbReadline.rl_library_version
+  silence_warnings { VERSION = RbReadline.rl_library_version }
 
   module_function :readline
 

data/rb-readline.gemspec

@@ -34,7 +34,7 @@ spec = Gem::Specification.new do |s|
   # components, files and paths
   s.files = Dir[
     "{bench,examples,lib,test}/**/*.rb",
-    "README.rdoc",
+    "README.md",
     "LICENSE",
     "CHANGES",
     "Rakefile",
@@ -45,7 +45,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   # documentation
-  s.rdoc_options << '--main'  << 'README.rdoc' << '--title' << 'Rb-Readline - Documentation'
+  s.rdoc_options << '--main'  << 'README.md' << '--title' << 'Rb-Readline - Documentation'
 
-  s.extra_rdoc_files = %w(README.rdoc LICENSE CHANGES)
+  s.extra_rdoc_files = %w(README.md LICENSE CHANGES)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-readline
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Park Heesob
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,13 +52,13 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - LICENSE
 - CHANGES
 files:
 - CHANGES
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bench/_rl_adjust_point.rb
 - examples/example_readline.rb
@@ -83,7 +83,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.rdoc
+- README.md
 - "--title"
 - Rb-Readline - Documentation
 require_paths:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pure-Ruby Readline Implementation