rb-readline 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62e9f284762457dd7a3623ef60c95024ae96d513
-  data.tar.gz: 190b43ef9f6d15da4921f48c923776c305c3bfef
+  metadata.gz: c3159d70047f7143ac3691670bf88e0d49962c03
+  data.tar.gz: bc91ac5ba0ac0c0a09da8f6e60d42be1044df171
 SHA512:
-  metadata.gz: 587ae50714415826ec7b09435b6e98ef6b8b82888144e6d8a5b2e99d68fc3dbbff527af117323829aeceb0a8b06fd3cbf525288734557c205f15b23efacdcad7
-  data.tar.gz: 3ea8429737a5b37c40900ae813632a8bb7646a7b0c164ac3c301dfbd30111aac357360d91c99a7bc4f520cbaa97f74fdcecf9fffd9afbfed524bc4ed950511dc
+  metadata.gz: f81bd2d07418af204da27451fa28ad7ea58ea91f3c5e222fa8dff96afa6957233d72aa8512b1754e5aeefc5c8ca6020968e7b315f85bbefdc080335d42cd6828
+  data.tar.gz: c1a2292dd3db790d667a60b5b5af9d4ffb39bc8b8b86d9f839c572097cee256d3112c55c74fe9629d01f0ed6d40ef276230b4e6af31aaf58c4c5defe09614b9f

data/lib/rbreadline.rb

@@ -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}
@@ -4436,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
@@ -4658,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)
@@ -6132,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
 
@@ -7016,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"

data/lib/rbreadline/version.rb

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

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 unless const_defined? :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 unless const_defined? :FILENAME_COMPLETION_PROC
+  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 unless const_defined? :USERNAME_COMPLETION_PROC
+  silence_warnings { USERNAME_COMPLETION_PROC = Ucomp }
 
   RbReadline.rl_readline_name = "Ruby"
 
   RbReadline.using_history()
 
-  VERSION = RbReadline.rl_library_version unless const_defined? :VERSION
+  silence_warnings { VERSION = RbReadline.rl_library_version }
 
   module_function :readline
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-readline
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Park Heesob
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake