trollop 1.3 → 1.4

data/History.txt

@@ -1,3 +1,7 @@
+== 1.4 / 2007-03-26
+* Disable short options with :short => :none.
+* Minor bugfixes and error message improvements.
+
 == 1.3 / 2007-01-31
 * Wrap at (screen width - 1) instead of screen width.
 * User can override --help and --version.

data/lib/trollop.rb

@@ -5,7 +5,7 @@
 
 module Trollop
 
-VERSION = "1.3"
+VERSION = "1.4"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -130,27 +130,33 @@ class Parser
     raise ArgumentError, "long option name #{opts[:long].inspect} is already taken; please specify a (different) :long" if @long[opts[:long]]
 
     ## fill in :short
-    opts[:short] = opts[:short].to_s if opts[:short]
+    opts[:short] = opts[:short].to_s if opts[:short] unless opts[:short] == :none
     opts[:short] =
       case opts[:short]
       when nil
-        opts[:long].split(//).find { |c| c !~ /[\d]/ && !@short.member?(c) }
+        c = opts[:long].split(//).find { |c| c !~ /[\d]/ && !@short.member?(c) }
+        raise ArgumentError, "can't generate a short option name for #{opts[:long].inspect}: out of unique characters" unless c
+        c
       when /^-(.)$/
         $1
       when /^.$/
         opts[:short]
+      when :none
+        nil
       else
-        raise ArgumentError, "invalid short option name #{opts[:long].inspect}"
+        raise ArgumentError, "invalid short option name '#{opts[:short].inspect}'"
       end
-    raise ArgumentError, "can't generate a short option name (out of characters)" unless opts[:short]
-    raise ArgumentError, "short option name #{opts[:short].inspect} is already taken; please specify a (different) :short" if @short[opts[:short]]
-    raise ArgumentError, "a short option name can't be a number or a dash" if opts[:short] =~ /[\d-]/
+    if opts[:short]
+      raise ArgumentError, "short option name #{opts[:short].inspect} is already taken; please specify a (different) :short" if @short[opts[:short]]
+      raise ArgumentError, "a short option name can't be a number or a dash" if opts[:short] =~ /[\d-]/
+    end
 
     ## fill in :default for flags
     opts[:default] = false if opts[:type] == :flag && opts[:default].nil?
 
     opts[:desc] ||= desc
-    @short[opts[:short]] = @long[opts[:long]] = name
+    @long[opts[:long]] = name
+    @short[opts[:short]] = name if opts[:short]
     @specs[name] = opts
     @order << [:opt, name]
   end
@@ -281,7 +287,8 @@ class Parser
 
     left = {}
     @specs.each do |name, spec| 
-      left[name] = "--#{spec[:long]}, -#{spec[:short]}" + 
+      left[name] = "--#{spec[:long]}" +
+        (spec[:short] ? ", -#{spec[:short]}" : "") +
         case spec[:type]
         when :flag
           ""

data/test/test_trollop.rb

@@ -120,6 +120,19 @@ class Trollop < ::Test::Unit::TestCase
     assert_equal true, opts["arg3"]
   end
 
+  def test_short_can_be_nothing
+    assert_nothing_raised do
+      @p.opt "arg", "desc", :short => :none
+      @p.parse []
+    end
+
+    sio = StringIO.new "w"
+    @p.educate sio
+    assert sio.string =~ /--arg:\s+desc/
+
+    assert_raise(CommandlineError) { @p.parse %w(-a) }
+  end
+
   ## two args can't have the same name
   def test_conflicting_names_are_detected
     assert_nothing_raised { @p.opt "goodarg", "desc" }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: trollop
 version: !ruby/object:Gem::Version 
-  version: "1.3"
-date: 2007-01-31 00:00:00 -08:00
+  version: "1.4"
+date: 2007-03-26 00:00:00 -07:00
 summary: Trollop is YAFCLAP --- yet another fine commandline argument processing library for Ruby. Trollop is designed to provide the maximal amount of GNU-style argument processing in the minimum number of lines of code (for you, the programmer).
 require_paths: 
 - lib