cooloptions 1.0.5 → 1.1.0

data/History.txt

@@ -1,4 +1,10 @@
-== 1.0.5 / 
+== 1.1.0 / 2007-01-10
+
+* Incremented the version number to more rationally reflect the addition of
+  CoolOptions#desc in 1.0.5.
+* Fixed handling of overlapping automatic short options.
+
+== 1.0.5 / 2006-12-09
 
 * Added CoolOptions#desc (suggested by John Long).
 

data/lib/cooloptions.rb

@@ -11,7 +11,7 @@ require 'ostruct'
 #   :include:samples/literate.rb
 
 class CoolOptions
-  VERSION = '1.0.5' #:nodoc:
+  VERSION = '1.1.0' #:nodoc:
 
   class Error < StandardError #:nodoc:
   end
@@ -51,6 +51,7 @@ class CoolOptions
     @required = []
     @result = {}
     @after = nil
+    @used_shorts = {}
   end
   
   # Adds additional descriptive text to the help text.
@@ -80,7 +81,10 @@ class CoolOptions
       long = "[no-]#{long}"
     end
 
-    args = ["-#{short}", "--#{long}", description]
+    args = []
+    args << "-#{short}" unless @used_shorts[short]
+    @used_shorts[short] = true
+    args.concat(["--#{long}", description])
     if default == NO_DEFAULT
       @required << key
     else

data/test/test_cooloptions.rb

@@ -129,4 +129,32 @@ EOH
     end
     assert called
   end
+  
+  def test_should_not_assign_already_used_short_options
+    begin
+      CoolOptions.parse!('details', %w(--help)) do |o|
+        o.on 'cl C', 'cl'
+        o.on 'ca', 'ca'
+      end
+    rescue SystemExit
+      rescued = true
+    end
+
+    assert rescued
+    assert_equal <<EOH, @out.string
+Usage: #{File.basename($0)} details
+    -c, --cl C                       cl
+        --[no-]ca                    ca
+    -h, --help                       This help info.
+EOH
+  end
+
+  def test_should_handle_overlapping_short_options
+    r = parse!(%w(-c d)) do |o|
+      o.on 'cl C', 'cl'
+      o.on 'ca', 'ca', false
+    end
+
+    assert 'd', r.cl
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: cooloptions
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
-date: 2006-12-09 00:00:00 -05:00
+  version: 1.1.0
+date: 2007-01-10 00:00:00 -05:00
 summary: CoolOptions is a simple wrapper around optparse that provides less configuration and more convenience for doing command-line option handling.
 require_paths: 
 - lib