trollop 1.2 → 1.3

data/History.txt

@@ -1,3 +1,9 @@
+== 1.3 / 2007-01-31
+* Wrap at (screen width - 1) instead of screen width.
+* User can override --help and --version.
+* Bugfix in handling of -v and -h.
+* More tests to confirm the above.
+
 == 1.2 / 2007-01-31
 * Minor documentation tweaks.
 * Removed hoe dependency.

data/lib/trollop.rb

@@ -5,7 +5,7 @@
 
 module Trollop
 
-VERSION = "1.2"
+VERSION = "1.3"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -78,7 +78,7 @@ class Parser
   ## * :required: if set to true, the argument must be provided on the
   ##   commandline.
   def opt name, desc="", opts={}
-    raise ArgumentError, "you already have an argument named #{name.inspect}" if @specs.member? name
+    raise ArgumentError, "you already have an argument named '#{name}'" if @specs.member? name
 
     ## fill in :type
     opts[:type] = 
@@ -209,18 +209,15 @@ class Parser
     required = {}
     found = {}
 
-    opt :version, "Print version and exit" if @version unless @specs[:version]
-    opt :help, "Show this message" unless @specs[:help]
+    opt :version, "Print version and exit" if @version unless @specs[:version] || @long["version"]
+    opt :help, "Show this message" unless @specs[:help] || @long["help"]
 
     @specs.each do |name, opts|
       required[name] = true if opts[:required]
       vals[name] = opts[:default]
     end
 
-    @leftovers = each_arg args do |arg, param|
-      raise VersionNeeded if @version && %w(-v --version).include?(arg)
-      raise HelpNeeded if %w(-h --help).include?(arg)
-
+   @leftovers = each_arg args do |arg, param|
       name = 
         case arg
         when /^-([^-])$/
@@ -233,6 +230,9 @@ class Parser
       raise CommandlineError, "unknown argument '#{arg}'" unless name
       raise CommandlineError, "option '#{arg}' specified multiple times" if found[name]
 
+      raise VersionNeeded if name == :version
+      raise HelpNeeded if name == :help
+
       found[name] = true
       opts = @specs[name]
 
@@ -320,13 +320,13 @@ class Parser
         else
           ""
         end
-      stream.puts wrap(desc, :width => width - rightcol_start, :prefix => rightcol_start)
+      stream.puts wrap(desc, :width => width - rightcol_start - 1, :prefix => rightcol_start)
     end
   end
 
   def wrap_line str, opts={} # :nodoc:
     prefix = opts[:prefix] || 0
-    width = opts[:width] || self.width
+    width = opts[:width] || (self.width - 1)
     start = 0
     ret = []
     until start > str.length

data/test/test_trollop.rb

@@ -341,6 +341,28 @@ EOM
     assert help[1] =~ /zzz/
     assert help[2] =~ /aaa/
   end
+
+  def test_version_and_help_short_args_can_be_overridden
+    @p.opt :verbose, "desc", :short => "-v"
+    @p.opt :hello, "desc", :short => "-h"
+    @p.version "version"
+
+    assert_nothing_raised { @p.parse(%w(-v)) }
+    assert_raises(VersionNeeded) { @p.parse(%w(--version)) }
+    assert_nothing_raised { @p.parse(%w(-h)) }
+    assert_raises(HelpNeeded) { @p.parse(%w(--help)) }
+  end
+
+  def test_version_and_help_long_args_cann_be_overridden
+    @p.opt :asdf, "desc", :long => "help"
+    @p.opt :asdf2, "desc2", :long => "version"
+    assert_nothing_raised { @p.parse %w() }
+    assert_nothing_raised { @p.parse %w(--help) }
+    assert_nothing_raised { @p.parse %w(--version) }
+    assert_nothing_raised { @p.parse %w(-h) }
+    assert_nothing_raised { @p.parse %w(-v) }
+  end
+
 end
 
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: trollop
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 date: 2007-01-31 00:00:00 -08: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: