trollop 1.16 → 1.16.1

data/History.txt

@@ -1,3 +1,6 @@
+== 1.16.1 / 2010-04-05
+* Bugfix in Trollop::die method introduced in last release.
+
 == 1.16 / 2010-04-01
 * Add Trollop::with_standard_exception_handling method for easing the use of Parser directly.
 * Handle scientific notation in float arguments, thanks to Will Fitzgerald.

data/README.txt

@@ -6,10 +6,8 @@ Main page: http://trollop.rubyforge.org
 
 Release announcements and comments: http://all-thing.net/label/trollop
 
-Documentation quickstart: See Trollop::options (for some reason rdoc isn't
-linking that; it's in the top right of the screen if you're browsing online)
-and then Trollop::Parser#opt. Also see the examples at
-http://trollop.rubyforge.org/.
+Documentation quickstart: See Trollop.options and then Trollop::Parser#opt.
+Also see the examples at http://trollop.rubyforge.org/.
 
 == DESCRIPTION
 
@@ -36,6 +34,18 @@ subcompletion, and sensible defaults for everything you don't specify.
 
 * gem install trollop
 
+== SYNOPSIS
+
+  require 'trollop'
+  opts = Trollop::options do
+    opt :monkey, "Use monkey mode"                     # flag --monkey, default false
+    opt :goat, "Use goat mode", :default => true       # flag --goat, default true
+    opt :num_limbs, "Number of limbs", :default => 4   # integer --num-limbs <i>, default to 4
+    opt :num_thumbs, "Number of thumbs", :type => :int # integer --num-thumbs <i>, default nil
+  end
+
+  p opts # a hash: { :monkey => false, :goat => true, :num_limbs => 4, :num_thumbs => nil }
+
 == LICENSE
 
 Copyright (c) 2008--2009 William Morgan. Trollop is distributed under the same

data/lib/trollop.rb

@@ -7,7 +7,7 @@ require 'date'
 
 module Trollop
 
-VERSION = "1.16"
+VERSION = "1.16.1"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -509,6 +509,17 @@ class Parser
     end
   end
 
+  ## The per-parser version of Trollop::die (see that for documentation).
+  def die arg, msg
+    if msg
+      $stderr.puts "Error: argument --#{@specs[arg][:long]} #{msg}."
+    else
+      $stderr.puts "Error: #{arg}."
+    end
+    $stderr.puts "Try --help for help."
+    exit(-1)
+  end
+
 private
 
   ## yield successive arg, parameter pairs
@@ -695,8 +706,8 @@ end
 ##
 ## See more examples at http://trollop.rubyforge.org.
 def options args=ARGV, *a, &b
-  p = Parser.new(*a, &b)
-  with_standard_exception_handling(p) { p.parse args }
+  @last_parser = Parser.new(*a, &b)
+  with_standard_exception_handling(p) { @last_parser.parse args }
 end
 
 ## If Trollop::options doesn't do quite what you want, you can create a Parser
@@ -758,13 +769,11 @@ end
 ##
 ##   Trollop::die "need at least one filename" if ARGV.empty?
 def die arg, msg=nil
-  if msg
-    $stderr.puts "Error: argument --#{@p.specs[arg][:long]} #{msg}."
+  if @last_parser
+    @last_parser.die arg, msg
   else
-    $stderr.puts "Error: #{arg}."
+    raise ArgumentError, "Trollop::die can only be called after Trollop::options"
   end
-  $stderr.puts "Try --help for help."
-  exit(-1)
 end
 
 module_function :options, :die, :with_standard_exception_handling

metadata

@@ -1,11 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trollop
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 16
-  version: "1.16"
+  version: 1.16.1
 platform: ruby
 authors: 
 - William Morgan
@@ -13,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 16:46:01 -04:00
+date: 2010-04-05 20:23:56 -04:00
 default_executable: 
 dependencies: []
 
@@ -50,20 +46,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: trollop
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Trollop is a commandline option parser for Ruby that just gets out of your way.