getopt-declare 1.23 → 1.25

data/Declare.rdoc

@@ -5,7 +5,7 @@
 #
 #  = VERSION
 #
-#  This document describes version 1.22 of Getopt::Declare,
+#  This document describes version 1.25 and later of Getopt::Declare,
 #  Released Jan 21, 2007 for Ruby.
 #
 #  Original Perl's Getopt-Declare v1.09, Released May 21, 1999.
@@ -17,7 +17,7 @@
 #
 #   -q, --quiet                 quiet
 #   -f, --files <files:if>...   input files
-#   -n, --number  <num:n>       a float number
+#   -n, --number  <num:n>       a float number [required]
 #   -i, --integer <num:i>       an integer number
 #
 #   EOF

data/HISTORY.txt

@@ -1,52 +1,69 @@
-1.23 - * Added all samples as Ruby tests, which lead to the discovery
-	 of several bugs.
-       * Fixed silly bug with foundid that would make some parsing not
-	 work (required parameters).
-       * Fixed a silly bug when parsing from a string file, which would
-         modify the string in place
-       * Fixed a bug in that would make it not parse Rh+ and Rh- in
-	 cmdline_pvttype demo and other potential regexes.
-       * Removed 3 warnings from parsing multiple times.
-       * Fixed a bug with cluster: singles not working.
-       * Fixed a stack trace bug with optional single text arguments.
-       * Improved handling of optional integer/float arguments, leaving
-	 them as nil instead of 0 as before.
-       * Added 'used' function to allow returning the flags that are used.
-       * Made CSV demo work again, albeit I am not too happy with the regex.
-       * Made Getopt::Declare part of firebrigade.
-	      http://firebrigade.seattlerb.org/
-
-1.22 - * Fixed some nasty bugs introduced in 1.21, which would cause stack
-         traces.
-       * Fixed the use of /bin/env in some demos instead of /usr/bin/env.
-
-1.21 - Incorporated Perl fixes done by Damian in v1.10 and v1.11 of the 
-       corresponding Getopt-Declare into Ruby.
-       
-       * If -p[rompt] and -p[rompt]2 are specified, they are now distinguished
-         as separate flags.
-       * Documented built-in :id and :qs parameter variable types
-       * Added \G to -v flag checker to solve nasty problem with embedded
-	 args containing -v
-
-1.20 - Added support for using 3 spaces in addition to tabs for
-       parameter descriptions.
-       Added support for GNU -p, --param descriptions, for easier
-       GNU parameter support.
-       Fixed help description bug with [ditto] of single parameter flags.
-
-1.13 - Fixed bug that would always match parameters in a case insensitive
-       way, as if [nocase] had been used.  This should speed the parser a 
-       tiny bit.
-
-       [cluster: ...] was incorrectly being printed in help usage.
-
-1.12 - Fixed bug with :+i, :+n, :0+i options not being cast appropiately
-       when used in pvttypes.
-       Added [debug] option to argument description to turn on debugging.
-
-       NOTE: there is a known bug when using [] within pvttype regex
-       definitions.  Problem seems to be related to DelimScanner/strscan.
-
-1.11 - Fixed a pretty bug that was parsing -flags inappropiately and leading
-       to slower parsing.
+== 1.25
+       * Really just v1.24, but there were problems with hoe releasing.
+       * Made -version not fail when doing rake tests and file is not
+         located.
+       * Upgraded Rakefile to using Hoe (much simpler).
+         Sadly, this makes getopt-declare be getoptdeclare.
+       * Fixed a bug regarding required parameters not being found in
+         the released version of 1.23 (my custom version was okay).
+
+== 1.24
+       * Made -version not fail when doing rake tests and file is not
+         located.
+       * Upgraded Rakefile to using Hoe (much simpler).
+       * Fixed a bug regarding required parameters not being found in
+         the released version of 1.23 (my custom version was okay).
+
+== 1.23
+       * Added all samples as Ruby tests, which lead to the discovery
+	 of several bugs.
+       * Fixed silly bug with foundid that would make some parsing not
+	 work (required parameters).
+       * Fixed a silly bug when parsing from a string file, which would
+         modify the string in place
+       * Fixed a bug in that would make it not parse Rh+ and Rh- in
+	 cmdline_pvttype demo and other potential regexes.
+       * Removed 3 warnings from parsing multiple times.
+       * Fixed a bug with cluster: singles not working.
+       * Fixed a stack trace bug with optional single text arguments.
+       * Improved handling of optional integer/float arguments, leaving
+	 them as nil instead of 0 as before.
+       * Added 'used' function to allow returning the flags that are used.
+       * Made CSV demo work again, albeit I am not too happy with the regex.
+       * Made Getopt::Declare part of firebrigade.
+	      http://firebrigade.seattlerb.org/
+
+1.22 - * Fixed some nasty bugs introduced in 1.21, which would cause stack
+         traces.
+       * Fixed the use of /bin/env in some demos instead of /usr/bin/env.
+
+1.21 - Incorporated Perl fixes done by Damian in v1.10 and v1.11 of the 
+       corresponding Getopt-Declare into Ruby.
+       
+       * If -p[rompt] and -p[rompt]2 are specified, they are now distinguished
+         as separate flags.
+       * Documented built-in :id and :qs parameter variable types
+       * Added \G to -v flag checker to solve nasty problem with embedded
+	 args containing -v
+
+1.20 - Added support for using 3 spaces in addition to tabs for
+       parameter descriptions.
+       Added support for GNU -p, --param descriptions, for easier
+       GNU parameter support.
+       Fixed help description bug with [ditto] of single parameter flags.
+
+1.13 - Fixed bug that would always match parameters in a case insensitive
+       way, as if [nocase] had been used.  This should speed the parser a 
+       tiny bit.
+
+       [cluster: ...] was incorrectly being printed in help usage.
+
+1.12 - Fixed bug with :+i, :+n, :0+i options not being cast appropiately
+       when used in pvttypes.
+       Added [debug] option to argument description to turn on debugging.
+
+       NOTE: there is a known bug when using [] within pvttype regex
+       definitions.  Problem seems to be related to DelimScanner/strscan.
+
+1.11 - Fixed a pretty bug that was parsing -flags inappropiately and leading
+       to slower parsing.

