linen 0.4.0 → 0.5.0

data/lib/linen.rb

@@ -18,8 +18,8 @@ require 'string_extensions'
 
 
 module Linen
-	VERSION = "0.4.0"
-	SVNRev  = %q$Rev: 99 $
+	VERSION = "0.5.0"
+	SVNRev  = %q$Rev: 119 $
 
 
 	def self::plugins
@@ -27,9 +27,10 @@ module Linen
 	end
 
 
-	def self::start
-		Linen::CLI.start_loop
-	end
+	def self::start( handler = Linen::CLI )
+		Linen::Workspace.register_handler handler
+		handler.start
+	end		
 end
 
 
@@ -40,7 +41,11 @@ require 'linen/argument'
 require 'linen/command'
 
 
+### handlers
+require 'linen/handler'
+require 'linen/handlers/cli'
+
+
 ### Other Infrastructure
-require 'linen/cli'
 require 'linen/exceptions'
 require 'linen/workspace'

data/lib/linen/argument.rb

@@ -14,7 +14,7 @@ class Linen::Plugin::Argument
 		@plugin  = plugin
 		@name    = name
 		@prompt  = opts[ :prompt  ] || "Please enter the value for #{@name}"
-		@regex   = opts[ :regex   ] || /^\w+$/
+		@regex   = opts[ :regex   ] || //
 		@process = opts[ :process ] || nil
 	end
 

data/lib/linen/exceptions.rb

@@ -37,3 +37,5 @@ class Linen::CLI::AmbiguousCommandError < Linen::CLI::AbstractAmbiguityError
 		super
 	end
 end
+
+class Linen::WorkspaceError < RuntimeError ; end

data/lib/linen/handler.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+##############################################################
+# Copyright 2007, LAIKA, Inc.                                #
+#                                                            #
+# Authors:                                                   #
+#  * Ben Bleything <bbleything@laika.com>                    #
+##############################################################
+
+class Linen::Handler
+	# placeholder.  This will eventually become the abstract
+	# class from which all handlers inherit.
+	
+	def self::say( input )
+		raise NotImplementedError, "You must override say() in the handler"
+	end
+end

data/lib/linen/{cli.rb → handlers/cli.rb}

@@ -7,7 +7,7 @@
 #  * Ben Bleything <bbleything@laika.com>                    #
 ##############################################################
 
-class Linen::CLI
+class Linen::CLI < Linen::Handler
 	class << self
 		attr_accessor :prompt
 	end
@@ -63,7 +63,7 @@ class Linen::CLI
 	end
 
 
-	def self::start_loop
+	def self::start
 		loop do
 			begin
 				input = Readline.readline( @prompt )
@@ -81,6 +81,11 @@ class Linen::CLI
 	#######
 	private
 	#######
+	
+	# def self::say( input )
+	# 	puts input
+	# end
+
 
 	def self::canonicalize( input )
 		begin
@@ -114,7 +119,11 @@ class Linen::CLI
 
 			puts results.map { |arg, value|
 				next unless value
-				"#{arg}: #{value}"
+				
+				output = value
+				output = value.join( ', ' ) if value.is_a? Array
+				
+				"#{arg}: #{output}"
 			}.join( "\n" )
 
 			while input !~ /^(y|n)/i

data/lib/linen/workspace.rb

@@ -8,6 +8,14 @@
 ##############################################################
 
 class Linen::Workspace
+	def self::register_handler( handler_class )
+		raise Linen::WorkspaceError,
+			"Can only register subclasses of Linen::Handler" unless
+				handler_class < Linen::Handler
+
+		@@handler = handler_class
+	end
+	
 	def set_value( name, value )
 		# add getter
 		(class << self ; self ; end).instance_eval {
@@ -26,4 +34,8 @@ class Linen::Workspace
 			self.set_value k, v
 		end
 	end
+	
+	def method_missing( *args )
+		@@handler.send( *args )
+	end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: linen
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 date: 2007-09-10 00:00:00 -07:00
 summary: Linen - A pluggable command-line interface library
 require_paths: 
@@ -35,9 +35,11 @@ files:
 - lib/indifferent_hash.rb
 - lib/linen
 - lib/linen/argument.rb
-- lib/linen/cli.rb
 - lib/linen/command.rb
 - lib/linen/exceptions.rb
+- lib/linen/handler.rb
+- lib/linen/handlers
+- lib/linen/handlers/cli.rb
 - lib/linen/plugin.rb
 - lib/linen/plugin_registry.rb
 - lib/linen/workspace.rb