highline 0.6.1 → 1.0.0

data/CHANGELOG

@@ -2,6 +2,23 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.0.0
+
+* Fixed documentation typo pointed out by Gavin Kistner.
+* Added <tt>gather = ...</tt> option to question for fetching entire Arrays or
+  Hashes filled with answers.  You can set +gather+ to a count of answers to
+  collect, a String or Regexp matching the end of input, or a Hash where each
+  key can be used in a new question.
+* Added File support to HighLine.ask().  You can specify a _directory_ and a
+  _glob_ pattern that combine into a list of file choices the user can select
+  from.  You can choose to receive the user's answer as an open filehandle or as
+  a Pathname object.
+* Added Readline support for history and editing.
+* Added tab completion for menu  and file selection selection (requires
+  Readline).
+* Added an optional character limit for input.
+* Added a complete help system to HighLine's shell menu creation tools.
+
 == 0.6.1
 
 * Removed termios dependancy in gem, to fix Windows' install.

data/LICENSE

@@ -1,7 +1,7 @@
 = License Terms
 
-Distributed under the
+Distributed under the user's choice of the GPL[http://www.gnu.org/copyleft/gpl.html] (see COPYING for details) or the
 {Ruby software license}[http://www.ruby-lang.org/en/LICENSE.txt] by
-James Edward Gray II.
+James Edward Gray II and Greg Brown.
 
 Please email James[mailto:james@grayproductions.net] with any questions.

data/Rakefile

@@ -16,11 +16,13 @@ Rake::RDocTask.new do |rdoc|
 	rdoc.main = "README"
 	rdoc.rdoc_files.include( "README", "INSTALL",
 	                         "TODO", "CHANGELOG",
+	                         "AUTHORS", "COPYING",
 	                         "LICENSE", "lib/" )
 	rdoc.rdoc_dir = "doc/html"
 	rdoc.title = "HighLine Documentation"
 end
 
+desc "Upload current documentation to Rubyforge"
 task :upload_docs => [:rdoc] do
 	sh "scp -r site/* " +
 	   "bbazzarrakk@rubyforge.org:/var/www/gforge-projects/highline/"
@@ -30,7 +32,7 @@ end
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "highline"
-	spec.version = "0.6.1"
+	spec.version = "1.0.0"
 	spec.platform = Gem::Platform::RUBY
 	spec.summary = "HighLine is a high-level line oriented console interface."
 	spec.files = Dir.glob("{examples,lib,test}/**/*.rb").
@@ -62,3 +64,11 @@ Rake::GemPackageTask.new(spec) do |pkg|
 	pkg.need_zip = true
 	pkg.need_tar = true
 end
+
+desc "Show library's code statistics"
+task :stats do
+	require 'code_statistics'
+	CodeStatistics.new( ["HighLine", "lib"], 
+	                    ["Functionals", "examples"], 
+	                    ["Units", "test"] ).to_s
+end

data/TODO

@@ -3,10 +3,4 @@
 The following is a list of planned expansions for HighLine, in no particular
 order.
 
-* Support <tt>ask(..., Array)</tt>, better than the current
-  <tt>ask(..., lambda { |arr| arr.split(",") })</tt> or similar.
-* Support <tt>ask(..., Hash)</tt>.
-* Support <tt>ask(..., File)</tt>.
-* Add readline support for history and editing.
-* Add an easy-access help system for menus.
-* Add tab completion for menu selection.
+* This space for rent...

data/examples/asking_for_arrays.rb

@@ -0,0 +1,18 @@
+#!/usr/local/bin/ruby -w
+
+# asking_for_arrays.rb
+#
+#  Created by James Edward Gray II on 2005-07-05.
+#  Copyright 2005 Gray Productions. All rights reserved.
+
+require "rubygems"
+require "highline/import"
+require "pp"
+
+grades = ask( "Enter test scores (or a blank line to quit):",
+              lambda { |ans| ans =~ /^-?\d+$/ ? Integer(ans) : ans} ) do |q|
+	q.gather = ""
+end
+
+say("Grades:")
+pp grades

data/examples/menus.rb

@@ -55,12 +55,12 @@ loop do
 		menu.shell  = true
 		menu.case   = :capitalize
 	
-		menu.choice :Load do |command, details|
+		menu.choice(:Load, "Load a file.") do |command, details|
 			say("Loading file with options:  #{details}...")
 		end
-		menu.choice :Save do |command, details|
+		menu.choice(:Save, "Save a file.") do |command, details|
 			say("Saving file with options:  #{details}...")
 		end
-		menu.choice(:Quit) { exit }
+		menu.choice(:Quit, "Exit program.") { exit }
 	end
 end

data/examples/using_readline.rb

@@ -0,0 +1,17 @@
+#!/usr/local/bin/ruby -w
+
+# using_readline.rb
+#
+#  Created by James Edward Gray II on 2005-07-06.
+#  Copyright 2005 Gray Productions. All rights reserved.
+
+require "rubygems"
+require "highline/import"
+
+loop do
+	cmd = ask("Enter command:  ", %w{save load reset quit}) do |q|
+		q.readline = true
+	end
+	say("Executing \"#{cmd}\"...")
+	break if cmd == "quit"
+end

data/lib/highline.rb

@@ -11,13 +11,15 @@ require "highline/question"
 require "highline/menu"
 require "erb"
 require "optparse"
+require "stringio"
+require "abbrev"
 
 #
 # A HighLine object is a "high-level line oriented" shell over an input and an 
 # output stream.  HighLine simplifies common console interaction, effectively
 # replacing puts() and gets().  User code can simply specify the question to ask
 # and any details about user interaction, then leave the rest of the work to
-# HighLine.  When HighLine.ask() returns, you'll have to answer you requested,
+# HighLine.  When HighLine.ask() returns, you'll have the answer you requested,
 # even if HighLine had to ask many times, validate results, perform range
 # checking, convert types, etc.
 #
@@ -93,6 +95,15 @@ class HighLine
 		@output  = output
 		@wrap_at = wrap_at
 		@page_at = page_at
+		
+		@question = nil
+		@answer   = nil
+		@menu     = nil
+		@header   = nil
+		@prompt   = nil
+		@gather   = nil
+		@answers  = nil
+		@key      = nil
 	end
 	
 	#
@@ -136,7 +147,10 @@ class HighLine
 	def ask(question, answer_type = String, &details) # :yields: question
 		@question ||= Question.new(question, answer_type, &details)
 		
-		say(@question)
+		return gather if @question.gather
+		
+		# readline() needs to handle it's own output
+		say(@question) unless @question.readline
 		begin
 			@answer = @question.answer_or_default(get_response)
 			unless @question.valid_answer?(@answer)
@@ -230,10 +244,10 @@ class HighLine
 		
 		if @menu.shell
 			selected = ask("Ignored", @menu.answer_type)
-			@menu.select(*selected)
+			@menu.select(self, *selected)
 		else
 			selected = ask("Ignored", @menu.answer_type)
-			@menu.select(selected)
+			@menu.select(self, selected)
 		end
 	end
 
@@ -376,6 +390,51 @@ class HighLine
 		end
 	end
 	
+	#
+	# Collects an Array/Hash full of answers as described in 
+	# HighLine::Question.gather().
+	# 
+	def gather(  )
+		@gather           = @question.gather
+		@answers          = [ ]
+		original_question = @question
+		
+		@question.gather = false
+		
+		case @gather
+		when Integer
+			@answers << ask(@question)
+			@gather -= 1
+
+			original_question.question = ""
+			until @gather.zero?
+				@question = original_question
+				@answers << ask(@question)
+				@gather -= 1
+			end
+		when String, Regexp
+			@answers << ask(@question)
+
+			original_question.question = ""
+			until (@gather.is_a?(String) and @answers.last.to_s == @gather) or
+			      (@gather.is_a?(Regexp) and @answers.last.to_s =~ @gather)
+				@question = original_question
+				@answers << ask(@question)
+			end
+			
+			@answers.pop
+		when Hash
+			@answers = { }
+			@gather.keys.sort.each do |key|
+				@question = original_question
+				@key      = key
+				@answers[key] = ask(@question)
+			end
+		end
+		
+		@answers
+	end
+	
 	#
 	# This section builds a character reading function to suit the proper
 	# platform we're running on.  Be warned:  Here be dragons!
@@ -442,9 +501,37 @@ class HighLine
     #
 	# Read a line of input from the input stream and process whitespace as
 	# requested by the Question object.
+	# 
+	# If Question's _readline_ property is set, that library will be used to
+	# fetch input.  *WARNING*:  This ignores the currently set input stream.
 	#
 	def get_line(  )
-		@question.change_case(@question.remove_whitespace(@input.gets))
+		if @question.readline
+			require "readline"    # load only if needed
+
+			# capture say()'s work in a String to feed to readline()
+			old_output = @output
+			@output = StringIO.new
+			say(@question)
+			question = @output.string
+			@output  = old_output
+			
+			# prep auto-completion
+			completions = @question.selection.abbrev
+			Readline.completion_proc = lambda { |string| completions[string] }
+			
+			# work-around ugly readline() warnings
+			old_verbose = $VERBOSE
+			$VERBOSE    = nil
+			answer      = @question.change_case(
+			                  @question.remove_whitespace(
+			                      Readline.readline(question, true) ) )
+			$VERBOSE    = old_verbose
+
+			answer
+		else
+			@question.change_case(@question.remove_whitespace(@input.gets))
+		end
 	end
 	
 	#
@@ -454,7 +541,7 @@ class HighLine
 	#
 	def get_response(  )
 		if @question.character.nil?
-			if @question.echo == true
+			if @question.echo == true and @question.limit.nil?
 				get_line
 			else
 				line = ""
@@ -462,7 +549,8 @@ class HighLine
 					line << character.chr
 					# looking for carriage return (decimal 13) or
 					# newline (decimal 10) in raw input
-					break if character == 13 or character == 10
+					break if character == 13 or character == 10 or
+					         (@question.limit and line.size == @question.limit)
 					@output.print(@question.echo) if @question.echo != false
 				end
 				say("\n")

data/lib/highline/menu.rb

@@ -23,12 +23,13 @@ class HighLine
 		# 
 		def initialize(  )
 			#
-			# Initialize Question objects with ignored valued, we'll
+			# Initialize Question objects with ignored values, we'll
 			# adjust ours as needed.
 			# 
-			super("Ignored", [ ], &nil)    # avoiding passing to block along
+			super("Ignored", [ ], &nil)    # avoiding passing the block along
 			
 			@items           = [ ]
+			@help            = Hash.new("There's no help for that topic.")
 
 			@index           = :number
 			@index_suffix    = ". "
@@ -41,12 +42,15 @@ class HighLine
 			@shell           = false
 			@nil_on_handled  = false
 			
-			# Override Questions repsonses, we'll set our own.
+			# Override Questions responses, we'll set our own.
 			@responses       = { }
+			# Context for action code.
+			@highline        = nil
 			
 			yield self if block_given?
 
 			update_responses     # rebuild responses based on our settings
+			init_help if @shell and not @help.empty?
 		end
 
 		#
@@ -125,10 +129,14 @@ class HighLine
 		# will be returned, unless _nil_on_handled_ is set (when you would get
 		# +nil+ instead).  In _shell_ mode, a provided block will be passed the
 		# command chosen and any details that followed the command.  Otherwise,
-		# just the command is passed.
+		# just the command is passed.  The <tt>@highline</tt> variable is set to
+		# the current HighLine context before the action code is called and can
+		# thus be used for adding output and the like.
 		# 
-		def choice( name, &action )
+		def choice( name, help = nil, &action )
 			@items << [name, action]
+			
+			@help[name.to_s.downcase] = help unless help.nil?
 		end
 		
 		#
@@ -166,6 +174,39 @@ class HighLine
 			end
 		end
 		
+		# 
+		# Initializes the help system by adding a <tt>:help</tt> choice, some
+		# action code, and the default help listing.
+		# 
+		def init_help(  )
+			return if @items.include?(:help)
+			
+			topics    = @help.keys.sort
+			help_help = @help.include?("help") ? @help["help"] :
+			            "This command will display helpful messages about " +
+			            "functionality, like this one.  To see the help for " +
+			            "a specific topic enter:\n\thelp [TOPIC]\nTry asking " +
+			            "for help on any of the following:\n\n" +
+			            "<%= list(#{topics.inspect}, :columns_across) %>"
+			choice(:help, help_help) do |command, topic|
+				topic.strip!
+				topic.downcase!
+				if topic.empty?
+					@highline.say(@help["help"])
+				else
+					@highline.say("= #{topic}\n\n#{@help[topic]}")
+				end
+			end
+		end
+		
+		#
+		# Used to set help for arbitrary topics.  Use the topic <tt>"help"</tt>
+		# to override the default message.
+		# 
+		def help( topic, help )
+			@help[topic] = help
+		end
+		
 		# 
 		# Setting a _layout_ with this method also adjusts some other attributes
 		# of the Menu object, to ideal defaults for the chosen _layout_.  To
@@ -232,10 +273,10 @@ class HighLine
 
 		#
 		# This method processes the auto-completed user selection, based on the
-		# rules for this Menu object.  It an action was provided for the 
+		# rules for this Menu object.  If an action was provided for the 
 		# selection, it will be executed as described in Menu.choice().
 		# 
-		def select( selection, details = nil )
+		def select( highline_context, selection, details = nil )
 			# Find the selected action.
 			name, action = if selection =~ /^\d+$/
 				@items[selection.to_i - 1]
@@ -247,6 +288,7 @@ class HighLine
 			
 			# Run or return it.
 			if not @nil_on_handled and not action.nil?
+				@highline = highline_context
 				if @shell
 					action.call(name, details)
 				else

data/lib/highline/question.rb

@@ -7,6 +7,7 @@
 
 require "optparse"
 require "date"
+require "pathname"
 
 class HighLine
 	#
@@ -34,7 +35,9 @@ class HighLine
 			@answer_type = answer_type
 			
 			@character    = nil
+			@limit        = nil
 			@echo         = true
+			@readline     = false
 			@whitespace   = :strip
 			@case         = nil
 			@default      = nil
@@ -43,6 +46,9 @@ class HighLine
 			@below        = nil
 			@in           = nil
 			@confirm      = nil
+			@gather       = false
+			@directory    = Pathname.new(File.expand_path(File.dirname($0)))
+			@glob         = "*"
 			@responses    = Hash.new
 			
 			# allow block to override settings
@@ -52,6 +58,8 @@ class HighLine
 			build_responses
 		end
 		
+		# The ERb template of the question to be asked.
+		attr_accessor :question
 		# The type that will be used to convert this answer.
 		attr_accessor :answer_type
 		#
@@ -65,6 +73,12 @@ class HighLine
 		# 
 		attr_accessor :character
 		#
+		# Allows you to set a character limit for input.
+		# 
+		# *WARNING*:  This option forces a character by character read.
+		# 
+		attr_accessor :limit
+		#
 		# Can be set to +true+ or +false+ to control whether or not input will
 		# be echoed back to the user.  A setting of +true+ will cause echo to
 		# match input, but any other true value will be treated as to String to
@@ -75,6 +89,16 @@ class HighLine
 		#
 		attr_accessor :echo
 		#
+		# Use the Readline library to fetch input.  This allows input editing as
+		# well as keeping a history.  In addition, tab will auto-complete 
+		# within an Array of choices or a file listing.
+		# 
+		# *WARNING*:  This option is incompatible with all of HighLine's 
+		# character reading  modes and it causes HighLine to ignore the
+		# specified _input_ stream.
+		# 
+		attr_accessor :readline
+		#
 		# Used to control whitespace processing for the answer to this question.
 		# See HighLine::Question.remove_whitespace() for acceptable settings.
 		#
@@ -105,6 +129,31 @@ class HighLine
 		# 
 		attr_accessor :confirm
 		#
+		# When set, the user will be prompted for multiple answers which will
+		# be collected into an Array or Hash and returned as the final answer.
+		# 
+		# You can set _gather_ to an Integer to have an Array of exactly that
+		# many answers collected, or a String/Regexp to match an end input which
+		# will not be returned in the Array.
+		# 
+		# Optionally _gather_ can be set to a Hash.  In this case, the question
+		# will be asked once for each key and the answers will be returned in a
+		# Hash, mapped by key.  The <tt>@key</tt> variable is set before each 
+		# question is evaluated, so you can use it in your question.
+		# 
+		attr_accessor :gather
+		#
+		# The directory from which a user will be allowed to select files, when
+		# File or Pathname is specified as an _answer_type_.  Initially set to
+		# <tt>Pathname.new(File.expand_path(File.dirname($0)))</tt>.
+		# 
+		attr_accessor :directory
+		# 
+		# The glob pattern used to limit file selection when File or Pathname is
+		# specified as an _answer_type_.  Initially set to <tt>"*"</tt>.
+		# 
+		attr_accessor :glob
+		#
 		# A Hash that stores the various responses used by HighLine to notify
 		# the user.  The currently used responses and their purpose are as
 		# follows:
@@ -148,7 +197,7 @@ class HighLine
 		#
 		def build_responses(  )
 			### WARNING:  This code is quasi-duplicated in     ###
-			### Menu.update_responses().  Check their too when ###
+			### Menu.update_responses().  Check there too when ###
 			### making changes!                                ###
 			append_default unless default.nil?
 			@responses = { :ambiguous_completion =>
@@ -168,7 +217,7 @@ class HighLine
 			                   "Your answer isn't valid (must match " +
 			                   "#{@validate.inspect})." }.merge(@responses)
 			### WARNING:  This code is quasi-duplicated in     ###
-			### Menu.update_responses().  Check their too when ###
+			### Menu.update_responses().  Check there too when ###
 			### making changes!                                ###
 		end
 		
@@ -208,9 +257,14 @@ class HighLine
 		# <tt>lambda {...}</tt>::  Answer is passed to lambda for conversion.
 		# Date::                   Date.parse() is called with answer.
 		# DateTime::               DateTime.parse() is called with answer.
+		# File::                   The entered file name is auto-completed in 
+		#                          terms of _directory_ + _glob_, opened, and
+		#                          returned.
 		# Float::                  Answer is converted with Kernel.Float().
 		# Integer::                Answer is converted with Kernel.Integer().
 		# +nil+::                  Answer is left in String format.  (Default.)
+		# Pathname::               Same as File, save that a Pathname object is
+		#                          returned.
 		# String::                 Answer is converted with Kernel.String().
 		# Regexp::                 Answer is fed to Regexp.new().
 		# Symbol::                 The method to_sym() is called on answer and
@@ -230,14 +284,22 @@ class HighLine
 				answer_string.to_sym
 			elsif @answer_type == Regexp
 				Regexp.new(answer_string)
-			elsif @answer_type.is_a?(Array)
+			elsif @answer_type.is_a?(Array) or
+			      [File, Pathname].include?(@answer_type)
 				# cheating, using OptionParser's Completion module
-				@answer_type.extend(OptionParser::Completion)
-				answer = @answer_type.complete(answer_string)
+				choices = selection
+				choices.extend(OptionParser::Completion)
+				answer = choices.complete(answer_string)
 				if answer.nil?
 					raise NoAutoCompleteMatch
 				end
-				answer.last
+				if @answer_type.is_a?(Array)
+					answer.last
+				elsif @answer_type == File
+					File.open(File.join(@directory.to_s, answer.last))
+				else
+					Pathname.new(File.join(@directory.to_s, answer.last))
+				end
 			elsif [Date, DateTime].include?(@answer_type) or
 			      @answer_type.is_a?(Class)
 				@answer_type.parse(answer_string)
@@ -310,6 +372,23 @@ class HighLine
 				answer_string
 			end
 		end
+
+		#
+		# Returns an Array of valid answers to this question.  These answers are
+		# only known when _answer_type_ is set to an Array of choices, File, or
+		# Pathname.  Any other time, this method will return an empty Array.
+		# 
+		def selection(  )
+			if @answer_type.is_a?(Array)
+				@answer_type
+			elsif [File, Pathname].include?(@answer_type)
+				Dir[File.join(@directory.to_s, @glob)].map do |file|
+					File.basename(file)
+				end
+			else
+				[ ]
+			end			
+		end
 		
 		# Stringifies the question to be asked.
 		def to_str(  )

data/test/tc_highline.rb

@@ -5,9 +5,6 @@
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
 
-$test_lib_dir ||= File.join(File.dirname(__FILE__), "..", "lib")
-$:.unshift($test_lib_dir) unless $:.include?($test_lib_dir)
-
 require "test/unit"
 
 require "highline"
@@ -233,6 +230,68 @@ class TestHighLine < Test::Unit::TestCase
                       @output.string )
 	end
 	
