easyprompt 0.1.1 → 0.1.2

data/lib/easyprompt.rb

@@ -20,10 +20,11 @@
 #
 # The Rubyforge project page can be found at http://rubyforge.org/projects/easyprompt/ .
 
-require 'lafcadio'
+require 'contxtlservice'
+require 'observer'
 
 class EasyPrompt
-	Version = '0.1.1'
+	Version = '0.1.2'
 
 	def initialize; @stdout = MockableStdout.get_mockable_stdout; end
 
@@ -124,7 +125,7 @@ class EasyPrompt
 		def initialize
 			@responses = {}
 			flush
-			context = Lafcadio::Context.instance
+			context = ContextualService::Context.instance
 			@mock_stdin = StringIO.new
 			@mock_stdin.add_observer( self )
 			context.set_resource( MockableStdin, @mock_stdin )
@@ -176,13 +177,13 @@ class EasyPrompt
 		end
 	end
 
-	class MockableStdin < Lafcadio::ContextualService #:nodoc:
+	class MockableStdin < ContextualService::Service #:nodoc:
 		def method_missing( symbol, *args )
 			$stdin.send( symbol, *args )
 		end
 	end
 	
-	class MockableStdout < Lafcadio::ContextualService #:nodoc:
+	class MockableStdout < ContextualService::Service #:nodoc:
 		def method_missing( symbol, *args )
 			$stdout.send( symbol, *args )
 		end

data/lib/easyprompt.rb~

@@ -1,5 +1,3 @@
-require 'lafcadio'
-
 # EasyPrompt is a utility for command-line scripts. It handles prompts and default values, and also provides a testing facility for mocking out the command-line user.
 #
 # For example, here's an irb session that illustrates what EasyPrompt does:
@@ -19,8 +17,13 @@ require 'lafcadio'
 #   => true
 #
 # In the first example, we ask for the user's first name and get "John" as the response. In the second example, we supply the default of "Doe", which the user chooses by just pressing the "Enter" key. In the third example, we supply the default of +true+, which the user chooses as well. We received the boolean value +true+ as opposed to the string "true" or "y", because we specified <tt>:boolean</tt> as the +response_class+.
+#
+# The Rubyforge project page can be found at http://rubyforge.org/projects/easyprompt/ .
+
+require 'lafcadio'
+
 class EasyPrompt
-	Version = '0.1.0'
+	Version = '0.1.1'
 
 	def initialize; @stdout = MockableStdout.get_mockable_stdout; end
 
@@ -30,15 +33,32 @@ class EasyPrompt
 	# response_class:: The sort of value that EasyPrompt#ask should return. Valid response classes are:
 	#                  [:string] This is the default.
 	#                  [:boolean] Values will be turned into <tt>true</tt> or <tt>false</tt> depending on whether the user enters "y" or "n".
+	#                  [:regexp] Values will be read as a regular expression source. If the user enters an invalid regexp source, EasyPrompt will re-prompt until a valid regexp source is entered.
 	def ask( msg, default = nil, response_class = :string )
-		@stdout.write( prompt( msg, default, response_class ) + ' ' )
-		stdin = MockableStdin.get_mockable_stdin
-		response = stdin.gets
-		response.chomp!
-		if response == ''
-			response = default
-		else
-			response = response =~ /^y/i if response_class == :boolean
+		success = false
+		last_error = nil
+		until success
+			success = true
+			full_msg = msg
+			full_msg = last_error + ' ' + full_msg if last_error
+			@stdout.write( prompt( full_msg, default, response_class ) + ' ' )
+			stdin = MockableStdin.get_mockable_stdin
+			response = stdin.gets
+			response.chomp!
+			if response == ''
+				response = default
+			else
+				if response_class == :boolean
+					response = response =~ /^y/i 
+				elsif response_class == :regexp
+					begin
+						response = Regexp.new response
+					rescue RegexpError
+						success = false
+						last_error = "I'm sorry, but that was not a valid regular expression."
+					end
+				end
+			end
 		end
 		response
 	end
@@ -48,6 +68,8 @@ class EasyPrompt
 		unless default.nil?
 			if response_class == :boolean
 				default_str = default ? 'y' : 'n'
+			elsif response_class == :regexp
+				default_str = default.source
 			else
 				default_str = default.to_s
 			end
@@ -101,7 +123,7 @@ class EasyPrompt
 		# is no match, an error will be raised. Use set_response to add a response.
 		def initialize
 			@responses = {}
-			@match_count = Hash.new( 1 )
+			flush
 			context = Lafcadio::Context.instance
 			@mock_stdin = StringIO.new
 			@mock_stdin.add_observer( self )
@@ -109,6 +131,10 @@ class EasyPrompt
 			@mock_stdout = StringIO.new
 			context.set_resource( MockableStdout, @mock_stdout )
 		end
+		
+		# Clears out the running count of how many times each response has been
+		# used.
+		def flush; @match_count = Hash.new( 1 ); end
 
 		def match_regexp #:nodoc:
 			arg = @mock_stdout.string

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.6
 specification_version: 1
 name: easyprompt
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2005-04-11
+  version: 0.1.2
+date: 2005-08-09
 summary: EasyPrompt is a utility for command-line scripts.
 require_paths: 
   - lib
@@ -39,12 +39,12 @@ extensions: []
 requirements: []
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: lafcadio
+    name: contxtlservice
     version_requirement: 
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - ">"
           - !ruby/object:Gem::Version 
-            version: 0.6.0
+            version: 0.0.0
       version: