getopt-declare 1.20 → 1.21

data/Declare.rdoc

@@ -5,7 +5,7 @@
 #
 #  = VERSION
 #
-#  This document describes version 1.20 of Getopt::Declare,
+#  This document describes version 1.21 of Getopt::Declare,
 #  Released Jan 15, 2007 for Ruby.
 #
 #  Original Perl's Getopt-Declare v1.09, Released May 21, 1999.
@@ -17,6 +17,8 @@
 #
 #   -q, --quiet                 quiet
 #   -f, --files <files:if>...   input files
+#   -n, --number  <num:n>       a float number
+#   -i, --integer <num:i>       an integer number
 #
 #   EOF
 #
@@ -230,8 +232,8 @@
 #  	ignore bad lines		
 #  	<outfile>				
 #
-#  Note that each of the above examples has at least one trailing tab
-#  (even if you can't see them). Note too that this hodge-podge of
+#  Note that each of the above examples has to have at least one trailing tab
+#  (even if here Ruby's rdoc strips them). Note too that this hodge-podge of
 #  parameter styles is certainly not recommended within a single program,
 #  but is shown so as to illustrate some of the range of parameter syntax
 #  conventions Getopt::Declare supports.
@@ -380,7 +382,7 @@
 #  == GNU-style parameters
 #
 #  As of v1.20 of Getopt-Declare, it is also possible to write
-#  parameter descriptions following GNU's conventions.
+#  parameter definitions following GNU's conventions, within a single line.
 #  You can write, for example:
 #
 #       -f, --file <file:if>     Filename to read
@@ -682,6 +684,18 @@
 #    this type requires that the matched string is name of an existing 
 #    (and accesable) directory.
 #
+#  * :qs  
+#
+#    which allows a parameter variable to match any quote-delimited or
+#    whitespace-terminated string. Note that this specifier simply makes
+#    explicit the default behaviour.
+#
+#  * :id
+# 
+#    which allows a parameter variable to match any identifier
+#    sequence. That is: a alphabetic or underscore, followed by
+#    zero-or-more alphanumerics or underscores.
+#
 #  * :if  
 #
 #    which is used to match input file names. Like type ':s', type ':if'

data/HISTORY.txt

@@ -1,3 +1,12 @@
+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

data/Rakefile

@@ -3,14 +3,14 @@
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 
-rdoc_files = ["Declare.rdoc", 'HISTORY.txt']
+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.20'
+  spec.version = '1.21'
   spec.author = "Gonzalo Garramuno"
   spec.email = 'ggarra@advancedsl.com.ar, GGarramuno@aol.com'
   spec.homepage = 'http://www.rubyforge.org/projects/getoptdeclare/'
@@ -42,7 +42,7 @@ end
 html_dir = 'doc/html'
 library = 'Getopt/Declare'
 Rake::RDocTask.new('rdoc') do |t|
-  t.rdoc_files.include(rdoc_files, 'lib/**/*.rb')
+  t.rdoc_files.include(rdoc_files)
   t.main = 'doc/index.html'  # Main web page
   t.title = "#{library} API documentation"
   t.rdoc_dir = html_dir

data/lib/Getopt/Declare.rb

@@ -1,10 +1,10 @@
 #
 #  Getopt::Declare - Declaratively Expressed Command-Line Arguments via Regular Expressions
 #
-#  Ruby port of Perl's Getopt::Declare, version 1.20, 
+#  Ruby port of Perl's Getopt::Declare, version 1.21, 
 #  released May 21, 1999.
 #
-#   	$Release Version: 1.20 $
+#   	$Release Version: 1.21 $
 #       $Date: 2007/01/15 10:53:09 $
 #   	by Gonzalo Garramu�o
 #
@@ -62,7 +62,7 @@ end
 
 # Regex for removing bracket directives
 BracketDirectives = 