data/Manifest.txt

@@ -0,0 +1,40 @@
+lib
+lib/Getopt
+lib/Getopt/Declare.rb
+lib/Getopt/DelimScanner.rb
+Declare.rdoc
+HISTORY.txt
+README.txt
+Manifest.txt
+samples
+samples/cmdline_basic.rb
+samples/cmdline_mid.rb
+samples/cmdline_parameters.rb
+samples/cmdline_regex.rb
+samples/cmdline_pvtype.rb
+samples/cmdline_code.rb
+samples/cmdline_pvtype2.rb
+samples/cmdline_file.rb
+samples/demo_csv.rb
+samples/demo_shell.rb
+samples/demo_interp.rb
+samples/demo_cmdline.rb
+samples/cmdline_noargv.rb
+samples/cmdline_array.rb
+samples/cmdline_defer.rb
+samples/cmdline_singles.rb
+samples/cmdline_inlines.rb
+samples/cmdline_finish.rb
+Rakefile
+test
+test/test_cmdline_cmdline.rb
+test/test_cmdline_basic.rb
+test/test_cmdline_finish.rb
+test/test_cmdline_mid.rb
+test/test_cmdline_parameters.rb
+test/test_cmdline_pvtype2.rb
+test/test_cmdline_pvtype.rb
+test/test_cmdline_regex.rb
+test/test_demo_csv.rb
+test/test_cluster_singles.rb
+test/test_cmdline_array.rb

data/Rakefile

@@ -1,102 +1,30 @@
 #!/usr/bin/env ruby
 
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
+
+require 'rubygems'
+require 'hoe'
+require './lib/Getopt/Declare'
 
 rdoc_files = ["Declare.rdoc", 'HISTORY.txt'] + Dir.glob('lib/*/*.rb')
 
-#
-# TASK: Gem specification and creation ('gem')
-#
-spec = Gem::Specification.new do |spec|
-  spec.name = "getopt-declare"
-  spec.version = '1.23'
-  spec.author = "Gonzalo Garramuno"
-  spec.email = 'ggarra@advancedsl.com.ar, GGarramuno@aol.com'
-  spec.homepage = 'http://www.rubyforge.org/projects/getoptdeclare/'
-  spec.summary = 'Getopt-Declare is a command-line argument parser.'
-  spec.require_path = "lib"
-  spec.autorequire = "Getopt/Declare"
-  spec.files = ["lib/Getopt/Declare.rb", "lib/Getopt/DelimScanner.rb", 
-                "Rakefile"]
-  spec.description = <<-"EOF"
+
+Hoe.new('getopt-declare', Getopt::Declare::VERSION) do |p|
+  p.rubyforge_name = name = 'getoptdeclare'
+  p.author = "Gonzalo Garramuno"
+  p.email = 'ggarra@advancedsl.com.ar, GGarramuno@aol.com'
+  p.summary = "Getopt-Declare is a command-line argument parser."
+  p.description = <<-"EOF"
     Comprehensive and easy to use command-line parser library using
     regular expressions.  Port of Damian Conway\'s Perl Getopt-Declare.
 EOF