+	def test_files
+		@input << "#{File.basename(__FILE__)[0, 5]}\n"
+		@input.rewind
+
+		file = @terminal.ask("Select a file:  ", File) do |q|
+			q.directory = File.expand_path(File.dirname(__FILE__))
+			q.glob      = "*.rb"
+		end
+		assert_instance_of(File, file)
+		assert_equal("#!/usr/local/bin/ruby -w\n", file.gets)
+		assert_equal("\n", file.gets)
+		assert_equal("# tc_highline.rb\n", file.gets)
+		file.close
+
+		@input.rewind
+
+		pathname = @terminal.ask("Select a file:  ", Pathname) do |q|
+			q.directory = File.expand_path(File.dirname(__FILE__))
+			q.glob      = "*.rb"
+		end
+		assert_instance_of(Pathname, pathname)
+		assert_equal(File.size(__FILE__), pathname.size)
+	end
+	
+	def test_gather
+		@input << "James\nDana\nStorm\nGypsy\n\n"
+		@input.rewind
+
+		answers = @terminal.ask("Enter four names:") do |q|
+			q.gather = 4
+		end
+		assert_equal(%w{James Dana Storm Gypsy}, answers)
+		assert_equal("\n", @input.gets)
+		assert_equal("Enter four names:\n", @output.string)
+
+		@input.rewind
+
+		answers = @terminal.ask("Enter four names:") do |q|
+			q.gather = ""
+		end
+		assert_equal(%w{James Dana Storm Gypsy}, answers)
+
+		@input.rewind
+
+		answers = @terminal.ask("Enter four names:") do |q|
+			q.gather = /^\s*$/
+		end
+		assert_equal(%w{James Dana Storm Gypsy}, answers)
+
+		@input.truncate(@input.rewind)
+		@input << "29\n49\n30\n"
+		@input.rewind
+		@output.truncate(@output.rewind)
+
+		answers = @terminal.ask("<%= @key %>:  ", Integer) do |q|
+			q.gather = { "Age" => 0, "Wife's Age" => 0, "Father's Age" => 0}
+		end
+		assert_equal( { "Age" => 29, "Wife's Age" => 30, "Father's Age" => 49},
+		              answers )
+		assert_equal("Age:  Father's Age:  Wife's Age:  ", @output.string)
+	end
+	
 	def test_lists
 		digits = %w{Zero One Two Three Four Five Six Seven Eight Nine}
 		

