trollop 1.16.1 → 1.16.2

data/History.txt

@@ -1,3 +1,6 @@
+== 1.16.2 / 2010-04-06
+* Bugfix in Trollop::options. Thanks to Brian C. Thomas for pointing it out.
+
 == 1.16.1 / 2010-04-05
 * Bugfix in Trollop::die method introduced in last release.
 

data/lib/trollop.rb

@@ -7,7 +7,7 @@ require 'date'
 
 module Trollop
 
-VERSION = "1.16.1"
+VERSION = "1.16.2"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -707,7 +707,7 @@ end
 ## See more examples at http://trollop.rubyforge.org.
 def options args=ARGV, *a, &b
   @last_parser = Parser.new(*a, &b)
-  with_standard_exception_handling(p) { @last_parser.parse args }
+  with_standard_exception_handling(@last_parser) { @last_parser.parse args }
 end
 
 ## If Trollop::options doesn't do quite what you want, you can create a Parser

data/release-script.txt

@@ -8,8 +8,8 @@ vi lib/trollop.rb # and bump version number
 git commit -a -m "bump to..."
 git tag release-<releasename>
 rake gem
-rake tarball
 gem push pkg/<gem name>
 git push
 git push --tags
+rake upload_docs
 rake upload_webpage

data/test/test_trollop.rb

@@ -1044,6 +1044,50 @@ EOM
     opts = @p.parse []
     assert_equal [], opts[:arg1]
   end
+
+  def test_simple_interface_handles_help
+    ARGV.clear
+    ARGV.unshift "-h"
+    assert_raises(SystemExit) do
+      opts = ::Trollop::options do
+        opt :potato
+      end
+      raise "broken"
+    end
+  end
+
+  def test_simple_interface_handles_version
+    ARGV.clear
+    ARGV.unshift "-v"
+    assert_raises(SystemExit) do
+      opts = ::Trollop::options do
+        version "1.2"
+        opt :potato
+      end
+      raise "broken"
+    end
+  end
+
+  def test_simple_interface_handles_regular_usage
+    ARGV.clear
+    ARGV.unshift "--potato"
+    opts = nil
+    assert_nothing_raised do
+      opts = ::Trollop::options do
+        opt :potato
+      end
+    end
+    assert opts[:potato]
+  end
+
+  def test_simple_interface_handles_die
+    ARGV.clear
+    ARGV.unshift "--potato"
+    opts = ::Trollop::options do
+      opt :potato
+    end
+    assert_raises(SystemExit) { ::Trollop::die :potato, "is invalid" }
+  end
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trollop
 version: !ruby/object:Gem::Version 
-  version: 1.16.1
+  version: 1.16.2
 platform: ruby
 authors: 
 - William Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 20:23:56 -04:00
+date: 2010-04-06 11:53:33 -04:00
 default_executable: 
 dependencies: []