getopt 1.3.4 → 1.3.5

data/CHANGES

@@ -1,3 +1,10 @@
+== 5-Jul-2006 - 1.3.5
+* Fixed a bug where multiple long switches with the same first character
+  could cause invalid results.  Thanks go to Michael Campbell for the spot.
+* Added documentation to the README file that explains what happens if you
+  specify multiple long switches with the same first character and no short
+  switch alias.
+
 == 7-Mar-2006 - 1.3.4
 * Fixed Getopt::Long so that it can handle embedded hyphens in the long
   form, e.g. --foo-bar.  Thanks go to Mark Meves for the spot.

data/README

@@ -76,11 +76,14 @@ Long.getopts(switches)
 
    The array should be in the form:
 
+   # long form, short form (alias), option type
    ["--long", "-l", Getopt::OPTION]
 
-   Note that only the long form is required.  If the short switch is not
+   Note that only the long form is required.  If the short form is not
    specified, it will automatically be set to the first letter of the long
-   switch.
+   switch.  If multiple long switches with the same first character are
+   listed without short switches, only the first long switch gets the short
+   switch alias.
 
    If the argument type is not specified, the default is BOOLEAN.
 

data/lib/getopt/long.rb

@@ -5,11 +5,12 @@ module Getopt
    OPTIONAL  = 2
    INCREMENT = 3
    NEGATABLE = 4
+   NUMERIC   = 5
 
    class LongError < StandardError; end
 
    class Long
-      VERSION = "1.3.4"
+      VERSION = '1.3.5'
 
       # Takes an array of switches.  Each array consists of three elements.
       def self.getopts(*switches)
@@ -33,8 +34,6 @@ module Getopt
             valid.push(switch[0])       # Set valid long switches
 
             # Set type for long switch, default to BOOLEAN.
-            # Create synonym hash.  Default to first char of long switch for 
-            # short switch, e.g. "--verbose" creates a "-v" synonym.
             if switch[1].kind_of?(Fixnum)
                switch[2] = switch[1]
                types[switch[0]] = switch[2]
@@ -45,8 +44,11 @@ module Getopt
                switch[1] ||= switch[0][1..2]
             end
 
-            syns[switch[0]] = switch[1]
-            syns[switch[1]] = switch[0]
+            # Create synonym hash.  Default to first char of long switch for 
+            # short switch, e.g. "--verbose" creates a "-v" synonym.  The same
+            # synonym can only be used once - first one wins.
+            syns[switch[0]] = switch[1] unless syns[switch[1]]
+            syns[switch[1]] = switch[0] unless syns[switch[1]]
 
             switch[1].each{ |char|      
                types[char] = switch[2]  # Set type for short switch

data/test/tc_getopt_long.rb

@@ -21,7 +21,7 @@ class TC_Getopt_Long < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.3.4", Long::VERSION)
+      assert_equal('1.3.5', Long::VERSION)
    end
 
    def test_constants
@@ -249,6 +249,20 @@ class TC_Getopt_Long < Test::Unit::TestCase
          )
       }
    end
+   
+   def test_multiple_similar_long_switches_with_no_short_switches
+      ARGV.push('--to','1','--too','2','--tooo','3')
+      assert_nothing_raised{
+         @opts = Long.getopts(
+            ["--to",  REQUIRED],
+            ["--too", REQUIRED],
+            ["--tooo", REQUIRED]            
+         )
+      }
+      assert_equal('1', @opts['to'])
+      assert_equal('2', @opts['too'])
+      assert_equal('3', @opts['tooo'])
+   end
 
    def teardown
       @opts = nil

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: getopt
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
-date: 2006-03-07 00:00:00 -07:00
+  version: 1.3.5
+date: 2006-07-05 00:00:00 -06:00
 summary: Getopt::Std and Getopt::Long option parsers for Ruby
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Daniel J. Berger
 files: 
@@ -43,6 +44,7 @@ rdoc_options: []
 extra_rdoc_files: 
 - README
 - CHANGES
+- MANIFEST
 executables: []
 
 extensions: []