getopt 1.3.3 → 1.3.4

data/CHANGES

@@ -1,3 +1,10 @@
+== 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.
+* Corresponding test suite additions.
+* Added example to the 'example_long.rb' file that uses long form with
+  embedded hyphens.
+
 == 22-Feb-2006 - 1.3.3
 * Bug fix for the two argument form of Getopt::Long.getopts.
 * Corresponding test suite additions.

data/README

@@ -70,8 +70,9 @@ Std.getopts(switches)
 
 Long.getopts(switches)
    Takes an array of switches beginning with "--" followed by one or more
-   characters, or "-w" followed by a single character.  The type of argument,
-   if any, can be specified as BOOLEAN, OPTIONAL, REQUIRED or INCREMENT.
+   alphanumeric or hyphen characters, or "-" followed by a single character.
+   The type of argument, if any, can be specified as BOOLEAN, OPTIONAL,
+   REQUIRED or INCREMENT.
 
    The array should be in the form:
 

data/lib/getopt/long.rb

@@ -9,7 +9,7 @@ module Getopt
    class LongError < StandardError; end
 
    class Long
-      VERSION = "1.3.3"
+      VERSION = "1.3.4"
 
       # Takes an array of switches.  Each array consists of three elements.
       def self.getopts(*switches)
@@ -54,9 +54,9 @@ module Getopt
             }
          }
 
-         re_long     = /^(--\w+)$/
+         re_long     = /^(--\w+[-\w+]*)?$/
          re_short    = /^(-\w)$/
-         re_long_eq  = /^(--\w+?)=(.*?)$|^(-\w?)=(.*?)$/
+         re_long_eq  = /^(--\w+[-\w+]*)?=(.*?)$|(-\w?)=(.*?)$/
          re_short_sq = /^(-\w)(\S+?)$/
 
          ARGV.each_with_index{ |opt, index|
@@ -196,7 +196,11 @@ module Getopt
 
          # Get rid of leading "--" and "-" to make it easier to reference
          hash.each{ |key, value|
-            nkey = key.tr("-","")
+            if key[0,2] == '--'
+               nkey = key.sub('--', '')
+            else
+               nkey = key.sub('-', '')
+            end
             hash.delete(key)
             hash[nkey] = value
          }

data/lib/getopt/std.rb

@@ -1,7 +1,7 @@
 module Getopt
    class StdError < StandardError; end
    class Std
-      VERSION = "1.3.3"
+      VERSION = "1.3.4"
 
       # 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.3", Long::VERSION)
+      assert_equal("1.3.4", Long::VERSION)
    end
 
    def test_constants
@@ -63,6 +63,34 @@ class TC_Getopt_Long < Test::Unit::TestCase
       assert_equal("world", @opts["bar"])
       assert_equal("world", @opts["b"])
    end
+   
+   def test_getopts_long_embedded_hyphens
+      ARGV.push('--foo-bar', 'hello', '--test1-test2-test3', 'world')
+      assert_nothing_raised{
+         @opts = Long.getopts(
+            ['--foo-bar', '-f', REQUIRED],
+            ['--test1-test2-test3', '-t', REQUIRED]
+         )
+      }
+      assert_equal('hello', @opts['foo-bar'])
+      assert_equal('hello', @opts['f'])
+      assert_equal('world', @opts['test1-test2-test3'])
+      assert_equal('world', @opts['t'])
+   end
+   
+   def test_getopts_long_embedded_hyphens_using_equals_sign
+      ARGV.push('--foo-bar=hello', '--test1-test2-test3=world')
+      assert_nothing_raised{
+         @opts = Long.getopts(
+            ['--foo-bar', '-f', REQUIRED],
+            ['--test1-test2-test3', '-t', REQUIRED]
+         )
+      }
+      assert_equal('hello', @opts['foo-bar'])
+      assert_equal('hello', @opts['f'])
+      assert_equal('world', @opts['test1-test2-test3'])
+      assert_equal('world', @opts['t'])
+   end
 
    def test_getopts_short_switch_squished
       ARGV.push("-f", "hello", "-bworld")

data/test/tc_getopt_std.rb

@@ -18,7 +18,7 @@ include Getopt
 class TC_Getopt_Std < Test::Unit::TestCase
 
    def test_version
-      assert_equal("1.3.2", Std::VERSION)
+      assert_equal("1.3.4", Std::VERSION)
    end
 
    def test_getopts_basic

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: getopt
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
-date: 2006-02-22 00:00:00 -07:00
-summary: Getopt::Std for Ruby
+  version: 1.3.4
+date: 2006-03-07 00:00:00 -07:00
+summary: Getopt::Std and Getopt::Long option parsers for Ruby
 require_paths: 
 - lib
 email: djberg96@gmail.com
 homepage: http://www.rubyforge.org/projects/shards
 rubyforge_project: 
-description: Getopt::Std for Ruby
+description: Getopt::Std and Getopt::Long option parsers for Ruby
 autorequire: 
 default_executable: 
 bindir: bin