highline 1.2.6 → 1.2.7

data/CHANGELOG

@@ -2,6 +2,12 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.2.7
+
+* Fixed the stty indent bug.
+* Fixed the echo backspace bug.
+* Added HighLine::track_eof=() setting to work are threaded eof?() calls.
+
 == 1.2.6
 
 Patch by Jeremy Hinegardner:

data/lib/highline.rb

@@ -29,7 +29,7 @@ require "abbrev"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.2.6".freeze
+  VERSION = "1.2.7".freeze
   
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
@@ -48,6 +48,19 @@ class HighLine
   def self.use_color?
     @@use_color
   end
+  
+  # The setting used to disable EOF tracking.
+  @@track_eof = true
+  
+  # Pass +false+ to _setting_ to turn off HighLine's EOF tracking.
+  def self.track_eof=( setting )
+    @@track_eof = setting
+  end
+  
+  # Returns true if HighLine is currently tracking EOF for input.
+  def self.track_eof?
+    @@track_eof
+  end
 
   # The setting used to control color schemes.
   @@color_scheme = nil
@@ -75,7 +88,9 @@ class HighLine
   # An alias for CLEAR.
   RESET      = CLEAR
   # Erase the current line of terminal output.
-  ERASE_LINE = "\e[K" 
+  ERASE_LINE = "\e[K"
+  # Erase the character under the cursor.
+  ERASE_CHAR = "\e[P"
   # The start of an ANSI bold sequence.
   BOLD       = "\e[1m"
   # The start of an ANSI dark sequence.  (Terminal support uncommon.)
@@ -573,7 +588,8 @@ class HighLine
 
       answer
     else
-      raise EOFError, "The input stream is exhausted." if @input.eof?
+      raise EOFError, "The input stream is exhausted." if @@track_eof and
+                                                          @input.eof?
 
       @question.change_case(@question.remove_whitespace(@input.gets))
     end
@@ -600,22 +616,34 @@ class HighLine
         line = ""
         begin
           while character = (stty ? @input.getc : get_character(@input))
-            line << character.chr
+            # honor backspace and delete
+            if character == 127 or character == 8
+              line.slice!(-1, 1)
+            else
+              line << character.chr
+            end
             # looking for carriage return (decimal 13) or
             # newline (decimal 10) in raw input
             break if character == 13 or character == 10 or
                      (@question.limit and line.size == @question.limit)
-            @output.print(@question.echo) if @question.echo != false
-          end
-          if @question.overwrite
-            @output.print("\r#{ERASE_LINE}")
-            @output.flush
-          else
-            say("\n")
+            if @question.echo != false
+              if character == 127 or character == 8
+                @output.print("\b#{ERASE_CHAR}")
+              else
+                @output.print(@question.echo)
+              end
+              @output.flush
+            end
           end
         ensure
           restore_mode if stty
         end
+        if @question.overwrite
+          @output.print("\r#{ERASE_LINE}")
+          @output.flush
+        else
+          say("\n")
+        end
         
         @question.change_case(@question.remove_whitespace(line))
       end

data/test/tc_highline.rb

@@ -771,6 +771,20 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal(("-=" * 40 + "\n") + ("-=" * 10 + "\n"), @output.string)
   end
   
+  def test_track_eof
+    assert_raise(EOFError) { @terminal.ask("Any input left?  ") }
+    
+    # turn EOF tracking
+    old_setting = HighLine.track_eof?
+    assert_nothing_raised(Exception) { HighLine.track_eof = false }
+    begin
+      @terminal.ask("And now?  ")  # this will still blow up, nothing available
+    rescue
+      assert_not_equal(EOFError, $!.class)  # but HighLine's safe guards are off
+    end
+    HighLine.track_eof = old_setting
+  end
+  
   def test_version
     assert_not_nil(HighLine::VERSION)
     assert_instance_of(String, HighLine::VERSION)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: highline
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
-date: 2007-01-25 00:00:00 -06:00
+  version: 1.2.7
+date: 2007-01-31 00:00:00 -06:00
 summary: HighLine is a high-level command-line IO library.
 require_paths: 
 - lib