easyprompt 0.1.2 → 0.1.3

data/lib/easyprompt.rb

@@ -24,42 +24,30 @@ require 'contxtlservice'
 require 'observer'
 
 class EasyPrompt
-	Version = '0.1.2'
+	Version = '0.1.3'
 
-	def initialize; @stdout = MockableStdout.get_mockable_stdout; end
+	def initialize
+		@stdout = MockableStdout.get_mockable_stdout
+		@stdin = MockableStdin.get_mockable_stdin
+	end
 
 	# Asks the user for input.
 	# msg:: The prompt that tells the user what information to enter next.
 	# default:: The default value that will be returned if the user enters a newline (usually by pressing "Enter") without typing any information. The default value will be displayed in square brackets after +msg+.
 	# response_class:: The sort of value that EasyPrompt#ask should return. Valid response classes are:
 	#                  [:string] This is the default.
+	#                  [:array] Takes an arbitrary number of lines entered by the user, and returns them as an array. The entry stops when the user enters a blank line.
 	#                  [: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 )
-		success = false
-		last_error = nil
-		until success
-			success = true
+		@success = false
+		@last_error = nil
+		until @success
+			@success = true
 			full_msg = msg
-			full_msg = last_error + ' ' + full_msg if last_error
+			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
+			response = try_parse_response( default, response_class )
 		end
 		response
 	end
@@ -78,6 +66,40 @@ class EasyPrompt
 		end
 		prompt
 	end
+
+	def try_parse_array_response( response ) #:nodoc:
+		response = [ response ]
+		while ( ( next_line = @stdin.gets ) != "\n" )
+			response << next_line.chomp
+		end
+		response
+	end
+	
+	def try_parse_regexp_response( response ) #:nodoc:
+		begin
+			Regexp.new response
+		rescue RegexpError
+			@success = false
+			@last_error = "I'm sorry, but that was not a valid regular expression."
+			nil
+		end
+	end
+	
+	def try_parse_response( default, response_class ) #:nodoc:
+		response = @stdin.gets
+		response.chomp!
+		if response == ''
+			default
+		else
+			if response_class == :boolean
+				response =~ /^y/i 
+			elsif response_class == :regexp
+				try_parse_regexp_response response
+			elsif response_class == :array
+				try_parse_array_response response
+			end
+		end
+	end
 	
 	# The MockCommandLineUser can be used if you want to unit-test the command-line part of a program. 
 	#
@@ -139,13 +161,17 @@ class EasyPrompt
 
 		def match_regexp #:nodoc:
 			arg = @mock_stdout.string
-			@mock_stdout.string = ''
-			matching = @responses.map { |regexp, response_pair |
-				( loc = arg =~ regexp ) ? [ regexp, loc ] : nil
-			}
-			matching.compact!
-			fail "Can't match \"#{ arg }\"" if matching.empty?
-			( matching.sort_by { |regexp, loc| loc } ).last.first
+			if arg != ''
+				@mock_stdout.string = ''
+				matching = @responses.map { |regexp, response_pair |
+					( loc = arg =~ regexp ) ? [ regexp, loc ] : nil
+				}
+				matching.compact!
+				fail "Can't match \"#{ arg }\"" if matching.empty?
+				( matching.sort_by { |regexp, loc| loc } ).last.first
+			else
+				nil
+			end
 		end
 		
 		def respond( response ) #:nodoc:
@@ -171,8 +197,6 @@ class EasyPrompt
 				@match_count[regexp] += 1
 			elsif regexp
 				raise "Exceeded limit of #{ @responses[regexp].last } for #{ regexp }"
-			else
-				raise "Can't find a response for " + arg
 			end
 		end
 	end

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.6
 specification_version: 1
 name: easyprompt
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2005-08-09
+  version: 0.1.3
+date: 2005-09-14
 summary: EasyPrompt is a utility for command-line scripts.
 require_paths: 
   - lib