-  # to fix emacs coloring bug
-  spec.extra_rdoc_files = rdoc_files
-  spec.has_rdoc = true
-  spec.test_files = Dir.glob('samples/*.rb')
-  spec.rubyforge_project = 'getoptdeclare'
-  spec.required_ruby_version = '>= 1.6.8'
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-end
-
-
-#
-# TASK: Run rdoc to document code ('rdoc')
-#
-html_dir = 'doc/html'
-library = 'Getopt/Declare'
-Rake::RDocTask.new('rdoc') do |t|
-  t.rdoc_files.include(rdoc_files)
-  t.main = 'doc/index.html'  # Main web page
-  t.title = "#{library} API documentation"
-  t.rdoc_dir = html_dir
-end
-
-
-#
-# TASK: Upload docs to rubyforge ('upload-docs')
-#
-desc 'Upload documentation to RubyForge.'
-task 'upload-docs' => ['rdoc'] do
-  rubyforge_user    = 'gga'
-  rubyforge_project = spec.rubyforge_project
-  rubyforge_path = "/var/www/gforge-projects/#{rubyforge_project}/"
-
-  sh "scp -r #{html_dir}/* #{rubyforge_user}@rubyforge.org:#{rubyforge_path}"
-end
-
-
-desc 'Zip directory as an archive.'
-task 'zip' => ['rdoc'] do
-  dir = File.basename(Dir.pwd)
-  zipfile = spec.name + "-" + spec.version.to_s + ".zip"
-  Dir.chdir('..')
-  File.unlink(zipfile) if File.exists?(zipfile)
-  sh "zip -9rv #{zipfile} #{dir} -x '*~' -x '#*#' -x '*docs/*' -x '*pkg/*' -x '.*'"
-  Dir.chdir(dir)
-end
-
-desc 'Run unit tests'
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/*.rb']
-  t.verbose = true
-  t.warning = true
-  # t.loader = :testrb  
-  # p t.methods - Object.methods
-end
-
-desc 'upload gem'
-task 'upload-gem' => ['test', 'gem'] do
-end
-
-desc 'upload zip'
-task 'upload-zip' => ['zip'] do
+  # p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
+  p.url = "#{name}.rubyforge.org"
+  p.changes = p.paragraphs_of('HISTORY.txt', 0).join("\n\n")
+  p.need_zip = p.need_tar = true
 end
 
-desc 'Upload gem, docs and zip file'
-task 'upload' => [ 'upload-gem', 'upload-zip', 'upload-docs' ]
 
+task :default => ['test', 'redocs', 'publish_docs', 
+                  'package', 'release', 'announce', 'email', 'post_news']
 
 
-#
-# Main task
-#
-task :default => ['upload']

data/lib/Getopt/Declare.rb

@@ -4,7 +4,7 @@
 #  Ruby port of Perl's Getopt::Declare, version 1.21, 
 #  released May 21, 1999.
 #
-#   	$Release Version: 1.22 $
+#   	$Release Version: 1.25 $
 #       $Date: 2007/01/15 10:53:09 $
 #   	by Gonzalo Garramu�o
 #
@@ -70,7 +70,7 @@ module Getopt
   # Main Class
   class Declare
 
-    VERSION = '1.22'
+    VERSION = '1.25'
 
     # For debugging, use [debug] and it will output the ruby code as .CODE.rb
     @@debug = false
@@ -531,7 +531,7 @@ EOS
       @args	= []
       @actions  = []
       @ditto	= dittoflag
-      @required = 0
+      @required = false
       @requires = nil
       @id       = @@nextid
       @desc	= spec.dup
@@ -753,7 +753,7 @@ EOS
 
     # Return foundid of argument, which can be flag's name or variable's name
     def foundid
-      return @foundid || "<#{self.name}>"
+      return @foundid || self.name
     end
 
   end # Arg
@@ -1285,7 +1285,11 @@ EOS
   # Print out version information and maybe exit
   def version(*t)
     prog = "#{$0}"
-    filedate = File.stat( prog ).mtime.localtime()
+    begin
+      filedate = File.stat( prog ).mtime.localtime()
+    rescue
+      filedate = 'Unknown date'
+    end
     prog.sub!(%r#.*/#,'')
     r = ''
     if defined?($VERSION)
@@ -1580,14 +1584,13 @@ end  # begin
 	  for arg in @args
 	    next unless arg.required
 
-	    code << %q%
-unless _FOUND_['% + arg.name + %q%'] %
+	    code << %q%unless _FOUND_['% + arg.name + %q%'] %
 
-   if @mutex[arg.name]
-      for m in @mutex[arg.name]
-         code << %q# or _FOUND_['# + m + %q#']#
-      end
-   end
+              if @mutex[arg.name]
+                for m in @mutex[arg.name]
+                  code << %q# or _FOUND_['# + m + %q#']#
+                end
+              end
 
 	    code << %q%
    $stderr.puts "Error#{@source}: required parameter '% + arg.name + %q%' not found."

data/test/test_cluster_singles.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+# to avoid getopt from exiting...
+def exit(args)
+end
+
+
+class TC_ClusterSingle < Test::Unit::TestCase
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+  		-a		Append mode
+  		-b		Back-up mode
+  		-bu		[ditto]
+  		-c <file>	Copy mode
+  		-d [<file>]	Delete mode
+  		-e[xec]		Execute mode
+
+  		[cluster:singles]
+EOPARAM
+  end
+
+
+  def test_normal
+    @args.parse('-a -b')
+    assert_equal( '-a', @args['-a'] )
+    assert_equal( '-b', @args['-b'] )
+  end
+
+  def test_cluster_ab
+    @args.parse('-ab')
+    assert_equal( '-a', @args['-a'] )
+    assert_equal( '-b', @args['-b'] )
+  end
+
+  def test_cluster_ba
+    @args.parse('-ba')
+    assert_equal( '-a', @args['-a'] )
+    assert_equal( '-b', @args['-b'] )
+  end
+
+  def test_bu
+    @args.parse('-bu')
+    assert_equal( '-bu', @args['-b'] )
+    assert_equal( '-bu', @args['-bu'] )
+  end
+
+  def test_cluster_abu
+    @args.parse('-abu')
+    assert_equal( '-a', @args['-a'] )
+    assert_equal( '-b', @args['-b'] )
+    assert_equal( ['u'], @args.unused )
+  end
+
+end
+

