getopt-declare 1.26 → 1.27

data/HISTORY.txt

@@ -1,3 +1,8 @@
+== 1.27
+       * Fixed a bug with the sorting of arguments, which could sometimes
+         lead to strange parsing.
+       * Made required argument parsing more strict.
+
 == 1.26 
        * Stripping of usage was making help lines that were not
          parameters look bad.  Fixed.

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.26 $
+#   	$Release Version: 1.27 $
 #       $Date: 2007/01/15 10:53:09 $
 #   	by Gonzalo Garramu�o
 #
@@ -70,7 +70,7 @@ module Getopt
   # Main Class
   class Declare
 
-    VERSION = '1.26'
+    VERSION = '1.27'
 
     # For debugging, use [debug] and it will output the ruby code as .CODE.rb
     @@debug = false
@@ -616,7 +616,6 @@ EOS
 	end
       end # while
 
-
       @@helpcmdH.delete(@flag)    if @@helpcmdH.key?(@flag)
       @@versioncmdH.delete(@flag) if @@versioncmdH.key?(@flag)
     end # initialize
@@ -635,12 +634,15 @@ EOS
       i = 0
       nocasei = ((Getopt::Declare::nocase || @nocase) ? 'i' : '')
 
-      code << "          catch(:paramout) do\n"
-      code += !@repeatable? "            while !_FOUND_['" + self.foundid + "']" :
-                            "            while true"
+      code << "          catch(:paramout) do\n            while "
+      if @requires
+        code << requires << ' and '
+      end
+      code += !@repeatable? "!_FOUND_['" + self.foundid + "']" : "true"
+
       if (flag && (clump==1 && flag !~ /\A[^a-z0-9]+[a-z0-9]\Z/i ||
 		   (clump<3 && @args.size > 0 )))
-	code << ' && !_lastprefix'
+	code << ' and !_lastprefix'
       end
 
       code << '
@@ -1130,6 +1132,7 @@ EOS
     end # while i.length
 
 
+
     _lastactions = nil
     for i in _args
       if _lastactions && i.ditto && i.actions.size == 0
@@ -1145,13 +1148,14 @@ EOS
 
     # Sort flags based on criteria described in docs
     # Sadly, this cannot be reduced to sort_by
-    _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() { |a,b|
+      cond1 = ( b.flag.size <=> a.flag.size )
+      cond2 = ( b.flag == a.flag and ( b.args.size <=> a.args.size ) )
+      cond3 = ( a.id <=> b.id )
+      cond1 = nil if cond1 == 0
+      cond2 = nil if cond2 == 0
+      cond1 or cond2 or cond3
     }
-    # _args = _args.sort_by { |a| [a.flag.size, a.flag, a.args.size, a.id] }
-
 
     # Handle clump
     clump = (@usage =~ /\[\s*cluster:\s*none\s*\]/i)     ? 0 :

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: getopt-declare
 version: !ruby/object:Gem::Version 
-  version: "1.26"
-date: 2007-06-17 00:00:00 -03:00
+  version: "1.27"
+date: 2007-06-23 00:00:00 -03:00
 summary: Getopt-Declare is a command-line argument parser.
 require_paths: 
 - lib