-  /\[(?:ditto|tight|strict|repeatable|debug|required|mutex:.*|implies:.*|excludes:.*|requires:.*|cluster:.*)\]/
+  /\[\s*(?:ditto|tight|strict|no\s*case|repeatable|debug|required|mutex:.*|implies:.*|excludes:.*|requires:.*|cluster:.*)\s*\]/
 
 
 module Getopt
@@ -124,27 +124,26 @@ module Getopt
       @@stdtype = {}
 
       # (re)set standard types
-      def ScalarArg._reset_stdtype()
+      def ScalarArg._reset_stdtype
 	@@stdtype = {
 	  ':i'	=> { 'pattern' => '(?:(?:%T[+-]?)%D+)' },
 	  ':n'	=> { 'pattern' => '(?:(?:%T[+-]?)(?:%D+(?:%T\.%D*)?' +
 	    '(?:%T[eE](?:[+-])?%D+)?|%T\.%D+(?:%T[eE](?:[+-])?%D+)?))',
 	  },
-	  ':s'	=> { 'pattern' => '(?:%T(?:\S|\0))+' },
-	  ':qs'	=> { 'pattern' => %q#"(?:\\"|[^"])*"|'(?:\\'|[^"])*|(?:%T(?:\S|\0))+#
-	  },
-	  ':id'	=> { 'pattern' => '%T[a-zA-Z_](?:%T\w)*' },
+          ':s'	=> { 'pattern' => '(?:%T(?:\S|\0))+(?=\s|\0|\z)' },
+          ':qs'	=> { 'pattern' => %q{"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|(?:%T(?:\S|\0))+(?=\s|\0|\z)} },
+	  ':id'	=> { 'pattern' => '%T[a-zA-Z_](?:%T\w)*(?=\s|\0|\z)' },
 	  ':d'	=> { 'pattern' => '(?:%T(?:\S|\0))+',
 	    'action' => %q%
               reject( (_VAL_.nil? || !test(?d, _VAL_) ),
                "in parameter '#{_PARAM_}' (\"#{_VAL_}\" is not a directory)")%
 	  },
-	  ':if'	=> { 'pattern' => '%F(?:%T(?:\S|\0))+',
+	  ':if'	=> { 'pattern' => '%F(?:%T(?:\S|\0))+(?=\s|\0|\z)',
 	    'action' => %q%
               reject( (_VAL_.nil? || _VAL_ != "-" && !test(?r, _VAL_) ),
                "in parameter '#{_PARAM_}' (file \"#{_VAL_}\" is not readable)")%
 	  },
-	  ':of'	=> { 'pattern' => '%F(?:%T(?:\S|\0))+',
+	  ':of'	=> { 'pattern' => '%F(?:%T(?:\S|\0))+(?=\s|\0|\z)',
 	    'action' => %q%
             reject( (_VAL_.nil? || _VAL_ != "-" && 
                      test(?r, _VAL_) && !test(?w, _VAL_)), 
@@ -266,15 +265,15 @@ module Getopt
 	stdtype.gsub!(/\%D/,"(?:#{trailing}\\d)")
 	stdtype.gsub!(/\%T/,trailing)
 	unless ( stdtype.sub!("\%F","") )
-	  stdtype = Getopt::Declare::Arg::negflagpat() + stdtype
+	  stdtype = Getopt::Declare::Arg::negflagpat + stdtype
 	end
-	"(?:#{stdtype})"
+	return "(?:#{stdtype})"
       end
 
       # Return string with code to process parameter
       def code(*t)
 	if t[0]
-	  pos1 = t[0].to_s()
+	  pos1 = t[0].to_s
 	else
 	  pos1 = '0'
 	end
@@ -334,7 +333,7 @@ EOS
      # Helps build regex that matches parameters of flags 
      # Wraps parameter passed for #$1, etc. matching
      def ows(g)
-       return '(?:\s|\0)*(' + g + ')' unless @nows
+       return '[\s|\0]*(' + g + ')' unless @nows
        '('+ g +')'
      end
 
@@ -346,17 +345,17 @@ EOS
 
      # Create regexp to match array
      def matcher(g)
-       suffix = !g.nil? ? '\s+' : ''
-       scalar = super(g)  # contains regex to match a scalar element
+       suffix = !g.nil? ? '([\s\0]+)' : ''
+       scalar = super  # contains regex to match a scalar element
        # we match one obligatory element, and one or more optionals ')*'
-       scalar + '(?:\s+' + scalar + ')*' + suffix
+       return scalar + '(?:[\s\0]+' + scalar + ')*' + suffix
      end
 
      # Return string with code to process array parameter
      def code(*t)
 	
 	if t[0]
-	  pos1 = t[0].to_s()
+	  pos1 = t[0].to_s
 	else
 	  pos1 = '0'
 	end
@@ -382,7 +381,7 @@ EOS
 	 end
 	 code << "		  end\n\n"
        end
-       code
+       return code
      end
 
      # Return string with code to cache array in Getopt::Declare's cache
@@ -408,14 +407,14 @@ EOS
 
      # Return regex that matches this punctuation
      def matcher(g)
-       Arg::negflagpat() + Regexp::quote(@text)
+       Arg::negflagpat + Regexp::quote(@text)
      end
 
      # Return string with code to process punctuation
      def code(*t)
        
        if t[0]
-	 pos1 = t[0].to_s()
+	 pos1 = t[0].to_s
        else
 	 pos1 = '0'
        end
@@ -430,7 +429,9 @@ EOS
        if itemcount > 1
 	 "                  @cache['#{ownerflag}']['#{@text}'] = _PUNCT_['#{@text}']\n"
        else
-	 "                  @cache['#{ownerflag}'] = _PUNCT_['#{@text}'] || 1\n"
+         "                  unless @cache['#{ownerflag}']\n" +
+         "                    @cache['#{ownerflag}'] = _PUNCT_['#{@text}'] || 1\n" +
+         "                   end\n"
        end
      end
 
@@ -442,7 +443,7 @@ EOS
      # Helps build regex that matches parameters of flags 
      # Wraps parameter passed for #$1, etc. matching
      def ows(g)
-       return '(?:\s|\0)*(' + g + ')' unless @nows
+       return '[\s\0]*(' + g + ')' unless @nows
        '(' + g + ')'
      end #ows
 
@@ -466,7 +467,7 @@ EOS
 
     # Create regex of help flags based on help shortcuts left
     def Arg.helppat
-      @@helpcmdH.keys().join('|')
+      @@helpcmdH.keys.join('|')
     end
 
 
@@ -481,7 +482,7 @@ EOS
 
     # Create regex of version flags based on help shortcuts left
     def Arg.versionpat
-      @@versioncmdH.keys().join('|')
+      @@versioncmdH.keys.join('|')
     end
 
     @@flags = []
@@ -518,7 +519,8 @@ EOS
 
 
       @@nextid += 1
-      @flag 	= ''
+      @flag 	= nil
+      @foundid  = nil
       @args	= []
       @actions  = []
       @ditto	= dittoflag
@@ -556,7 +558,8 @@ EOS
 	    arg =~ /\A(\s*)(<)([a-zA-Z]\w*)(:[^>]+|)>/ or
 	      raise "Error: bad Getopt::Declare parameter variable specification near '#{arg}'\n"
 
-	    details = [ "#$3", "#$4", !first && !nows.length ]  # NAME,TYPE,NOW
+            # NAME,TYPE,NOW
+	    details = [ "#$3", "#$4", !first && !(nows.length>0) ]
 
 	    if spec && spec.sub!( /\A\.\.\./, "")	# ARRAY ARG
 	      @args.push( ArrayArg.new(*details) )
@@ -567,11 +570,13 @@ EOS
 	    next
 
 	    # PUNCTUATION
-	  elsif spec.sub!( /\A(\s*)((\\.|[^\] \t\n\[<])+)/, "" )
+	  elsif spec.sub!( /\A(\s*)((\\.|[^\] \t\n\[<])+)/, '' )
 	    ows, punct = $1, $2
 	    punct.gsub!( /\\(?!\\)(.)/, '\1' )
 
-	    if first == 1
+	    if first
+              spec  =~ /\A(\S+)/
+              @foundid = "#{punct}#{$1}"
 	      @flag = punct
 	      @@flags.push( punct )
 	    else
@@ -583,7 +588,7 @@ EOS
 	    break
 	  end # if arg/spec.sub
 	ensure
-	  first = 0
+	  first = nil
 	end
       end # while
 
@@ -608,8 +613,8 @@ EOS
       nocasei = ((Getopt::Declare::nocase || @nocase) ? 'i' : '')
 
       code << "          catch(:paramout) do\n"
-      code += (!@repeatable) ? "            while !_FOUND_['" + name() + "']" :
-                               "            while 1"
+      code += !@repeatable? "            while !_FOUND_['" + @foundid + "']" :
+                            "            while 1"
       if (flag && (clump==1 && flag !~ /\A[^a-z0-9]+[a-z0-9]\Z/i ||
 		   (clump<3 && @args )))
 	code << " && !_lastprefix"
@@ -630,7 +635,7 @@ EOS
         boundary = '(\s+|\Z)' if flag =~ /^(--|-|\+|\+\+)$/
 
 	code << '
-                  _args && _pos = gindex( _args, /\G(?:\s|\0)*' + 
+                  _args && _pos = gindex( _args, /\G[\s|\0]*' + 
 	  Regexp::quote(flag) + boundary + '/' + nocasei + ", _pos) or throw(:paramout) 
                   unless @_errormsg
 		    @_errormsg = %q|incorrect specification of '" + flag + "' parameter|
@@ -641,13 +646,13 @@ EOS
       end
 
 
-      code << "\n                  _PARAM_ = '" + self.name() + "'\n"
+      code << "\n                  _PARAM_ = '" + self.name + "'\n"
 
 
       trailer = []
-      i = argcount = @args.length()-1
+      i = @args.size-1
       while i > 0
-	trailer[i-1] = @args[i].trailer()
+	trailer[i-1] = @args[i].trailer
 	trailer[i-1] = trailer[i] unless trailer[i-1]
 	i -= 1
       end # while i
@@ -656,16 +661,18 @@ EOS
       if @args
 	code << "\n"+'                  _args && _pos = gindex( _args, /\G'
 
-	0.upto( argcount ) { |i|
-	  code << @args[i].ows(@args[i].matcher(trailer[i]))
+	@args.each_with_index { |arg, i|
+	  code << arg.ows(arg.matcher(trailer[i]))
 	}
 
+        code << '\b'
+
 	code << '/x' + nocasei + ", _pos ) or throw(:paramout)\n"
       end # if @args
 
-      0.upto( argcount ) { |i|
-	code << @args[i].code(i,mod)	#, $flag ????
-      } 
+      @args.each_with_index { |arg, i|
+	code << arg.code(i,mod)	#, $flag ????
+      }
 
       if flag
 	mutexlist = owner.mutex[flag] ? 
@@ -699,9 +706,9 @@ EOS
       end
 
       if @items > 1
-	code << "                  @cache['#{self.name}'] = {} unless @cache['#{self.name}']\n"
+	code << "                  @cache['#{self.name}'] = {} unless @cache['#{self.name}'].kind_of?(Hash)\n"
         if @ditto
-          code << "\n                  @cache['#{@ditto.name}'] = {} unless @cache['#{@ditto.name}']\n"
+          code << "\n                  @cache['#{@ditto.name}'] = {} unless @cache['#{@ditto.name}'].kind_of?(Hash)\n"
         end
       end
 
@@ -719,9 +726,9 @@ EOS
       end
 
       code << "
-                  _FOUND_['"+ self.name() + "'] = 1
+                  _FOUND_['"+ self.foundid + "'] = 1
                   throw :arg if _pos > 0
-		  _nextpos = _args.length()
+		  _nextpos = _args.size
                   throw :alldone
                 end  # catch(:param)
 	      end  # begin
@@ -734,13 +741,12 @@ EOS
 
     # Return name of argument, which can be flag's name or variable's name
     def name
-      if flag.nil? || flag.empty?
-	i = 0
-	i += 1 while !defined?(args[i].name)
-	"<#{(@args[i]).name}>"
-      else 
-	@flag
-      end
+      return @flag || "<#{@args[0].name}>"
+    end
+
+    # Return foundid of argument, which can be flag's name or variable's name
+    def foundid
+      return @foundid || '<#{@args[0].name}>'
     end
 
   end # Arg
@@ -767,7 +773,7 @@ EOS
   def gindex(str, re, pos)
     @@m.clear()
     if pos = str.index( re, pos )
-      l = $&.length()  # length of match
+      l = $&.size  # length of match
       if l > 0
 	@@m[0] = "#$1"
 	@@m[1] = "#$2"
@@ -790,7 +796,7 @@ EOS
     when Array
       return val.map{ |i| flatten(i,1) }.join(" ")
     when Hash
-      return val.keys().map{ |i| nested || 
+      return val.keys.map{ |i| nested || 
 	  i =~ /^-/ ? [i, flatten(val[i],1)] : 
                       [flatten(val[i],1)] }.join(" ")
     else
@@ -852,9 +858,11 @@ EOS
 
   # Check parameter description for special options
   def _infer(desc, arg, mutex)
-    _mutex(mutex, "#$1".split(' ')) while desc.sub!(/\[mutex:\s*(.*?)\]/i,"")
+    while desc.sub!(/\[\s*mutex:\s*(.*?)\]/i,"")
+      _mutex(mutex, "#$1".split(' '))
+    end
 
-    if desc =~ /\[no\s*case\]/i
+    if desc =~ /\[\s*no\s*case\s*\]/i
       if arg
 	arg.nocase = true
       else 
@@ -863,20 +871,20 @@ EOS
     end
 
     if !arg.nil?
-      if desc =~ /.*\[excludes:\s*(.*?)\]/i
+      if desc =~ /.*\[\s*excludes:\s*(.*?)\]/i
 	_exclude(mutex, arg.name, ("#$1".split(' ')))
       end
 
-      if desc =~ /.*\[requires:\s*(.*?)\]/i
+      if desc =~ /.*\[\s*requires:\s*(.*?)\]/i
 	arg.requires = "#$1"
       end
 
-      arg.required   = ( desc =~ /\[required\]/i )
+      arg.required   = ( desc =~ /\[\s*required\s*\]/i )
 
-      arg.repeatable = ( desc =~ /\[repeatable\]/i )
+      arg.repeatable = ( desc =~ /\[\s*repeatable\s*\]/i )
     end
 
-    _typedef(desc) while desc.sub!(/.*?\[pvtype:\s*/,"")
+    _typedef(desc) while desc.sub!(/.*?\[\s*pvtype:\s*/,"")
 
   end
 
@@ -886,7 +894,7 @@ EOS
   # of standard types
   def _typedef(desc)
     se  = DelimScanner::new( desc )
-    tmp = se.scanQuotelike()
+    tmp = se.scanQuotelike
 
     name = nil
     name, desc = tmp[:delimText], tmp[:suffix]  if tmp
@@ -915,7 +923,7 @@ EOS
 
     
     se  = DelimScanner::new( desc )
-    action = se.extractCodeblock() || ''
+    action = se.extractCodeblock || ''
 
     desc.sub!( Regexp::quote(action).to_re, '' )
     action = action[1..-2]
@@ -933,7 +941,7 @@ EOS
     if originaldesc =~ /\n.*\n/
       originaldesc = "Same as #{originalflag} "
     else
-      originaldesc.chomp()
+      originaldesc.chomp
       originaldesc.gsub!(/\S/,'"')
       while originaldesc.gsub!(/"("+)"/,' \1 ')
       end
@@ -983,7 +991,7 @@ EOS
   def initialize(*opts)
 
     # HANDLE SHORT-CIRCUITS
-    return if opts.length()==2 && (!opts[1] || opts[1] == '-SKIP') 
+    return if opts.size==2 && (!opts[1] || opts[1] == '-SKIP') 
 
     grammar, source = opts
 
@@ -1010,7 +1018,7 @@ EOS
     _all_repeatable = false
     _lastdesc = nil
     Getopt::Declare::nocase = false
-    Getopt::Declare::ScalarArg::_reset_stdtype()
+    Getopt::Declare::ScalarArg::_reset_stdtype
 
 
     # CONSTRUCT GRAMMAR
@@ -1023,12 +1031,12 @@ EOS
       # TYPE DIRECTIVE:
       se  = DelimScanner::new( i )
 
-      if i =~ /\A\s*\[pvtype:/ 
+      if i =~ /\A\s*\[\s*pvtype:/ 
 	_action = se.extractBracketed("[")
 	if _action
 	  i.sub!( Regexp::quote( _action ).to_re, "" )   ### @GGA: added
 	  i.sub!(/\A[ \t]*\n/,"")                        ### @GGA: added
-	  _action.sub!(/.*?\[pvtype:\s*/,"")
+	  _action.sub!(/.*?\[\s*pvtype:\s*/,"")
 	  _typedef(_action)
 	  next
 	end # if
@@ -1050,12 +1058,12 @@ EOS
 	    "\n\n#{_action}\n\n\n"
 	end
 
-	if _args.length() == 0
+	if _args.length == 0
 	  raise "Error: unattached action in Getopt::Declare specification:\n#{_action}\n" +
 	        "\t(did you forget the tab after the preceding parameter specification?)\n"
 	end
 
-	_args.last().actions.push( _action )
+	_args.last.actions.push( _action )
 	next
       elsif i =~ /\A(\s*[{].*)/
 	raise "Error: incomplete action in Getopt::Declare specification:\n$1.....\n" +
@@ -1067,14 +1075,14 @@ EOS
       if i.sub!(re_argument,"")
 	spec = "#$1".strip
 	desc = "#$2"
-	_strict ||= desc =~ /\[strict\]/
+	_strict ||= desc =~ /\[\s*strict\s*\]/
 
         while i.sub!(re_more_desc,"")
           desc += "#$1"
         end
 	
 	ditto = nil
-        if _lastdesc and desc.sub!(/\A\s*\[ditto\]/,_lastdesc)
+        if _lastdesc and desc.sub!(/\A\s*\[\s*ditto\s*\]/,_lastdesc)
           ditto = arg
         else
           _lastdesc = desc
@@ -1101,13 +1109,13 @@ EOS
       end
 
       # OTHERWISE: DECORATION
-      i.sub!(/((?:(?!\[pvtype:).)*)(\n|(?=\[pvtype:))/,"")
+      i.sub!(/((?:(?!\[\s*pvtype:).)*)(\n|(?=\[\s*pvtype:))/,"")
       decorator = "#$1"
-      _strict ||= decorator =~ /\[strict\]/
+      _strict ||= decorator =~ /\[\s*strict\s*\]/
       _infer(decorator, nil, _mutex)
 
-      _all_repeatable = true if decorator =~ /\[repeatable\]/
-      @@debug = true if decorator =~ /\[debug\]/
+      _all_repeatable = true if decorator =~ /\[\s*repeatable\s*\]/
+      @@debug = true if decorator =~ /\[\s*debug\s*\]/
 
     end # while i.length
 
@@ -1126,18 +1134,15 @@ EOS
     end
 
     # Sort flags based on criteria described in docs
-    _args = _args.sort() { |a,b|
-     ( b.flag.length() <=> a.flag.length() ) or
-	( b.flag == a.flag and ( b.args.length() <=> a.args.length() ) ) or
-	( a.id <=> b.id )
-    }
+    _args = _args.sort_by { |a| [a.flag.size, a.flag, a.args.size, a.id] }
+
 
     # Handle clump
-    clump = (@usage =~ /\[cluster:\s*none\s*\]/i)     ? 0 :
-      (@usage =~ /\[cluster:\s*singles?\s*\]/i) ? 1 :
-      (@usage =~ /\[cluster:\s*flags?\s*\]/i)   ? 2 :
-      (@usage =~ /\[cluster:\s*any\s*\]/i)      ? 3 :
-      (@usage =~ /\[cluster:(.*)\s*\]/i)  	 ? "r" : 3
+    clump = (@usage =~ /\[\s*cluster:\s*none\s*\]/i)     ? 0 :
+      (@usage =~ /\[\s*cluster:\s*singles?\s*\]/i) ? 1 :
+      (@usage =~ /\[\s*cluster:\s*flags?\s*\]/i)   ? 2 :
+      (@usage =~ /\[\s*cluster:\s*any\s*\]/i)      ? 3 :
+      (@usage =~ /\[\s*cluster:(.*)\s*\]/i)  	 ? "r" : 3
     raise "Error: unknown clustering mode: [cluster:#$1]\n" if clump == "r"
 
     # CONSTRUCT OBJECT ITSELF
@@ -1149,7 +1154,7 @@ EOS
     @strict  = _strict
     @clump   = clump
     @source  = ''
-    @tight   = @usage =~ /\[tight\]/i
+    @tight   = @usage =~ /\[\s*tight\s*\]/i
     @caller  = caller()
 
     # VESTIGAL DEBUGGING CODE
@@ -1318,7 +1323,7 @@ EOS
 	  desc += "#$1".expand_tabs!
 	end
 
-	next if desc =~ /\[undocumented\]/i
+	next if desc =~ /\[\s*undocumented\s*\]/i
 
 	uoff = 0
 	spec.gsub!(/(<[a-zA-Z]\w*):([^>]+)>/e) { |i|
@@ -1404,7 +1409,7 @@ EOS
   
 
   # Return list of used parameters (after parsing)
-  def used()
+  def used
     used = @cache.each_key { |i| [ i, @cache[i] ] }
     return (used.map { |i| flatten(i) } ).join(' ')
   end
@@ -1481,7 +1486,7 @@ begin
 	  _pos = _nextpos if _args
 
 	  usage(0) if _args && gindex(_args,/\G(% + @helppat + %q%)(\s|\0|\Z)/,_pos)
-          version(0) if _args && _args =~ /(% + @verspat + %q%)(\s|\0|\Z)/
+          version(0) if _args && _args =~ /\G(% + @verspat + %q%)(\s|\0|\Z)/
       %
 
 	  for arg in @args
@@ -1498,7 +1503,7 @@ begin
 
 	  _pos = _nextpos
 
-	  _args && _pos = gindex( _args, /\G(?:\s|\0)*(\S+)/, _pos ) or throw(:alldone)
+	  _args && _pos = gindex( _args, /\G[\s|\0]*(\S+)/, _pos ) or throw(:alldone)
 
 	  if @_errormsg
              $stderr.puts( "Error#{source}: #{@_errormsg}\n" )

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: getopt-declare
 version: !ruby/object:Gem::Version 
-  version: "1.20"
+  version: "1.21"
 date: 2007-01-17 00:00:00 -03:00
 summary: Getopt-Declare is a command-line argument parser.
 require_paths: 
@@ -58,6 +58,8 @@ rdoc_options: []
 extra_rdoc_files: 
 - Declare.rdoc
 - HISTORY.txt
+- lib/Getopt/Declare.rb
+- lib/Getopt/DelimScanner.rb
 executables: []
 
 extensions: []