highline 1.6.9 → 1.6.10

data/CHANGELOG

@@ -2,6 +2,12 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.10
+
+* Fixed a regression that prevented asking for String arguments (by Jeffery
+  Sman.)
+* Fixed a testing incompatibility (by Hans de Graaff.)
+
 == 1.6.9
 
 * The new list modes now properly ignore escapes when sizing.

data/Rakefile

@@ -6,7 +6,7 @@ require "rubygems"
 
 dir     = File.dirname(__FILE__)
 lib     = File.join(dir, "lib", "highline.rb")
-version = File.read(lib)[/^\s*VERSION\s*=\s*(['"])(\d\.\d\.\d)\1/, 2]
+version = File.read(lib)[/^\s*VERSION\s*=\s*(['"])(\d+\.\d+\.\d+)\1/, 2]
 
 task :default => [:test]
 

data/highline.gemspec

@@ -2,7 +2,7 @@ DIR     = File.dirname(__FILE__)
 LIB     = File.join(DIR, *%w[lib highline.rb])
 VERSION = open(LIB) { |lib|
   lib.each { |line|
-    if v = line[/^\s*VERSION\s*=\s*(['"])(\d\.\d\.\d)\1/, 2]
+    if v = line[/^\s*VERSION\s*=\s*(['"])(\d+\.\d+\.\d+)\1/, 2]
       break v
     end
   }

data/lib/highline.rb

@@ -30,7 +30,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.9".freeze
+  VERSION = "1.6.10".freeze
   
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError

data/lib/highline/question.rb

@@ -302,7 +302,7 @@ class HighLine
     def convert( answer_string )
       if @answer_type.nil?
         answer_string
-      elsif @answer_type == HighLine::String
+      elsif [::String, HighLine::String].include?(@answer_type)
         HighLine::String(answer_string)
       elsif [Float, Integer, String].include?(@answer_type)
         Kernel.send(@answer_type.to_s.to_sym, answer_string)

data/lib/highline/system_extensions.rb

@@ -71,6 +71,8 @@ class HighLine
         # *WARNING*:  This method requires the "termios" library!
         #
         def get_character( input = STDIN )
+          return input.getbyte if input.is_a? StringIO
+          
           old_settings = Termios.getattr(input)
 
           new_settings                     =  old_settings.dup

data/test/tc_highline.rb

@@ -62,6 +62,16 @@ class TestHighLine < Test::Unit::TestCase
     assert_raise(EOFError) { @terminal.ask("Any input left?  ") }
   end
   
+  def test_ask_string
+    name = "James Edward Gray II"
+    @input << name << "\n"
+    @input.rewind
+
+    assert_equal(name, @terminal.ask("What is your name?  ", String))
+
+    assert_raise(EOFError) { @terminal.ask("Any input left?  ", String) }
+  end
+  
   def test_bug_fixes
     # auto-complete bug
     @input << "ruby\nRuby\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies: []
 description: ! 'A high-level IO library that provides validation, type conversion,
   and more for