getopt 1.3.2 → 1.3.3

data/CHANGES

@@ -1,3 +1,7 @@
+== 22-Feb-2006 - 1.3.3
+* Bug fix for the two argument form of Getopt::Long.getopts.
+* Corresponding test suite additions.
+
 == 13-Feb-2006 - 1.3.2
 * Improved error message if an option is passed without a preceding switch.
 * Minor documentation fixes and clarifications.

data/lib/getopt/long.rb

@@ -9,7 +9,7 @@ module Getopt
    class LongError < StandardError; end
 
    class Long
-      VERSION = "1.3.2"
+      VERSION = "1.3.3"
 
       # Takes an array of switches.  Each array consists of three elements.
       def self.getopts(*switches)
@@ -32,13 +32,18 @@ module Getopt
          switches.each{ |switch|
             valid.push(switch[0])       # Set valid long switches
 
-            # Set type for long switch, default to BOOLEAN
-            switch[2] ||= BOOLEAN
-            types[switch[0]] = switch[2]
-
+            # 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.
-            switch[1] ||= switch[0][1..2]
+            if switch[1].kind_of?(Fixnum)
+               switch[2] = switch[1]
+               types[switch[0]] = switch[2]
+               switch[1] = switch[0][1..2]
+            else
+               switch[2] ||= BOOLEAN
+               types[switch[0]] = switch[2]
+               switch[1] ||= switch[0][1..2]
+            end
 
             syns[switch[0]] = switch[1]
             syns[switch[1]] = switch[0]

data/lib/getopt/std.rb

@@ -1,7 +1,7 @@
 module Getopt
    class StdError < StandardError; end
    class Std
-      VERSION = "1.3.2"
+      VERSION = "1.3.3"
 
       # Processes single character command line options with option
       # clustering.  This information is parsed from ARGV and returned

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.2", Long::VERSION)
+      assert_equal("1.3.3", Long::VERSION)
    end
 
    def test_constants
@@ -101,6 +101,20 @@ class TC_Getopt_Long < Test::Unit::TestCase
       assert_equal(true, @opts.has_key?("f"))
    end
 
+   def test_short_switch_synonyms_with_explicit_types
+      ARGV.push("--verbose", "--test", "hello", "--foo")
+      assert_nothing_raised{
+         @opts = Long.getopts(
+            ["--verbose", BOOLEAN],
+            ["--test", REQUIRED],
+            ["--foo", BOOLEAN]
+         )
+      }
+      assert(@opts.has_key?("v"))
+      assert(@opts.has_key?("t"))
+      assert(@opts.has_key?("f"))
+   end
+
    def test_switches_with_required_arguments
       ARGV.push("--foo","1","--bar","hello")
       assert_nothing_raised{

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: getopt
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2006-02-13 00:00:00 -07:00
+  version: 1.3.3
+date: 2006-02-22 00:00:00 -07:00
 summary: Getopt::Std for Ruby
 require_paths: 
 - lib