data/test/test_cmdline_array.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+
+class TC_Array < Test::Unit::TestCase
+
+  def setup
+    @file = __FILE__
+    @args = Getopt::Declare.new( %q{
+  		-v <value:i> [etc]	One or more values
+  		<infile:if>		Input file [required]
+  		-o <outfiles:of>...	Output files
+  	}, :build )
+  end
+
+  def test_infile
+    @args.parse(@file)
+    assert_equal( @file, @args['<infile>'] )
+  end
+
+  def test_v_val
+    @args.parse("-v 20 #@file")
+    assert_equal( 20, @args['-v']['<value>'] )
+    assert_equal( @file, @args['<infile>'] )
+  end
+
+  def test_v_val_etc
+    @args.parse("-v 20 etc #@file")
+    assert_equal( 20, @args['-v']['<value>'] )
+    assert_equal( 'etc', @args['-v']['etc'] )
+    assert_equal( @file, @args['<infile>'] )
+  end
+
+  def test_o_single
+    @args.parse("-v 20 etc #@file -o goodbye")
+    assert_equal( ['goodbye'], @args['-o'] )
+  end
+
+  def test_o_multi
+    @args.parse("-v 20 etc #@file -o abc goodbye other")
+    assert_equal( ['abc', 'goodbye', 'other'], @args['-o'] )
+  end
+
+  def test_unused
+    @args.parse("-v 20 etc #@file crapola -o abc goodbye other")
+    assert_equal( ['abc', 'goodbye', 'other'], @args['-o'] )
+    assert_equal( ['crapola'], @args.unused )
+  end
+
+  def test_usage
+    usage = @args.usage
+    # We don't check first lines, as they contain date
+    usage.sub!(/.*Options:/m, '')
+    puts usage
+    assert_equal( <<"EOF", usage )
+
+                -v <value> [etc]        One or more values
+                <infile>                Input file
+                -o <outfiles>...        Output files
+EOF
+  end
+
+end

data/test/test_cmdline_basic.rb

@@ -0,0 +1,92 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+
+class TC_Basic < Test::Unit::TestCase
+
+  def setup
+    @file = __FILE__
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+
+   ============================================================
+   Required parameter:
+
+   -in <infile>		Input file [required]
+
+   ------------------------------------------------------------
+
+   Optional parameters:
+
+   (The first two are mutually exclusive) [mutex: -r -p]
+
+   -r[and[om]]		Output in random order
+   -p[erm[ute]]		Output all permutations
+
+   ---------------------------------------------------
+
+   -out <outfile>	Optional output file
+
+   ------------------------------------------------------------
+   Note: this program is known to run very slowly of files with
+   long individual lines.
+   ============================================================
+EOPARAM
+  end
+
+  def test_infile
+    @args.parse("-in #@file")
+    assert_equal( @args['-in'], @file )
+  end
+
+  def test_outfile
+    @args.parse("-in #@file -out crapola")
+    assert_equal( @args['-in'], @file )
+    assert_equal( @args['-out'], 'crapola' )
+  end
+
+  def test_random
+    @args.parse("-in #@file -random -out crapola")
+    assert_equal( @args['-in'], @file )
+    assert_equal( @args['-out'], 'crapola' )
+    assert_equal( @args['-r']['and'], 'and' )
+    assert_equal( @args['-r']['om'], 'om' )
+  end
+
+  def test_r
+    @args.parse("-in #@file -r -out crapola")
+    assert_equal( @args['-in'], @file )
+    assert_equal( @args['-out'], 'crapola' )
+    assert_not_equal( @args['-r'], nil )
+  end
+
+  def test_p
+    @args.parse("-in #@file -p -out crapola")
+    assert_equal( @args['-in'], @file )
+    assert_equal( @args['-out'], 'crapola' )
+    assert_not_equal( @args['-p'], nil )
+  end
+
+  def test_perm
+    @args.parse("-in #@file -perm -out crapola")
+    assert_equal( @args['-in'], @file )
+    assert_equal( @args['-out'], 'crapola' )
+    assert_equal( @args['-p']['erm'], 'erm' )
+    assert_not_equal( @args['-p']['ute'], 'ute' )
+  end
+
+  def test_permute
+    @args.parse("-in #@file -permute -out crapola")
+    assert_equal( @args['-in'], @file )
+    assert_equal( @args['-out'], 'crapola' )
+    assert_equal( @args['-p']['erm'], 'erm' )
+    assert_equal( @args['-p']['ute'], 'ute' )
+  end
+
+  def test_mutex
+    #     @args.parse("-in #@file -r -permute -out crapola")
+  end
+
+end
+

