malysz87-highline 1.5.10 → 1.5.11

data/lib/highline.rb

@@ -29,12 +29,16 @@ require "abbrev"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.5.8".freeze
+  VERSION = "1.5.9".freeze
   
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
     # do nothing, just creating a unique error type
   end
+
+  class InvalidAnswerError < StandardError
+    # do nothing, just creating a unique error type
+  end
   
   # The setting used to disable color output.
   @@use_color = true
@@ -220,8 +224,7 @@ class HighLine
     begin
       @answer = @question.answer_or_default(get_response)
       unless @question.valid_answer?(@answer)
-        explain_error(:not_valid)
-        raise QuestionError
+        raise InvalidAnswerError
       end
       
       @answer = @question.convert(@answer)
@@ -252,6 +255,9 @@ class HighLine
       end
     rescue QuestionError
       retry
+    rescue InvalidAnswerError
+      actions[:not_valid].call(:not_valid, @answer, actions.default)
+      retry
     rescue ArgumentError
       actions[:invalid_type].call(:invalid_type, @answer, actions.default)
       retry

data/test/tc_highline.rb

@@ -818,7 +818,7 @@ class TestHighLine < Test::Unit::TestCase
     assert_not_nil(HighLine::VERSION)
     assert_instance_of(String, HighLine::VERSION)
     assert(HighLine::VERSION.frozen?)
-    assert_match(/\A\d\.\d\.\d\Z/, HighLine::VERSION)
+    assert_match(/\d\.\d\.\d/, HighLine::VERSION)
   end
 
   def test_ask_with_mane_answers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: malysz87-highline
 version: !ruby/object:Gem::Version 
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 -08:00
+date: 2009-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: []