trollop 1.6 → 1.7

data/History.txt

@@ -1,3 +1,7 @@
+== 1.7 / 2007-06-17
+* Fix incorrect error message for multiple missing required arguments
+  (thanks to Neill Zero)
+
 == 1.6 / 2007-04-01
 * Don't attempt curses screen-width magic unless running on a terminal.
 

data/Rakefile

@@ -11,7 +11,7 @@ end # thanks to "Mike H"
 Hoe.new('trollop', Trollop::VERSION) do |p|
   p.rubyforge_name = 'trollop'
   p.author = "William Morgan"
-  p.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)."
+  p.summary = "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)."
 
   p.description = p.paragraphs_of('README.txt', 4..5, 9..18).join("\n\n").gsub(/== SYNOPSIS/, "Synopsis")
   p.url = "http://trollop.rubyforge.org"

data/lib/trollop.rb

@@ -5,7 +5,7 @@
 
 module Trollop
 
-VERSION = "1.6"
+VERSION = "1.7"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -275,7 +275,9 @@ class Parser
       end
     end
 
-    raise CommandlineError, "option '#{required.keys.first}' must be specified" if required.any? { |sym, x| !found[sym] }
+    required.each do |sym, val|
+      raise CommandlineError, "option '#{sym}' must be specified" unless found[sym]
+    end
 
     ## parse parameters
     args.each do |sym, arg, param|

data/test/test_trollop.rb

@@ -442,6 +442,27 @@ EOM
     assert_raises(CommandlineError) { opts = @p.parse %w(--mellow --two --jello --one) }
   end
 
+  ## courtesy neill zero
+  def test_two_required_one_missing_accuses_correctly
+    @p.opt "arg1", "desc1", :required => true
+    @p.opt "arg2", "desc2", :required => true
+
+    begin
+      @p.parse(%w(--arg1))
+      flunk "should have failed on a missing req"
+    rescue CommandlineError => e
+      assert e.message =~ /arg2/, "didn't mention arg2 in the error msg: #{e.message}"
+    end
+
+    begin
+      @p.parse(%w(--arg2))
+      flunk "should have failed on a missing req"
+    rescue CommandlineError => e
+      assert e.message =~ /arg1/, "didn't mention arg1 in the error msg: #{e.message}"
+    end
+
+    assert_nothing_raised { @p.parse(%w(--arg1 --arg2)) }
+  end
 end
 
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: trollop
 version: !ruby/object:Gem::Version 
-  version: "1.6"
-date: 2007-04-01 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).
+  version: "1.7"
+date: 2007-06-17 00:00:00 -07:00
+summary: 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
 email: wmorgan-trollop@masanjin.net
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - William Morgan
 files: