trollop 1.14 → 1.15

data/History.txt

@@ -1,3 +1,7 @@
+== 1.15 / 2009-09-30
+* Don't raise an exception when out of short arguments (thanks to Rafael
+  Sevilla for pointing out how dumb this behavior was).
+
 == 1.14 / 2009-06-19
 * Make :multi arguments default to [], not nil, when not set on the commandline.
 * Minor commenting and error message improvements

data/README.txt

@@ -1,6 +1,6 @@
 == trollop
 
-by William Morgan (wmorgan-trollop at the masanjin dot nets or http://cs.stanford.edu/~ruby)
+by William Morgan (http://masanjin.net/)
 
 Main page: http://trollop.rubyforge.org
 
@@ -8,21 +8,22 @@ Release announcements and comments: http://all-thing.net/search/label/trollop
 
 Documentation quickstart: See Trollop::options (for some reason rdoc isn't
 linking that; it's in the top right of the screen if you're browsing online)
-and then Trollop::Parser#opt. Also see the examples at http://trollop.rubyforge.org/.
+and then Trollop::Parser#opt. Also see the examples at
+http://trollop.rubyforge.org/.
 
 == DESCRIPTION
 
 Trollop is a commandline option parser for Ruby that just gets out of your
-way. One line of code per option is all you need to write. For that, you get
-a nice automatically-generated help page, robust option parsing, command
+way. One line of code per option is all you need to write. For that, you get a
+nice automatically-generated help page, robust option parsing, command
 subcompletion, and sensible defaults for everything you don't specify.
 
 == FEATURES/PROBLEMS
 
 - Dirt-simple usage.
 - Sensible defaults. No tweaking necessary, much tweaking possible.
-- Support for long options, short options, short option bundling,
-  and automatic type validation and conversion.
+- Support for long options, short options, short option bundling, and
+  automatic type validation and conversion.
 - Support for subcommands.
 - Automatic help message generation, wrapped to current screen width.
 - Lots of unit tests.
@@ -37,4 +38,5 @@ subcompletion, and sensible defaults for everything you don't specify.
 
 == LICENSE
 
-Copyright (c) 2008 William Morgan. Trollop is distributed under the same terms as Ruby.
+Copyright (c) 2008--2009 William Morgan. Trollop is distributed under the same
+terms as Ruby.

data/lib/trollop.rb

@@ -7,7 +7,7 @@ require 'date'
 
 module Trollop
 
-VERSION = "1.14"
+VERSION = "1.15"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -614,10 +614,10 @@ private
       next if opts[:short]
 
       c = opts[:long].split(//).find { |d| d !~ INVALID_SHORT_ARG_REGEX && !@short.member?(d) }
-      raise ArgumentError, "can't generate a default short option name for #{opts[:long].inspect}: out of unique characters" unless c
-
-      opts[:short] = c
-      @short[c] = name
+      if c # found a character to use
+        opts[:short] = c
+        @short[c] = name
+      end
     end
   end
 

data/test/test_trollop.rb

@@ -214,12 +214,12 @@ class Trollop < ::Test::Unit::TestCase
     assert_equal false, opts[:arg_muffin]
   end
 
-  def test_short_autocreation_detects_running_out
+  def test_short_autocreation_is_ok_with_running_out_of_chars
     @p.opt :arg1 # auto: a
     @p.opt :arg2 # auto: r
     @p.opt :arg3 # auto: g
     @p.opt :arg4 # auto: uh oh!
-    assert_raises(ArgumentError) { @p.parse [] }
+    assert_nothing_raised { @p.parse [] }
   end
 
   def test_short_can_be_nothing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trollop
 version: !ruby/object:Gem::Version 
-  version: "1.14"
+  version: "1.15"
 platform: ruby
 authors: 
 - William Morgan
@@ -9,11 +9,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -04:00
+date: 2009-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: "Documentation quickstart: See Trollop::options (for some reason rdoc isn't linking that; it's in the top right of the screen if you're browsing online) and then Trollop::Parser#opt. Also see the examples at http://trollop.rubyforge.org/.  == DESCRIPTION  == REQUIREMENTS  * A burning desire to write less code.  == INSTALL  * gem install trollop  == LICENSE  Copyright (c) 2008 William Morgan. Trollop is distributed under the same terms as Ruby."
+description: |+
+  Documentation quickstart: See Trollop::options (for some reason rdoc isn't
+  linking that; it's in the top right of the screen if you're browsing online)
+  and then Trollop::Parser#opt. Also see the examples at
+  http://trollop.rubyforge.org/.
+  
+  == DESCRIPTION
+  
+  == REQUIREMENTS
+  
+  * A burning desire to write less code.
+  
+  == INSTALL
+  
+  * gem install trollop
+  
+  == LICENSE
+  
+  Copyright (c) 2008--2009 William Morgan. Trollop is distributed under the same
+  terms as Ruby.
+  
+  
 email: wmorgan-trollop@masanjin.net
 executables: []
 
@@ -34,6 +55,8 @@ files:
 - test/test_trollop.rb
 has_rdoc: true
 homepage: http://trollop.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -55,9 +78,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: trollop
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Trollop is a commandline option parser for Ruby that just gets out of your way. One line of code per option is all you need to write. For that, you get a nice automatically-generated help page, robust option parsing, command subcompletion, and sensible defaults for everything you don't specify.
 test_files: 
 - test/test_trollop.rb