data/test/tc_import.rb

@@ -5,9 +5,6 @@
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
 
-$test_lib_dir ||= File.join(File.dirname(__FILE__), "..", "lib")
-$:.unshift($test_lib_dir) unless $:.include?($test_lib_dir)
-
 require "test/unit"
 
 require "highline/import"

data/test/tc_menu.rb

@@ -5,9 +5,6 @@
 #  Created by Gregory Thomas Brown on 2005-05-10.
 #  Copyright 2005 smtose.org. All rights reserved.
 
-$test_lib_dir ||= File.join(File.dirname(__FILE__), "..", "lib")
-$:.unshift($test_lib_dir) unless $:.include?($test_lib_dir)
-
 require "test/unit"
 
 require "highline"
@@ -69,6 +66,39 @@ class TestMenu < Test::Unit::TestCase
 		assert_equal("Sample1, Sample2 or Sample3?  ", @output.string)
 	end
 
+	def test_help
+		@input << "help\nhelp load\nhelp rules\nhelp missing\n"
+		@input.rewind
+
+		4.times do
+			@terminal.choose do |menu|
+				menu.shell = true
+
+				menu.choice(:load, "Load a file.")
+				menu.choice(:save, "Save data in file.")
+				menu.choice(:quit, "Exit program.")
+				
+				menu.help("rules", "The rules of this system are as follows...")
+			end
+		end
+		assert_equal( "1. load\n2. save\n3. quit\n4. help\n?  " +
+		              "This command will display helpful messages about " +
+		              "functionality, like this one.  To see the help for a " +
+		              "specific topic enter:\n" +
+		              "\thelp [TOPIC]\n" +
+		              "Try asking for help on any of the following:\n" +
+		              "\nload   quit   rules  save \n" + 
+		              "1. load\n2. save\n3. quit\n4. help\n?  " +
+		              "= load\n\n" + 
+		              "Load a file.\n" +
+		              "1. load\n2. save\n3. quit\n4. help\n?  " +
+		              "= rules\n\n" +
+		              "The rules of this system are as follows...\n" +
+		              "1. load\n2. save\n3. quit\n4. help\n?  " +
+		              "= missing\n\n" + 
+		              "There's no help for that topic.\n", @output.string )
+	end
+
 	def test_index
 		@input << "Sample1\n"
 		@input.rewind
@@ -291,7 +321,7 @@ class TestMenu < Test::Unit::TestCase
 
 		selected = nil
 		options  = nil
-		answer = @terminal.choose(:load, :save, :quit) do |menu|
+		answer = @terminal.choose do |menu|
 			menu.choices(:load, :quit)
 			menu.choice(:save) do |command, details|
 				selected = command

data/test/ts_all.rb

@@ -5,9 +5,6 @@
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
 
-$test_dir ||= File.dirname(__FILE__)
-$:.unshift($test_dir) unless $:.include?($test_dir)
-
 require "test/unit"
 
 require "tc_highline"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: highline
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
-date: 2005-05-23
+  version: 1.0.0
+date: 2005-07-07
 summary: HighLine is a high-level line oriented console interface.
 require_paths: 
   - lib
@@ -30,10 +30,12 @@ authors:
   - James Edward Gray II
 files: 
   - examples/ansi_colors.rb
+  - examples/asking_for_arrays.rb
   - examples/basic_usage.rb
   - examples/menus.rb
   - examples/page_and_wrap.rb
   - examples/password.rb
+  - examples/using_readline.rb
   - lib/highline.rb
   - lib/highline/import.rb
   - lib/highline/menu.rb