linen 0.3.2 → 0.4.0

data/lib/linen.rb

@@ -18,8 +18,8 @@ require 'string_extensions'
 
 
 module Linen
-	VERSION = "0.3.2"
-	SVNRev  = %q$Rev: 86 $
+	VERSION = "0.4.0"
+	SVNRev  = %q$Rev: 99 $
 
 
 	def self::plugins

data/lib/linen/argument.rb

@@ -11,28 +11,22 @@ class Linen::Plugin::Argument
 	attr_reader :prompt
 
 	def initialize( plugin, name, opts )
-		@plugin     = plugin
-		@name       = name
-		@prompt     = opts[:prompt]     || "Please enter the value for #{@name}"
-		@validation = opts[:validation] || /^\w+$/
-		@conversion = opts[:conversion] || nil
+		@plugin  = plugin
+		@name    = name
+		@prompt  = opts[ :prompt  ] || "Please enter the value for #{@name}"
+		@regex   = opts[ :regex   ] || /^\w+$/
+		@process = opts[ :process ] || nil
 	end
 
 
-	def convert( value )
-		return value unless @conversion
-		return @conversion.call( value )
-	end
-
+	def process( value )
+		raise Linen::Plugin::ArgumentError unless value =~ @regex
+		return value unless @process
 
-	def validate( value )
-		if @validation.is_a? Proc
-			result = @validation.call( value )
-		else
-			result = ( value =~ @validation )
+		begin
+			return @process.call( value )
+		rescue => e
+			raise Linen::Plugin::ArgumentError, e.message
 		end
-
-		raise Linen::Plugin::ArgumentError, "Value '#{value}' is invalid for #{@name}." unless result
-		return value
 	end
 end

data/lib/linen/cli.rb

@@ -121,14 +121,12 @@ class Linen::CLI
 				input = Readline.readline( "\nContinue [y/N]? ")
 				input = "n" if input == ''
 			end
+			
+			return unless input =~ /^y/i
 		end
-
-		if input =~ /^y/i
-			puts # blank line
-
-			workspace.add_values( results )
-			command.execute( workspace )
-		end
+		
+		workspace.add_values( results )
+		command.execute( workspace )
 	end
 
 

data/lib/linen/command.rb

@@ -33,7 +33,7 @@ class Linen::Plugin::Command
 
 		# this map turns our list of args into a list like this:
 		# <arg1> <arg2> <arg3> <arg4>...
-		arg_list = arguments.map {|a| "<#{a.to_s}>"}.join( ' ' )
+		arg_list = @arguments.map {|a| "<#{a.to_s}>"}.join( ' ' )
 
 		output << "Usage: #{@plugin.short_name} #{name} #{arg_list}"
 
@@ -130,13 +130,12 @@ class Linen::Plugin::Command
 			@arguments.each do |arg_name|
 				argument = @plugin.arguments[ arg_name ]
 
-				results[ arg_name ] = argument.validate( arg ) rescue nil
+				results[ arg_name ] = argument.process( arg ) rescue nil
 			end
 
 			raise Linen::Plugin::ArgumentError,
 				"The value you entered ('#{arg}') is invalid for all arguments." if
 					results.values.compact.empty?
-
 		rescue Linen::Plugin::ArgumentError => e
 			print "#{e}  "
 
@@ -159,17 +158,12 @@ class Linen::Plugin::Command
 			begin
 				arg_value = Linen::CLI.reprompt( argument.prompt ) if arg_value.nil?
 
-				argument.validate arg_value
-
+				results[ arg_name ] = argument.process( arg_value )
 			rescue Linen::Plugin::ArgumentError => e
-				print "#{e}  "
-
 				# reset arg_value to nil so we get prompted on retry
 				arg_value = nil
 
 				retry
-			else
-				results[ arg_name ] = argument.convert( arg_value )
 			end
 		end
 

data/test/test_plugins.rb

@@ -35,7 +35,6 @@ class TestPlugins < Test::Unit::TestCase
 	################
 
 	class ::HelpfulPlugin < Linen::Plugin
-		puts TestPlugins.description
 		description TestPlugins.description
 
 		command :test do

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: linen
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 date: 2007-09-10 00:00:00 -07:00
 summary: Linen - A pluggable command-line interface library
 require_paths: