trollop 1.8.1 → 1.8.2

data/History.txt

@@ -1,10 +1,11 @@
-== 1.8.1 / 2008-06-24
+== 1.8.2 / 2008-06-25
+* Bugfix for #conflicts and #depends error messages
 
+== 1.8.1 / 2008-06-24
 * Bugfix for short option autocreation
 * More aggressive documentation
 
 == 1.8 / 2008-06-16
-
 * Sub-command support via Parser#stop_on
 
 == 1.7.2 / 2008-01-16

data/Rakefile

@@ -23,7 +23,7 @@ end
 
 WWW_FILES = FileList["www/*"] + %w(README.txt FAQ.txt)
 task :upload_webpage => WWW_FILES do |t|
-  sh "scp -C #{t.prerequisites * ' '} wmorgan@rubyforge.org:/var/www/gforge-projects/trollop/"
+  sh "rsync -Paz -essh #{t.prerequisites * ' '} wmorgan@rubyforge.org:/var/www/gforge-projects/trollop/"
 end
 
 task :upload_docs => [:docs] do |t|

data/lib/trollop.rb

@@ -5,7 +5,7 @@
 
 module Trollop
 
-VERSION = "1.8.1"
+VERSION = "1.8.2"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -289,9 +289,9 @@ class Parser
 
       case type
       when :depends
-        syms.each { |sym| raise CommandlineError, "--#{@long[constraint_sym]} requires --#{@long[sym]}" unless found[sym] }
+        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} requires --#{@specs[sym][:long]}" unless found[sym] }
       when :conflicts
-        syms.each { |sym| raise CommandlineError, "--#{@long[constraint_sym]} conflicts with --#{@long[sym]}" if found[sym] && sym != constraint_sym }
+        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} conflicts with --#{@specs[sym][:long]}" if found[sym] && sym != constraint_sym }
       end
     end
 

data/test/test_trollop.rb

@@ -438,6 +438,20 @@ EOM
     assert_raises(CommandlineError) { opts = @p.parse %w(--one --mellow --two --jello) }
   end
 
+  def test_conflict_error_messages
+    @p.opt :one
+    @p.opt "two"
+    @p.conflicts :one, "two"
+
+    begin
+      @p.parse %w(--one --two)
+      flunk "no error thrown"
+    rescue CommandlineError => e
+      assert_match(/--one/, e.message)
+      assert_match(/--two/, e.message)
+    end
+  end
+
   def test_depends
     @p.opt :one
     assert_raises(ArgumentError) { @p.depends :one, :two }
@@ -465,6 +479,30 @@ EOM
     assert_raises(CommandlineError) { opts = @p.parse %w(--mellow --two --jello --one) }
   end
 
+  def test_depend_error_messages
+    @p.opt :one
+    @p.opt "two"
+    @p.depends :one, "two"
+
+    assert_nothing_raised { @p.parse %w(--one --two) }
+
+    begin
+      @p.parse %w(--one)
+      flunk "no error thrown"
+    rescue CommandlineError => e
+      assert_match(/--one/, e.message)
+      assert_match(/--two/, e.message)
+    end
+
+    begin
+      @p.parse %w(--two)
+      flunk "no error thrown"
+    rescue CommandlineError => e
+      assert_match(/--one/, e.message)
+      assert_match(/--two/, e.message)
+    end
+  end
+
   ## courtesy neill zero
   def test_two_required_one_missing_accuses_correctly
     @p.opt "arg1", "desc1", :required => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trollop
 version: !ruby/object:Gem::Version 
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors: 
 - William Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-24 00:00:00 -07:00
+date: 2008-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: []