data/test/test_cmdline_cmdline.rb

@@ -0,0 +1,139 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+# to avoid getopt from exiting...
+def exit(args)
+end
+
+
+class TC_CmdlineDemo < Test::Unit::TestCase
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+General options:
+     -e <f:i>..<t:i>		Set expansion factor to specified range
+                        [requires: <file>]
+                                { puts "k = [#{f}..#{t}]" }
+
+     -e [<k:n>...]		Set expansion factor to <k> (or 2 by default)
+                        [required]
+                                { k = [2] unless k
+                                  print "k = [", k.join(','), "]\n"; }
+
+	-b <blen:i>		Use byte length of <blen> 
+                        [excludes: -a +c]
+                                { print "byte len: #{blen}\n"; }
+
+	<file>...		Process files [required] [implies: -a]
+                                { print "files: #{file}\n"; }
+
+	-a [<n:n>]		Process all data [except item <n>]
+                            { print "proc all\n"; print "except #{n}\n" if n }
+
+	-fab			The fabulous option (is always required :-)
+                        [required]
+                                { defer { print "fabulous!\n" } }
+
+File creation options:
+
+	+c <file>		Create file [mutex: +c -a]
+                                { print "create: file\n"; }
+
+	+d <file>		Duplicate file [implies: -a and -b 8]
+                        	This is a second line
+                                { print "dup (+d) #{file}\n"; }
+	--dup <file>		[ditto] (long form)
+
+	-how <n:i>		Set height to <n>       [repeatable]
+
+Garbling options:
+
+	-g [<seed:i>]		Garble output with optional seed [requires: +c]
+                                { print "garbling with #{seed}\n"; }
+	-i			Case insensitive garbling [required]
+                                { print "insensitive\n"; }
+	-s			Case sensitive garbling 
+	-w			WaReZ m0De 6aRBL1N6 
+
+	[mutex: -i -s -w] 
+EOPARAM
+  end
+
+
+  def test_file
+    @args.parse('-e 1.0 -i -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( [1.0], @args['-e'] )
+    assert_equal( '-i', @args['-i'] )
+  end
+
+  def test_s
+    @args.parse('-e 1.0 -s -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( [1.0], @args['-e'] )
+    assert_equal( '-s', @args['-s'] )
+  end
+
+  def test_w
+    @args.parse('-e 1.0 -w -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( [1.0], @args['-e'] )
+    assert_equal( '-w', @args['-w'] )
+  end
+
+
+  def test_d
+    @args.parse('+d nothing -e 1.0 -w -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( [1.0], @args['-e'] )
+    assert_equal( '-w', @args['-w'] )
+    assert_equal( 'nothing', @args['+d'] )
+    assert_equal( nil, @args['--dup'] )
+  end
+
+  def test_dup
+    @args.parse('--dup nothing -e 1.0 -w -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( [1.0], @args['-e'] )
+    assert_equal( '-w', @args['-w'] )
+    assert_equal( 'nothing', @args['+d'] )
+    assert_equal( 'nothing', @args['--dup'] )
+  end
+
+  def test_how
+    @args.parse('-how 2 -how 3 -e 1.0 -w -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( [1.0], @args['-e'] )
+    assert_equal( '-w', @args['-w'] )
+    assert_equal( 3, @args['-how'] )
+  end
+
+  def test_g
+    @args.parse('+c something -g 20 -e 1.0 -w -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( [1.0], @args['-e'] )
+    assert_equal( '-w', @args['-w'] )
+    assert_equal( 20, @args['-g'] )
+  end
+
+  def test_e
+    @args.parse('-e 2..4 -w -fab file.txt')
+    assert_equal( ['file.txt'], @args['<file>'] )
+    assert_equal( '-fab', @args['-fab'] )
+    assert_equal( 2, @args['-e']['<f>'] )
+    assert_equal( 4, @args['-e']['<t>'] )
+    assert_equal( '-w', @args['-w'] )
+  end
+
+
+end
+

data/test/test_cmdline_finish.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+
+class TC_Finish < Test::Unit::TestCase
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+        --verbose		Print verbose info
+        --			Traditional argument list terminator
+                                                { finish }
+EOPARAM
+  end
+
+  def test_verbose
+    @args.parse("--verbose")
+    assert_equal( '--verbose', @args['--verbose'] )
+  end
+
+  def test_terminator
+    @args.parse("--verbose -- crapola")
+    assert_equal( ['crapola'], @args.unused )
+  end
+
+end
+

data/test/test_cmdline_mid.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+def delold
+  print "would have deleted\n"
+end
+
+class TC_Mid < Test::Unit::TestCase
+
+  def setup
+    @file = __FILE__
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+		-a		Process all data
+		-b <n:n>	Set mean byte length threshold to <N>
+  					{ bytelen = n }
+		+c <FILE>	Create new file <FILE>
+		--del 		Delete old file
+  					{ delold(); }
+		delete 		[ditto]
+		e <w:i>x<h:i>	Expand image to height <h> and width <w>
+  					{ }
+		-F <file>...	Process named file(s)
+  					{ defer { file.each {|i| 
+                                                  process(i) } } }
+		=getrand [<n:i>]	Get a random number
+				(or, optionally, <n> of them)
+  					{ n = 1 unless n }
+		--		Traditionally indicates end of arguments
+  					{ finish }
+EOPARAM
+  end
+
+  def test_getrand
+    @args.parse('=getrand')
+    assert_equal( 1, @args['=getrand'] )
+    @args.parse('=getrand 15')
+    assert_equal( 15, @args['=getrand'] )
+  end
+
+  def test_e
+    @args.parse('e 320x480')
+    assert_equal( 320, @args['e']['<w>'] )
+    assert_equal( 480, @args['e']['<h>'] )
+  end
+
+  def test_delete
+    @args.parse('--del')
+    assert_equal( '--del', @args['--del'] )
+    @args.parse('delete')
+    assert_equal( 'delete', @args['--del'] )
+  end
+
+  def test_end
+    @args.parse('--del =getrand -- 15 -a')
+    assert_equal( nil, @args['-a'] )
+    assert_equal( 1, @args['=getrand'] )
+    assert_equal( '--del', @args['--del'] )
+    assert_equal( ['15', '-a'], @args.unused )
+  end
+
+end
+

data/test/test_cmdline_parameters.rb

@@ -0,0 +1,108 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+# to avoid getopt from exiting...
+def exit(args)
+end
+
+
+class TC_Parameters < Test::Unit::TestCase
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+        -list <l>...				ttt
+        -out <out>				ttt
+	in=<infile>				ttt
+	+range <from> [..] <to>			ttt
+	--lines <start> - <stop>        	ttt
+	ignore bad lines			ttt
+	<outfile>				ttt
+	-copy <files>... <dir>			copy files to dir
+	-range <from:i> [[..] [<to:i>] ]	opt. range
+					{ to = 10 if to == 0 } 
+        -pattern <regex>                        match a pattern
+EOPARAM
+  end
+
+  def test_regex
+    @args.parse("-pattern abc")
+    assert_equal( 'abc', @args['-pattern'] )
+
+    @args.parse("-pattern .*")
+    assert_equal( '.*', @args['-pattern'] )
+
+    @args.parse("-pattern abc[a-z]")
+    assert_equal( 'abc[a-z]', @args['-pattern'] )
+
+    @args.parse("-pattern abc[a-z]+")
+    assert_equal( 'abc[a-z]+', @args['-pattern'] )
+
+    @args.parse("-pattern abc[a-z]+dsa")
+    assert_equal( 'abc[a-z]+dsa', @args['-pattern'] )
+
+    @args.parse("-pattern abc[a-z]+.*")
+    assert_equal( 'abc[a-z]+.*', @args['-pattern'] )
+  end
+
+  def test_list
+    @args.parse('-list 1 2 3 4')
+    assert_equal( ['1','2','3','4'], @args['-list'] )
+  end
+
+  def test_in
+    @args.parse('in=hello')
+    assert_equal( 'hello', @args['in='] )
+  end
+
+  def test_plus_range
+    @args.parse('+range 1 20')
+    assert_equal( '1', @args['+range']['<from>'] )
+    assert_equal( '20', @args['+range']['<to>'] )
+    @args.parse('+range ABC .. ZZZ')
+    assert_equal( 'ABC', @args['+range']['<from>'] )
+    assert_equal( 'ZZZ', @args['+range']['<to>'] )
+  end
+
+  def test_lines
+    @args.parse('--lines 1 - 20')
+    assert_equal( '1', @args['--lines']['<start>'] )
+    assert_equal( '20', @args['--lines']['<stop>'] )
+# Hmm... should this work?
+#     @args.parse('--lines 1-20')
+#     assert_equal( '1', @args['--lines']['<start>'] )
+#     assert_equal( '20', @args['--lines']['<stop>'] )
+  end
+
+  def test_range_minus
+    @args.parse('-range 1 .. 20')
+    assert_equal( 1, @args['-range']['<from>'] )
+    assert_equal( 20, @args['-range']['<to>'] )
+    @args.parse('-range 1..20')
+    assert_equal( 1, @args['-range']['<from>'] )
+    assert_equal( 20, @args['-range']['<to>'] )
+    @args.parse('-range 1 20')
+    assert_equal( 1, @args['-range']['<from>'] )
+    assert_equal( 20, @args['-range']['<to>'] )
+    @args.parse('-range 1')
+    assert_equal( 1, @args['-range']['<from>'] )
+    assert_equal( 10, @args['-range']['<to>'] )
+    @args.parse('-range 1..')
+    assert_equal( 1, @args['-range']['<from>'] )
+    assert_equal( 10, @args['-range']['<to>'] )
+  end
+
+  def test_copy
+    @args.parse('-copy fileA dest')
+    assert_equal( ['fileA'], @args['-copy']['<files>'] )
+    assert_equal( 'dest', @args['-copy']['<dir>'] )
+  end
+
+  def test_ignore_bad_lines
+    @args.parse('ignore bad lines')
+    assert_not_equal( nil, @args['ignore'] )
+  end
+
+end
+

data/test/test_cmdline_pvtype.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+# to avoid getopt from exiting...
+def exit(args)
+end
+
+
+class TC_PvType < Test::Unit::TestCase
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+	[pvtype: type  /AB|[OAB]/ ]
+	[pvtype: Rh    /Rh[+-]/  ]
+  	[pvtype: days  :+i  { 
+                 reject( (_VAL_ < 14)," #{_PARAM_} (too soon!)" ) 
+                            }
+          ]
+	  -donated <d:days>		  Days since last donation
+	  -applied <a:days>		  Days since applied to donate
+
+	  -blood <type:type> [<rh:Rh>]	  Specify blood type
+					  and (optionally) rhesus factor
+EOPARAM
+  end
+
+  def test_type
+    ['AB', 'O', 'A', 'B'].each { |type|
+        line = "-blood #{type}"
+        @args.parse(line)
+        assert_equal( type,  @args['-blood']['<type>'] )
+    }
+  end
+
+  def test_applied
+    @args.parse('-applied 15')
+    assert_equal( 15,  @args['-applied'] )
+  end
+
+  def test_donated
+    @args.parse('-donated 15')
+    assert_equal( 15,  @args['-donated'] )
+  end
+
+  def test_rh
+    ['AB', 'O', 'A', 'B'].each { |type|
+      ['', 'Rh+','Rh-'].each { |rh|
+        line = "-blood #{type} #{rh}"
+        @args.parse(line)
+        assert_equal( type,  @args['-blood']['<type>'] )
+        assert_equal( rh,  @args['-blood']['<rh>'] )
+      }
+    }
+  end
+end
+

data/test/test_cmdline_pvtype2.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+# to avoid getopt from exiting...
+def exit(args)
+end
+
+
+class TC_PvType2 < Test::Unit::TestCase
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+     [strict]
+     [pvtype: num      /\d+/    ]
+     [pvtype: 'a num'  :n       { puts "a num!"  }               ]
+     [pvtype: %q{nbr}  :'a num' ]
+
+		   -count1 <n:num>		  test
+		   -count2 <n:a num>		  test2
+		   -count3 <n:nbr>		  test3
+EOPARAM
+  end
+
+  def test_count1
+    @args.parse('-count1 20')
+    assert_equal( '20', @args['-count1'] )
+  end
+
+  def test_count2
+    @args.parse('-count2 20')
+    assert_equal( 20, @args['-count2'] )
+  end
+
+  # @todo: this should really be 20, not '20'
+  def test_count3
+    @args.parse('-count3 20')
+    assert_equal( '20', @args['-count3'] )
+  end
+end
+

data/test/test_cmdline_regex.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+# to avoid getopt from exiting...
+def exit(args)
+end
+
+
+class TC_Regex < Test::Unit::TestCase
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOPARAM', :build)
+-ar <r:n>	       		Set aspect ratio (will be clipped to [0..1] )
+  				{
+  				  r = 0 if r < 0
+  				  r = 1 if r > 1
+  				}
+-w <pixels:+i>			Specify width in pixels
+-h <pixels:+i>			Specify height in pixels
+-list  <all:i>...		list of numbers
+-range <from:i> [- [<to:i>] ]	opt. range
+					{ to = 10 if to == 0 }
+-parity <p:/even|odd|both/>	Set parity (<p> must be "even",
+				"odd" or "both")
+-file <name:/\w*\.[A-Z]{3}/>	File name must have a three-
+				capital-letter extension
+-find <what:/(%T.)+/> ;	        look ahead test
+EOPARAM
+  end
+
+  def test_ar
+    @args.parse('-ar 1')
+    assert_equal( 1.0, @args['-ar'] )
+    @args.parse('-ar 0.4')
+    assert_equal( 0.4, @args['-ar'] )
+    @args.parse('-ar 15')
+    assert_equal( 1.0, @args['-ar'] )
+    @args.parse('-ar -15')
+    assert_equal( 0.0, @args['-ar'] )
+  end
+
+  def test_w
+    @args.parse('-w 512')
+    assert_equal( 512, @args['-w'] )
+    @args.parse('-w 0')
+    assert_equal( nil, @args['-w'] )
+  end
+  
+  def test_list
+    @args.parse('-list 2 4 8 16 24 64')
+    assert_equal( [2,4,8,16,24,64], @args['-list'] )
+  end
+  
+  def test_parity_regex
+    @args.parse('-parity even')
+    assert_equal( 'even', @args['-parity'] )
+    @args.parse('-parity odd')
+    assert_equal( 'odd', @args['-parity'] )
+    @args.parse('-parity both')
+    assert_equal( 'both', @args['-parity'] )
+  end
+  
+  def test_file_regex
+    @args.parse('-file something.EXT')
+    assert_equal( 'something.EXT', @args['-file'] )
+    @args.parse('-file something.ext')
+    assert_equal( nil, @args['-file'] )
+  end
+
+  def test_find_regex
+    @args.parse('-find hello')
+  end
+
+end
+

data/test/test_demo_csv.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require "Getopt/Declare"
+
+# to avoid getopt from exiting...
+def exit(args)
+end
+
+$students = []
+$absent   = []
+
+class TC_CSV < Test::Unit::TestCase
+
+
+  def setup
+    @args = Getopt::Declare.new(<<'EOCSV', :build)
+	<name:qs> , <id:+i> , <score:0+n>	STD FORMAT [repeatable]
+		{ $students.push( {:name=>name, :id=>id, :score=>score} ) }
+
+	<id:+i> , <name:qs> , <score:0+n>	VARIANT FORMAT [repeatable]
+		{ $students.push( {:name=>name, :id=>id, :score=>score} ) }
+
+	<name:qs> , <id:+i> , DNS		DID NOT SIT [repeatable]
+		{ $absent.push(  {:name=>name, :id=>id, :score=>0} ) }
+
+	<other:/.+/>				SOMETHING ELSE [repeatable]
+                { puts "Unknown entry format: #{other}" }
+EOCSV
+  end
+
+  @@data = <<'EODATA'
+absmith,1234567,20
+"aesmith, the other one",7635656,DNS
+cat,dog,22.2
+7637843,"dejones",66.7
+rmwilliams,288721,88
+help me,I'm trapped,in the marks system
+vtthan,872829,94
+EODATA
+
+  #'
+  def test_csv
+    @args.parse(@@data)
+
+    students = [
+                ["absmith",1234567,20],
+                ['"dejones"',7637843,66.7],
+                ["rmwilliams",288721,88],
+                ['vtthan',872829,94],
+               ]
+
+    assert_equal( students.size, $students.size )
+
+    $students.each_with_index { |i, idx|
+      assert_equal( students[idx][0], i[:name] )
+      assert_equal( students[idx][1], i[:id] )
+      assert_equal( students[idx][2], i[:score] )
+    }
+
+    absent = [
+              ['"aesmith, the other one"',7635656],
+             ]
+
+    assert_equal( absent.size, $absent.size )
+
+    $absent.each_with_index { |i, idx|
+      assert_equal( absent[idx][0], i[:name] )
+      assert_equal( absent[idx][1], i[:id] )
+    }
+  end
+
+
+end
+

metadata

@@ -3,24 +3,24 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: getopt-declare
 version: !ruby/object:Gem::Version 
-  version: "1.23"
-date: 2007-03-21 00:00:00 -03:00
+  version: "1.25"
+date: 2007-06-16 00:00:00 -03:00
 summary: Getopt-Declare is a command-line argument parser.
 require_paths: 
 - lib
 email: ggarra@advancedsl.com.ar, GGarramuno@aol.com
-homepage: http://www.rubyforge.org/projects/getoptdeclare/
+homepage: getoptdeclare.rubyforge.org
 rubyforge_project: getoptdeclare
 description: Comprehensive and easy to use command-line parser library using regular expressions.  Port of Damian Conway's Perl Getopt-Declare.
-autorequire: Getopt/Declare
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.6.8
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
@@ -29,12 +29,15 @@ post_install_message:
 authors: 
 - Gonzalo Garramuno
 files: 
+- lib
+- lib/Getopt
 - lib/Getopt/Declare.rb
 - lib/Getopt/DelimScanner.rb
-- Rakefile
 - Declare.rdoc
 - HISTORY.txt
-test_files: 
+- README.txt
+- Manifest.txt
+- samples
 - samples/cmdline_basic.rb
 - samples/cmdline_mid.rb
 - samples/cmdline_parameters.rb
@@ -53,18 +56,51 @@ test_files:
 - samples/cmdline_singles.rb
 - samples/cmdline_inlines.rb
 - samples/cmdline_finish.rb
-rdoc_options: []
-
+- Rakefile
+- test
+- test/test_cmdline_cmdline.rb
+- test/test_cmdline_basic.rb
+- test/test_cmdline_finish.rb
+- test/test_cmdline_mid.rb
+- test/test_cmdline_parameters.rb
+- test/test_cmdline_pvtype2.rb
+- test/test_cmdline_pvtype.rb
+- test/test_cmdline_regex.rb
+- test/test_demo_csv.rb
+- test/test_cluster_singles.rb
+- test/test_cmdline_array.rb
+test_files: 
+- test/test_cmdline_cmdline.rb
+- test/test_cmdline_basic.rb
+- test/test_cmdline_finish.rb
+- test/test_cmdline_mid.rb
+- test/test_cmdline_parameters.rb
+- test/test_cmdline_pvtype2.rb
+- test/test_cmdline_pvtype.rb
+- test/test_cmdline_regex.rb
+- test/test_demo_csv.rb
+- test/test_cluster_singles.rb
+- test/test_cmdline_array.rb
+rdoc_options: 
+- --main
+- README.txt
 extra_rdoc_files: 
-- Declare.rdoc
 - HISTORY.txt
-- lib/Getopt/Declare.rb
-- lib/Getopt/DelimScanner.rb
+- README.txt
+- Manifest.txt
 executables: []
 
 extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.1
+    version: