highline 1.6.1 → 1.6.2

data/CHANGELOG

@@ -2,6 +2,13 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.2
+
+* Correctly handle STDIN being closed before we receive any data (fix by
+  mleinart).
+* Try if msvcrt, if we can't load crtdll on Windows (fix by pepijnve).
+* A fix for nil_on_handled not running the action (reported by Andrew Davey).
+
 == 1.6.1
 
 * Fixed raw_no_echo_mode so that it uses stty -icanon rather than cbreak

data/lib/highline.rb

@@ -29,7 +29,7 @@ require "highline/color_scheme"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.1".freeze
+  VERSION = "1.6.2".freeze
   
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
@@ -591,9 +591,16 @@ class HighLine
       # work-around ugly readline() warnings
       old_verbose = $VERBOSE
       $VERBOSE    = nil
+      raw_answer  = Readline.readline(question, true)
+      if raw_answer.nil?
+        if @@track_eof
+          raise EOFError, "The input stream is exhausted."
+        else
+          raw_answer = String.new # Never return nil
+        end
+      end
       answer      = @question.change_case(
-                        @question.remove_whitespace(
-                            Readline.readline(question, true) ) )
+                        @question.remove_whitespace(raw_answer))
       $VERBOSE    = old_verbose
 
       answer

data/lib/highline/menu.rb

@@ -306,13 +306,14 @@ class HighLine
       end
       
       # Run or return it.
-      if not @nil_on_handled and not action.nil?
+      if not action.nil?
         @highline = highline_context
         if @shell
-          action.call(name, details)
+          result = action.call(name, details)
         else
-          action.call(name)
+          result = action.call(name)
         end
+        @nil_on_handled ? nil : result
       elsif action.nil?
         name
       else

data/lib/highline/system_extensions.rb

@@ -35,6 +35,8 @@ class HighLine
       # character from +STDIN+!
       # 
       def get_character( input = STDIN )
+        Win32API.new("msvcrt", "_getch", [ ], "L").Call
+      rescue Exception
         Win32API.new("crtdll", "_getch", [ ], "L").Call
       end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: highline
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 1
-  version: 1.6.1
+  prerelease: 
+  version: 1.6.2
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -05:00
+date: 2011-05-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -84,23 +79,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: highline
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: HighLine is a high-level command-line IO library.