trollop 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbee7d87ff54b18dc15e986c58e8a9f511dda7d1
-  data.tar.gz: 6fc068202fc2863d9d851931cc67718e8c0b4bd1
+  metadata.gz: eceb56ea9f2bee171cbc8a7b88f4053de3024256
+  data.tar.gz: b275e0df3037f69de67475f9155b26e8e8a0cad4
 SHA512:
-  metadata.gz: 4d79f559d36748e03c32069363d2d2415f341e13ffd5fb6165fb2e62dbfc7a8af70ae164d1c19f02d0be0ab056de2d0e6e15f6319b8f5a760087357db92d21cd
-  data.tar.gz: 4f0db3cd5cc44e6ff4e23abbc91a0175d9d0132af400cf13890696a9b68ccb8dadcef7b94f9bb3b1576cba6d549cf9b5d28a0c9a6635793fd28553524f641909
+  metadata.gz: f71c677c66f414b2e6fc4b1d41c815df416efd57feef1e5f1ada73ff1041025bf87ebb23cd679241ecb2aadea2dbe06976aa7ae3eeabee346de6884852b0bb38
+  data.tar.gz: d2ff306c1daa19c6f6026f7cd37e4f2165664878c638e1d9112da400503196be976b779d61edcee68688ab9efe8539a0e206c1bd6766b5caa0f0f6aeef21be0f

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
+sudo: false
 rvm:
-  - "1.8.7"
-  - "1.9.3"
   - "2.2"
-  - ruby-head
+  - "2.3.4"
+  - "2.6"
   - jruby-head
 gemfile: Gemfile.travis
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+  fast_finish: true

data/Gemfile.travis

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+# these are needed by coveralls
+# if this were in Gemfile, gemnasium thinks the mime-types is hardcoded
+# to an older version and complains. They are using regex's to parse ruby
 if RUBY_VERSION < "1.9"
   gem 'rest-client', '< 1.7'
   gem 'mime-types', '~> 1.16'

data/History.txt

@@ -1,10 +1,20 @@
-== 2.1.2 / 2015-03-10
+== [2.1.3] / 2018-07-05
+
+* Refactor each option type into subclasses of Option.  Define a registry for the registration of each option.  This makes the code more modular and facilitates extension by allowing additional Option subclasses. (thanks @clxy)
+* Fixed implementation of ignore_invalid_options. (thanks @metcalf)
+* Various warning cleanup for ruby 2.1, 2.3, etc. (thanks @nanobowers)
+* Trollop.die can now accept an error code.
+* fixed default (thanks @nanobowers)
+* Change from ruby license to MIT license in the code.
+
+== [2.1.2] / 2015-03-10
 * loosen mime-types requirements (for better ruby 1.8.7 support)
 * use io/console gem instead of curses (for better jruby support)
 * fix parsing bug when chronic gem is not available
 * allow default array to be empty if a type is specified
 * better specified license and better spec coverage
-== 2.1.1 / 2015-01-03
+
+== [2.1.1] / 2015-01-03
 * Remove curses as a hard dependency. It is optional. This can leverage the gem if it is present.
 * Fix ruby -w warnings
 
@@ -148,3 +158,7 @@
 
 == 1.0 / 2007-01-29
 * Initial release.
+
+[2.1.3]: https://github.com/ManageIQ/trollop/compare/v2.1.2...v2.1.3
+[2.1.2]: https://github.com/ManageIQ/trollop/compare/v2.1.1...v2.1.2
+[2.1.1]: https://github.com/ManageIQ/trollop/compare/v2.1.0...v2.1.1

data/README.md

@@ -8,8 +8,11 @@ http://manageiq.github.io/trollop/
 [![Coverage Status](http://img.shields.io/coveralls/ManageIQ/trollop.svg)](https://coveralls.io/r/ManageIQ/trollop)
 [![Dependency Status](https://gemnasium.com/ManageIQ/trollop.svg)](https://gemnasium.com/ManageIQ/trollop)
 
-Documentation quickstart: See Trollop.options and then Trollop::Parser#opt.
-Also see the examples at http://manageiq.github.io/trollop/.
+## Documentation
+
+- Quickstart: See `Trollop.options` and then `Trollop::Parser#opt`.
+- Examples: http://manageiq.github.io/trollop/.
+- Wiki: http://github.com/ManageIQ/trollop/wiki
 
 ## Description
 
@@ -54,4 +57,4 @@ Copyright © 2008-2014 [William Morgan](http://masanjin.net/).
 
 Copyright © 2014 Red Hat, Inc.
 
-Trollop is released under the [MIT License][http://www.opensource.org/licenses/MIT].
+Trollop is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/Rakefile

@@ -5,7 +5,7 @@ task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.pattern = "test/test_*.rb"
+  t.pattern = "test/**/*_test.rb"
 end
 
 begin

data/lib/trollop.rb

@@ -1,24 +1,35 @@
 # lib/trollop.rb -- trollop command-line processing library
 # Copyright (c) 2008-2014 William Morgan.
 # Copyright (c) 2014 Red Hat, Inc.
-# trollop is licensed under the same terms as Ruby.
+# trollop is licensed under the MIT license.
 
 require 'date'
 
 module Trollop
+  # note: this is duplicated in gemspec
+  # please change over there too
 VERSION = "2.1.2"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
-class CommandlineError < StandardError; end
+class CommandlineError < StandardError
+  attr_reader :error_code
+
+  def initialize(msg, error_code = nil)
+    super(msg)
+    @error_code = error_code
+  end
+end
 
 ## Thrown by Parser if the user passes in '-h' or '--help'. Handled
 ## automatically by Trollop#options.
-class HelpNeeded < StandardError; end
+class HelpNeeded < StandardError
+end
 
 ## Thrown by Parser if the user passes in '-v' or '--version'. Handled
 ## automatically by Trollop#options.
-class VersionNeeded < StandardError; end
+class VersionNeeded < StandardError
+end
 
 ## Regex for floating point numbers
 FLOAT_RE = /^-?((\d+(\.\d+)?)|(\.\d+))([eE][-+]?[\d]+)?$/
@@ -37,24 +48,27 @@ PARAM_RE = /^-(-|\.$|[^\d\.])/
 ## Trollop::with_standard_exception_handling.
 class Parser
 
-  ## The set of values that indicate a flag option when passed as the
-  ## +:type+ parameter of #opt.
-  FLAG_TYPES = [:flag, :bool, :boolean]
-
-  ## The set of values that indicate a single-parameter (normal) option when
-  ## passed as the +:type+ parameter of #opt.
-  ##
-  ## A value of +io+ corresponds to a readable IO resource, including
-  ## a filename, URI, or the strings 'stdin' or '-'.
-  SINGLE_ARG_TYPES = [:int, :integer, :string, :double, :float, :io, :date]
-
-  ## The set of values that indicate a multiple-parameter option (i.e., that
-  ## takes multiple space-separated values on the commandline) when passed as
-  ## the +:type+ parameter of #opt.
-  MULTI_ARG_TYPES = [:ints, :integers, :strings, :doubles, :floats, :ios, :dates]
-
-  ## The complete set of legal values for the +:type+ parameter of #opt.
-  TYPES = FLAG_TYPES + SINGLE_ARG_TYPES + MULTI_ARG_TYPES
+  ## The registry is a class-instance-variable map of option aliases to their subclassed Option class.
+  @registry = {}
+  
+  ## The Option subclasses are responsible for registering themselves using this function.
+  def self.register(lookup, klass)
+    @registry[lookup.to_sym] = klass
+  end
+  
+  ## Gets the class from the registry.
+  ## Can be given either a class-name, e.g. Integer, a string, e.g "integer", or a symbol, e.g :integer
+  def self.registry_getopttype(type)
+    return nil unless type
+    if type.respond_to?(:name)
+      type = type.name
+      lookup = type.downcase.to_sym
+    else
+      lookup = type.to_sym
+    end
+    raise ArgumentError, "Unsupported argument type '#{type}', registry lookup '#{lookup}'" unless @registry.has_key?(lookup)
+    return @registry[lookup].new
+  end
 
   INVALID_SHORT_ARG_REGEX = /[\d-]/ #:nodoc:
 
@@ -71,7 +85,7 @@ class Parser
   attr_accessor :ignore_invalid_options
 
   ## Initializes the parser, and instance-evaluates any block given.
-  def initialize *a, &b
+  def initialize(*a, &b)
     @version = nil
     @leftovers = []
     @specs = {}
@@ -81,8 +95,11 @@ class Parser
     @constraints = []
     @stop_words = []
     @stop_on_unknown = false
+    @educate_on_error = false
+    @synopsis = nil
+    @usage = nil
 
-    #instance_eval(&b) if b # can't take arguments
+    # instance_eval(&b) if b # can't take arguments
     cloaker(&b).bind(self).call(*a) if b
   end
 
@@ -94,7 +111,7 @@ class Parser
   ## Takes the following optional arguments:
   ##
   ## [+:long+] Specify the long form of the argument, i.e. the form with two dashes. If unspecified, will be automatically derived based on the argument name by turning the +name+ option into a string, and replacing any _'s by -'s.
-  ## [+:short+] Specify the short form of the argument, i.e. the form with one dash. If unspecified, will be automatically derived from +name+.
+  ## [+:short+] Specify the short form of the argument, i.e. the form with one dash. If unspecified, will be automatically derived from +name+. Use :none: to not have a short value.
   ## [+:type+] Require that the argument take a parameter or parameters of type +type+. For a single parameter, the value can be a member of +SINGLE_ARG_TYPES+, or a corresponding Ruby class (e.g. +Integer+ for +:int+). For multiple-argument parameters, the value can be any member of +MULTI_ARG_TYPES+ constant. If unset, the default argument type is +:flag+, meaning that the argument does not take a parameter. The specification of +:type+ is not necessary if a +:default+ is given.
   ## [+:default+] Set the default value for an argument. Without a default value, the hash returned by #parse (and thus Trollop::options) will have a +nil+ value for this key unless the argument is given on the commandline. The argument type is derived automatically from the class of the default value given, so specifying a +:type+ is not necessary if a +:default+ is given. (But see below for an important caveat when +:multi+: is specified too.) If the argument is a flag, and the default is set to +true+, then if it is specified on the the commandline the value will be +false+.
   ## [+:required+] If set to +true+, the argument must be provided on the commandline.
@@ -126,147 +143,58 @@ class Parser
   ## If you want a multi-value, multi-occurrence argument with a default
   ## value, you must specify +:type+ as well.
 
-  def opt name, desc="", opts={}, &b
-    raise ArgumentError, "you already have an argument named '#{name}'" if @specs.member? name
-
-    ## fill in :type
-    opts[:type] = # normalize
-      case opts[:type]
-      when :boolean, :bool; :flag
-      when :integer; :int
-      when :integers; :ints
-      when :double; :float
-      when :doubles; :floats
-      when Class
-        case opts[:type].name
-        when 'TrueClass', 'FalseClass'; :flag
-        when 'String'; :string
-        when 'Integer'; :int
-        when 'Float'; :float
-        when 'IO'; :io
-        when 'Date'; :date
-        else
-          raise ArgumentError, "unsupported argument type '#{opts[:type].class.name}'"
-        end
-      when nil; nil
-      else
-        raise ArgumentError, "unsupported argument type '#{opts[:type]}'" unless TYPES.include?(opts[:type])
-        opts[:type]
-      end
-
-    ## for options with :multi => true, an array default doesn't imply
-    ## a multi-valued argument. for that you have to specify a :type
-    ## as well. (this is how we disambiguate an ambiguous situation;
-    ## see the docs for Parser#opt for details.)
-    disambiguated_default = if opts[:multi] && opts[:default].is_a?(Array) && !opts[:type]
-      opts[:default].first
-    else
-      opts[:default]
-    end
-
-    type_from_default =
-      case disambiguated_default
-      when Integer; :int
-      when Numeric; :float
-      when TrueClass, FalseClass; :flag
-      when String; :string
-      when IO; :io
-      when Date; :date
-      when Array
-        if opts[:default].empty?
-          if opts[:type]
-            raise ArgumentError, "multiple argument type must be plural" unless MULTI_ARG_TYPES.include?(opts[:type])
-            nil
-          else
-            raise ArgumentError, "multiple argument type cannot be deduced from an empty array for '#{opts[:default][0].class.name}'"
-          end
-        else
-          case opts[:default][0]    # the first element determines the types
-          when Integer; :ints
-          when Numeric; :floats
-          when String; :strings
-          when IO; :ios
-          when Date; :dates
-          else
-            raise ArgumentError, "unsupported multiple argument type '#{opts[:default][0].class.name}'"
-          end
-        end
-      when nil; nil
-      else
-        raise ArgumentError, "unsupported argument type '#{opts[:default].class.name}'"
-      end
-
-    raise ArgumentError, ":type specification and default type don't match (default type is #{type_from_default})" if opts[:type] && type_from_default && opts[:type] != type_from_default
-
-    opts[:type] = opts[:type] || type_from_default || :flag
-
-    ## fill in :long
-    opts[:long] = opts[:long] ? opts[:long].to_s : name.to_s.gsub("_", "-")
-    opts[:long] = case opts[:long]
-      when /^--([^-].*)$/; $1
-      when /^[^-]/; opts[:long]
-      else; raise ArgumentError, "invalid long option name #{opts[:long].inspect}"
-    end
-    raise ArgumentError, "long option name #{opts[:long].inspect} is already taken; please specify a (different) :long" if @long[opts[:long]]
-
-    ## fill in :short
-    opts[:short] = opts[:short].to_s if opts[:short] && opts[:short] != :none
-    opts[:short] = case opts[:short]
-      when /^-(.)$/; $1
-      when nil, :none, /^.$/; opts[:short]
-      else raise ArgumentError, "invalid short option name '#{opts[:short].inspect}'"
-    end
-
-    if opts[:short]
-      raise ArgumentError, "short option name #{opts[:short].inspect} is already taken; please specify a (different) :short" if @short[opts[:short]]
-      raise ArgumentError, "a short option name can't be a number or a dash" if opts[:short] =~ INVALID_SHORT_ARG_REGEX
-    end
-
-    ## fill in :default for flags
-    opts[:default] = false if opts[:type] == :flag && opts[:default].nil?
-
-    ## autobox :default for :multi (multi-occurrence) arguments
-    opts[:default] = [opts[:default]] if opts[:default] && opts[:multi] && !opts[:default].is_a?(Array)
-
-    ## fill in :multi
-    opts[:multi] ||= false
+  def opt(name, desc = "", opts = {}, &b)
     opts[:callback] ||= b if block_given?
     opts[:desc] ||= desc
-    @long[opts[:long]] = name
-    @short[opts[:short]] = name if opts[:short] && opts[:short] != :none
-    @specs[name] = opts
-    @order << [:opt, name]
+
+    o = Option.create(name, desc, opts)
+
+    raise ArgumentError, "you already have an argument named '#{name}'" if @specs.member? o.name
+    raise ArgumentError, "long option name #{o.long.inspect} is already taken; please specify a (different) :long" if @long[o.long]
+    raise ArgumentError, "short option name #{o.short.inspect} is already taken; please specify a (different) :short" if @short[o.short]
+    @long[o.long] = o.name
+    @short[o.short] = o.name if o.short?
+    @specs[o.name] = o
+    @order << [:opt, o.name]
   end
 
   ## Sets the version string. If set, the user can request the version
   ## on the commandline. Should probably be of the form "<program name>
   ## <version number>".
-  def version(s = nil); @version = s if s; @version end
+  def version(s = nil)
+    s ? @version = s : @version
+  end
 
   ## Sets the usage string. If set the message will be printed as the
   ## first line in the help (educate) output and ending in two new
   ## lines.
-  def usage(s = nil) ; @usage = s if s; @usage end
+  def usage(s = nil)
+    s ? @usage = s : @usage
+  end
 
   ## Adds a synopsis (command summary description) right below the
   ## usage line, or as the first line if usage isn't specified.
-  def synopsis(s = nil) ; @synopsis = s if s; @synopsis end
+  def synopsis(s = nil)
+    s ? @synopsis = s : @synopsis
+  end
 
   ## Adds text to the help display. Can be interspersed with calls to
   ## #opt to build a multi-section help page.
-  def banner s; @order << [:text, s] end
-  alias :text :banner
+  def banner(s)
+    @order << [:text, s]
+  end
+  alias_method :text, :banner
 
   ## Marks two (or more!) options as requiring each other. Only handles
   ## undirected (i.e., mutual) dependencies. Directed dependencies are
   ## better modeled with Trollop::die.
-  def depends *syms
+  def depends(*syms)
     syms.each { |sym| raise ArgumentError, "unknown option '#{sym}'" unless @specs[sym] }
     @constraints << [:depends, syms]
   end
 
   ## Marks two (or more!) options as conflicting.
-  def conflicts *syms
+  def conflicts(*syms)
     syms.each { |sym| raise ArgumentError, "unknown option '#{sym}'" unless @specs[sym] }
     @constraints << [:conflicts, syms]
   end
@@ -280,7 +208,7 @@ class Parser
   ## would be set to the list of subcommands. A subsequent Trollop
   ## invocation would then be used to parse subcommand options, after
   ## shifting the subcommand off of ARGV.
-  def stop_on *words
+  def stop_on(*words)
     @stop_words = [*words].flatten
   end
 
@@ -292,21 +220,27 @@ class Parser
     @stop_on_unknown = true
   end
 
+  ## Instead of displaying "Try --help for help." on an error
+  ## display the usage (via educate)
+  def educate_on_error
+    @educate_on_error = true
+  end
+
   ## Parses the commandline. Typically called by Trollop::options,
   ## but you can call it directly if you need more control.
   ##
   ## throws CommandlineError, HelpNeeded, and VersionNeeded exceptions.
-  def parse cmdline=ARGV
+  def parse(cmdline = ARGV)
     vals = {}
     required = {}
 
-    opt :version, "Print version and exit" if @version && ! ( @specs[:version] || @long["version"])
+    opt :version, "Print version and exit" if @version && ! (@specs[:version] || @long["version"])
     opt :help, "Show this message" unless @specs[:help] || @long["help"]
 
     @specs.each do |sym, opts|
-      required[sym] = true if opts[:required]
-      vals[sym] = opts[:default]
-      vals[sym] = [] if opts[:multi] && !opts[:default] # multi arguments default to [], not nil
+      required[sym] = true if opts.required?
+      vals[sym] = opts.default
+      vals[sym] = [] if opts.multi && !opts.default # multi arguments default to [], not nil
     end
 
     resolve_default_short_options!
@@ -322,17 +256,17 @@ class Parser
       end
 
       sym = case arg
-        when /^-([^-])$/; @short[$1]
-        when /^--([^-]\S*)$/; @long[$1] || @long["no-#{$1}"]
-        else; raise CommandlineError, "invalid argument syntax: '#{arg}'"
+        when /^-([^-])$/      then @short[$1]
+        when /^--([^-]\S*)$/  then @long[$1] || @long["no-#{$1}"]
+        else                       raise CommandlineError, "invalid argument syntax: '#{arg}'"
       end
 
       sym = nil if arg =~ /--no-/ # explicitly invalidate --no-no- arguments
 
-      next 0 if ignore_invalid_options && !sym
+      next nil if ignore_invalid_options && !sym
       raise CommandlineError, "unknown argument '#{arg}'" unless sym
 
-      if given_args.include?(sym) && !@specs[sym][:multi]
+      if given_args.include?(sym) && !@specs[sym].multi?
         raise CommandlineError, "option '#{arg}' specified multiple times"
       end
 
@@ -344,11 +278,11 @@ class Parser
       # The block returns the number of parameters taken.
       num_params_taken = 0
 
-      unless params.nil?
-        if SINGLE_ARG_TYPES.include?(@specs[sym][:type])
+      unless params.empty?
+        if @specs[sym].single_arg?
           given_args[sym][:params] << params[0, 1]  # take the first parameter
           num_params_taken = 1
-        elsif MULTI_ARG_TYPES.include?(@specs[sym][:type])
+        elsif @specs[sym].multi_arg?
           given_args[sym][:params] << params        # take all the parameters
           num_params_taken = params.size
         end
@@ -368,14 +302,14 @@ class Parser
 
       case type
       when :depends
-        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} requires --#{@specs[sym][:long]}" unless given_args.include? sym }
+        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym].long} requires --#{@specs[sym].long}" unless given_args.include? sym }
       when :conflicts
-        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} conflicts with --#{@specs[sym][:long]}" if given_args.include?(sym) && (sym != constraint_sym) }
+        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym].long} conflicts with --#{@specs[sym].long}" if given_args.include?(sym) && (sym != constraint_sym) }
       end
     end
 
     required.each do |sym, val|
-      raise CommandlineError, "option --#{@specs[sym][:long]} must be specified" unless given_args.include? sym
+      raise CommandlineError, "option --#{@specs[sym].long} must be specified" unless given_args.include? sym
     end
 
     ## parse parameters
@@ -383,40 +317,27 @@ class Parser
       arg, params, negative_given = given_data.values_at :arg, :params, :negative_given
 
       opts = @specs[sym]
-      if params.empty? && opts[:type] != :flag
-        raise CommandlineError, "option '#{arg}' needs a parameter" unless opts[:default]
-        params << (opts[:default].kind_of?(Array) ? opts[:default].clone : [opts[:default]])
+      if params.empty? && !opts.flag?
+        raise CommandlineError, "option '#{arg}' needs a parameter" unless opts.default
+        params << (opts.array_default? ? opts.default.clone : [opts.default])
       end
 
       vals["#{sym}_given".intern] = true # mark argument as specified on the commandline
 
-      case opts[:type]
-      when :flag
-        vals[sym] = (sym.to_s =~ /^no_/ ? negative_given : !negative_given)
-      when :int, :ints
-        vals[sym] = params.map { |pg| pg.map { |p| parse_integer_parameter p, arg } }
-      when :float, :floats
-        vals[sym] = params.map { |pg| pg.map { |p| parse_float_parameter p, arg } }
-      when :string, :strings
-        vals[sym] = params.map { |pg| pg.map { |p| p.to_s } }
-      when :io, :ios
-        vals[sym] = params.map { |pg| pg.map { |p| parse_io_parameter p, arg } }
-      when :date, :dates
-        vals[sym] = params.map { |pg| pg.map { |p| parse_date_parameter p, arg } }
-      end
+      vals[sym] = opts.parse(params, negative_given)
 
-      if SINGLE_ARG_TYPES.include?(opts[:type])
-        if opts[:multi]       # multiple options, each with a single parameter
+      if opts.single_arg?
+        if opts.multi?        # multiple options, each with a single parameter
           vals[sym] = vals[sym].map { |p| p[0] }
         else                  # single parameter
           vals[sym] = vals[sym][0][0]
         end
-      elsif MULTI_ARG_TYPES.include?(opts[:type]) && !opts[:multi]
+      elsif opts.multi_arg? && !opts.multi?
         vals[sym] = vals[sym][0]  # single option, with multiple parameters
       end
       # else: multiple options, with multiple parameters
 
-      opts[:callback].call(vals[sym]) if opts.has_key?(:callback)
+      opts.callback.call(vals[sym]) if opts.callback
     end
 
     ## modify input in place with only those
@@ -426,61 +347,30 @@ class Parser
 
     ## allow openstruct-style accessors
     class << vals
-      def method_missing(m, *args)
+      def method_missing(m, *_args)
         self[m] || self[m.to_s]
       end
     end
     vals
   end
 
-  def parse_date_parameter param, arg #:nodoc:
-    begin
-      begin
-        require 'chronic'
-        time = Chronic.parse(param)
-      rescue LoadError
-        # chronic is not available
-      end
-      time ? Date.new(time.year, time.month, time.day) : Date.parse(param)
-    rescue ArgumentError
-      raise CommandlineError, "option '#{arg}' needs a date"
-    end
-  end
-
   ## Print the help message to +stream+.
-  def educate stream=$stdout
+  def educate(stream = $stdout)
     width # hack: calculate it now; otherwise we have to be careful not to
           # call this unless the cursor's at the beginning of a line.
-    left = {}
-    @specs.each do |name, spec|
-      left[name] =
-        (spec[:short] && spec[:short] != :none ? "-#{spec[:short]}" : "") +
-        (spec[:short] && spec[:short] != :none ? ", " : "") + "--#{spec[:long]}" +
-        case spec[:type]
-        when :flag; ""
-        when :int; "=<i>"
-        when :ints; "=<i+>"
-        when :string; "=<s>"
-        when :strings; "=<s+>"
-        when :float; "=<f>"
-        when :floats; "=<f+>"
-        when :io; "=<filename/uri>"
-        when :ios; "=<filename/uri+>"
-        when :date; "=<date>"
-        when :dates; "=<date+>"
-        end +
-        (spec[:type] == :flag && spec[:default] ? ", --no-#{spec[:long]}" : "")
-    end
 
-    leftcol_width = left.values.map { |s| s.length }.max || 0
+    left = {}
+    @specs.each { |name, spec| left[name] = spec.educate }
+    
+    leftcol_width = left.values.map(&:length).max || 0
     rightcol_start = leftcol_width + 6 # spaces
 
     unless @order.size > 0 && @order.first.first == :text
       command_name = File.basename($0).gsub(/\.[^.]+$/, '')
-      stream.puts "Usage: #{command_name} #@usage\n" if @usage
-      stream.puts "#@synopsis\n" if @synopsis
-      stream.puts if @usage or @synopsis
-      stream.puts "#@version\n" if @version
+      stream.puts "Usage: #{command_name} #{@usage}\n" if @usage
+      stream.puts "#{@synopsis}\n" if @synopsis
+      stream.puts if @usage || @synopsis
+      stream.puts "#{@version}\n" if @version
       stream.puts "Options:"
     end
 
@@ -492,27 +382,8 @@ class Parser
 
       spec = @specs[opt]
       stream.printf "  %-#{leftcol_width}s    ", left[opt]
-      desc = spec[:desc] + begin
-        default_s = case spec[:default]
-        when $stdout; "<stdout>"
-        when $stdin; "<stdin>"
-        when $stderr; "<stderr>"
-        when Array
-          spec[:default].join(", ")
-        else
-          spec[:default].to_s
-        end
+      desc = spec.description_with_default
 
-        if spec[:default]
-          if spec[:desc] =~ /\.$/
-            " (Default: #{default_s})"
-          else
-            " (default: #{default_s})"
-          end
-        else
-          ""
-        end
-      end
       stream.puts wrap(desc, :width => width - rightcol_start - 1, :prefix => rightcol_start)
     end
   end
@@ -521,7 +392,8 @@ class Parser
     @width ||= if $stdout.tty?
       begin
         require 'io/console'
-        IO.console.winsize.last
+        w = IO.console.winsize.last
+        w.to_i > 0 ? w : 80
       rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF, Errno::EINVAL
         legacy_width
       end
@@ -538,7 +410,7 @@ class Parser
   end
   private :legacy_width
 
-  def wrap str, opts={} # :nodoc:
+  def wrap(str, opts = {}) # :nodoc:
     if str == ""
       [""]
     else
@@ -552,75 +424,92 @@ class Parser
   end
 
   ## The per-parser version of Trollop::die (see that for documentation).
-  def die arg, msg
+  def die(arg, msg = nil, error_code = nil)
+    msg, error_code = nil, msg if msg.kind_of?(Integer)
     if msg
-      $stderr.puts "Error: argument --#{@specs[arg][:long]} #{msg}."
+      $stderr.puts "Error: argument --#{@specs[arg].long} #{msg}."
     else
       $stderr.puts "Error: #{arg}."
     end
-    $stderr.puts "Try --help for help."
-    exit(-1)
+    if @educate_on_error
+      $stderr.puts
+      educate $stderr
+    else
+      $stderr.puts "Try --help for help."
+    end
+    exit(error_code || -1)
   end
 
 private
 
   ## yield successive arg, parameter pairs
-  def each_arg args
+  def each_arg(args)
     remains = []
     i = 0
 
     until i >= args.length
-      if @stop_words.member? args[i]
-        return remains += args[i .. -1]
-      end
+      return remains += args[i..-1] if @stop_words.member? args[i]
       case args[i]
       when /^--$/ # arg terminator
-        return remains += args[(i + 1) .. -1]
+        return remains += args[(i + 1)..-1]
       when /^--(\S+?)=(.*)$/ # long argument with equals
-        yield "--#{$1}", [$2]
+        num_params_taken = yield "--#{$1}", [$2]
+        if num_params_taken.nil?
+          remains << args[i]
+          if @stop_on_unknown
+            return remains += args[i + 1..-1]
+          end
+        end
         i += 1
       when /^--(\S+)$/ # long argument
         params = collect_argument_parameters(args, i + 1)
-        if params.empty?
-          yield args[i], nil
-          i += 1
-        else
-          num_params_taken = yield args[i], params
-          unless num_params_taken
-            if @stop_on_unknown
-              return remains += args[i + 1 .. -1]
-            else
-              remains += params
-            end
+        num_params_taken = yield args[i], params
+
+        if num_params_taken.nil?
+          remains << args[i]
+          if @stop_on_unknown
+            return remains += args[i + 1..-1]
           end
-          i += 1 + num_params_taken
+        else
+          i += num_params_taken
         end
+        i += 1
       when /^-(\S+)$/ # one or more short arguments
+        short_remaining = ""
         shortargs = $1.split(//)
         shortargs.each_with_index do |a, j|
           if j == (shortargs.length - 1)
             params = collect_argument_parameters(args, i + 1)
-            if params.empty?
-              yield "-#{a}", nil
-              i += 1
-            else
-              num_params_taken = yield "-#{a}", params
-              unless num_params_taken
-                if @stop_on_unknown
-                  return remains += args[i + 1 .. -1]
-                else
-                  remains += params
-                end
+
+            num_params_taken = yield "-#{a}", params
+            unless num_params_taken
+              short_remaining << a
+              if @stop_on_unknown
+                remains << "-#{short_remaining}"
+                return remains += args[i + 1..-1]
               end
-              i += 1 + num_params_taken
+            else
+              i += num_params_taken
             end
           else
-            yield "-#{a}", nil
+            unless yield "-#{a}", []
+              short_remaining << a
+              if @stop_on_unknown
+                short_remaining += shortargs[j + 1..-1].join
+                remains << "-#{short_remaining}"
+                return remains += args[i + 1..-1]
+              end
+            end
           end
         end
+
+        unless short_remaining.empty?
+          remains << "-#{short_remaining}"
+        end
+        i += 1
       else
         if @stop_on_unknown
-          return remains += args[i .. -1]
+          return remains += args[i..-1]
         else
           remains << args[i]
           i += 1
@@ -631,30 +520,7 @@ private
     remains
   end
 
-  def parse_integer_parameter param, arg
-    raise CommandlineError, "option '#{arg}' needs an integer" unless param =~ /^-?[\d_]+$/
-    param.to_i
-  end
-
-  def parse_float_parameter param, arg
-    raise CommandlineError, "option '#{arg}' needs a floating-point number" unless param =~ FLOAT_RE
-    param.to_f
-  end
-
-  def parse_io_parameter param, arg
-    case param
-    when /^(stdin|-)$/i; $stdin
-    else
-      require 'open-uri'
-      begin
-        open param
-      rescue SystemCallError => e
-        raise CommandlineError, "file or url for option '#{arg}' cannot be opened: #{e.message}"
-      end
-    end
-  end
-
-  def collect_argument_parameters args, start_at
+  def collect_argument_parameters(args, start_at)
     params = []
     pos = start_at
     while args[pos] && args[pos] !~ PARAM_RE && !@stop_words.member?(args[pos]) do
@@ -667,17 +533,17 @@ private
   def resolve_default_short_options!
     @order.each do |type, name|
       opts = @specs[name]
-      next if type != :opt || opts[:short]
+      next if type != :opt || opts.short
 
-      c = opts[:long].split(//).find { |d| d !~ INVALID_SHORT_ARG_REGEX && !@short.member?(d) }
+      c = opts.long.split(//).find { |d| d !~ INVALID_SHORT_ARG_REGEX && !@short.member?(d) }
       if c # found a character to use
-        opts[:short] = c
+        opts.short = c
         @short[c] = name
       end
     end
   end
 
-  def wrap_line str, opts={}
+  def wrap_line(str, opts = {})
     prefix = opts[:prefix] || 0
     width = opts[:width] || (self.width - 1)
     start = 0
@@ -691,7 +557,7 @@ private
           x = str.index(/\s/, start) if x && x < start
           x || str.length
         end
-      ret << ((ret.empty? && !opts[:inner]) ? "" : " " * prefix) + str[start ... nextt]
+      ret << ((ret.empty? && !opts[:inner]) ? "" : " " * prefix) + str[start...nextt]
       start = nextt + 1
     end
     ret
@@ -699,7 +565,7 @@ private
 
   ## instance_eval but with ability to handle block arguments
   ## thanks to _why: http://redhanded.hobix.com/inspect/aBlockCostume.html
-  def cloaker &b
+  def cloaker(&b)
     (class << self; self; end).class_eval do
       define_method :cloaker_, &b
       meth = instance_method :cloaker_
@@ -709,6 +575,317 @@ private
   end
 end
 
+class Option
+
+  attr_accessor :name, :short, :long, :default
+  attr_writer :multi_given
+  
+  def initialize
+    @long = nil
+    @short = nil
+    @name = nil
+    @multi_given = false
+    @hidden = false
+    @default = nil
+    @optshash = Hash.new()
+  end
+  
+  def opts (key)
+    @optshash[key]
+  end
+
+  def opts= (o)
+    @optshash = o
+  end
+  
+  ## Indicates a flag option, which is an option without an argument
+  def flag? ; false ; end
+  def single_arg?
+    !self.multi_arg? && !self.flag?
+  end
+
+  def multi ; @multi_given ; end
+  alias multi? multi
+
+  ## Indicates that this is a multivalued (Array type) argument
+  def multi_arg? ; false ; end
+  ## note: Option-Types with both multi_arg? and flag? false are single-parameter (normal) options.
+
+  def array_default? ; self.default.kind_of?(Array) ; end
+  
+  def short? ; short && short != :none ; end
+
+  def callback ; opts(:callback) ; end
+  def desc ; opts(:desc) ; end
+
+  def required? ; opts(:required) ; end
+
+  def parse (_paramlist, _neg_given)
+    raise NotImplementedError, "parse must be overridden for newly registered type"
+  end
+
+  # provide type-format string.  default to empty, but user should probably override it
+  def type_format ; "" ; end
+  
+  def educate
+    (short? ? "-#{short}, " : "") + "--#{long}" + type_format + (flag? && default ? ", --no-#{long}" : "")
+  end
+
+  ## Format the educate-line description including the default-value(s)
+  def description_with_default
+    return desc unless default
+    default_s = case default
+                when $stdout   then '<stdout>'
+                when $stdin    then '<stdin>'
+                when $stderr   then '<stderr>'
+                when Array
+                  default.join(', ')
+                else
+                  default.to_s
+                end
+    defword = desc.end_with?('.') ? 'Default' : 'default'
+    return "#{desc} (#{defword}: #{default_s})"
+  end
+
+  ## Provide a way to register symbol aliases to the Parser
+  def self.register_alias(*alias_keys)
+    alias_keys.each do |alias_key|
+      # pass in the alias-key and the class
+      Parser.register(alias_key, self)
+    end
+  end
+  
+  ## Factory class methods ...
+  
+  # Determines which type of object to create based on arguments passed
+  # to +Trollop::opt+.  This is trickier in Trollop, than other cmdline
+  # parsers (e.g. Slop) because we allow the +default:+ to be able to
+  # set the option's type.
+  def self.create(name, desc="", opts={}, settings={})
+
+    opttype = Trollop::Parser.registry_getopttype(opts[:type])
+    opttype_from_default = get_klass_from_default(opts, opttype)
+
+    raise ArgumentError, ":type specification and default type don't match (default type is #{opttype_from_default.class})" if opttype && opttype_from_default && (opttype.class != opttype_from_default.class)
+
+    opt_inst = (opttype || opttype_from_default || Trollop::BooleanOption.new)
+
+    ## fill in :long
+    opt_inst.long = handle_long_opt(opts[:long], name)
+
+    ## fill in :short
+    opt_inst.short = handle_short_opt(opts[:short])
+    
+    ## fill in :multi
+    multi_given = opts[:multi] || false
+    opt_inst.multi_given = multi_given
+
+    ## fill in :default for flags
+    defvalue = opts[:default] || opt_inst.default 
+
+    ## autobox :default for :multi (multi-occurrence) arguments
+    defvalue = [defvalue] if defvalue && multi_given && !defvalue.kind_of?(Array)
+    opt_inst.default = defvalue
+    opt_inst.name = name
+    opt_inst.opts = opts
+    opt_inst
+  end
+
+  private
+  
+  def self.get_type_from_disdef(optdef, opttype, disambiguated_default)
+    if disambiguated_default.is_a? Array
+      return(optdef.first.class.name.downcase + "s") if !optdef.empty?
+      if opttype
+        raise ArgumentError, "multiple argument type must be plural" unless opttype.multi_arg?
+        return nil
+      else
+        raise ArgumentError, "multiple argument type cannot be deduced from an empty array"
+      end
+    end
+    return disambiguated_default.class.name.downcase
+  end
+  
+  def self.get_klass_from_default(opts, opttype)
+    ## for options with :multi => true, an array default doesn't imply
+    ## a multi-valued argument. for that you have to specify a :type
+    ## as well. (this is how we disambiguate an ambiguous situation;
+    ## see the docs for Parser#opt for details.)
+
+    disambiguated_default = if opts[:multi] && opts[:default].is_a?(Array) && opttype.nil?
+                              opts[:default].first
+                            else
+                              opts[:default]
+                            end
+
+    return nil if disambiguated_default.nil?
+    type_from_default = get_type_from_disdef(opts[:default], opttype, disambiguated_default) 
+    return Trollop::Parser.registry_getopttype(type_from_default)
+  end
+
+  def self.handle_long_opt(lopt, name)
+    lopt = lopt ? lopt.to_s : name.to_s.gsub("_", "-")
+    lopt = case lopt
+           when /^--([^-].*)$/ then $1
+           when /^[^-]/        then lopt
+           else                     raise ArgumentError, "invalid long option name #{lopt.inspect}"
+           end
+  end
+  
+  def self.handle_short_opt(sopt)
+    sopt = sopt.to_s if sopt && sopt != :none
+    sopt = case sopt
+           when /^-(.)$/          then $1
+           when nil, :none, /^.$/ then sopt
+           else                   raise ArgumentError, "invalid short option name '#{sopt.inspect}'"
+           end
+
+    if sopt
+      raise ArgumentError, "a short option name can't be a number or a dash" if sopt =~ ::Trollop::Parser::INVALID_SHORT_ARG_REGEX
+    end
+    return sopt
+  end
+  
+end
+
+# Flag option.  Has no arguments. Can be negated with "no-".
+class BooleanOption < Option
+  register_alias :flag, :bool, :boolean, :trueclass, :falseclass
+  def initialize
+    super()
+    @default = false
+  end
+  def flag? ; true ; end
+  def parse(_paramlist, neg_given)
+    return(self.name.to_s =~ /^no_/ ? neg_given : !neg_given)
+  end
+end
+
+# Floating point number option class.
+class FloatOption < Option
+  register_alias :float, :double
+  def type_format ; "=<f>" ; end
+  def parse(paramlist, _neg_given)
+    paramlist.map do |pg|
+      pg.map do |param|
+        raise CommandlineError, "option '#{self.name}' needs a floating-point number" unless param.is_a?(Numeric) || param =~ FLOAT_RE
+        param.to_f
+      end
+    end
+  end
+end
+
+# Integer number option class.
+class IntegerOption < Option
+  register_alias :int, :integer, :fixnum
+  def type_format ; "=<i>" ; end
+  def parse(paramlist, _neg_given)
+    paramlist.map do |pg|
+      pg.map do |param|
+        raise CommandlineError, "option '#{self.name}' needs an integer" unless param.is_a?(Numeric) || param =~ /^-?[\d_]+$/
+        param.to_i
+      end
+    end
+  end
+end
+
+# Option class for handling IO objects and URLs.
+# Note that this will return the file-handle, not the file-name
+# in the case of file-paths given to it.
+class IOOption < Option
+  register_alias :io
+  def type_format ; "=<filename/uri>" ; end
+  def parse(paramlist, _neg_given)
+    paramlist.map do |pg|
+      pg.map do |param|
+        if param =~ /^(stdin|-)$/i
+          $stdin
+        else
+          require 'open-uri'
+          begin
+            open param
+          rescue SystemCallError => e
+            raise CommandlineError, "file or url for option '#{self.name}' cannot be opened: #{e.message}"
+          end
+        end
+      end
+    end
+  end
+end
+
+# Option class for handling Strings.
+class StringOption < Option
+  register_alias :string
+  def type_format ; "=<s>" ; end
+  def parse(paramlist, _neg_given)
+    paramlist.map { |pg| pg.map(&:to_s) }
+  end
+end
+
+# Option for dates.  Uses Chronic if it exists.
+class DateOption < Option
+  register_alias :date
+  def type_format ; "=<date>" ; end
+  def parse(paramlist, _neg_given)
+    paramlist.map do |pg|
+      pg.map do |param|
+        next param if param.is_a?(Date)
+        begin
+          begin
+            require 'chronic'
+            time = Chronic.parse(param)
+          rescue LoadError
+            # chronic is not available
+          end
+          time ? Date.new(time.year, time.month, time.day) : Date.parse(param)
+        rescue ArgumentError
+          raise CommandlineError, "option '#{self.name}' needs a date"
+        end
+      end
+    end
+  end
+end
+
+### MULTI_OPT_TYPES :
+## The set of values that indicate a multiple-parameter option (i.e., that
+## takes multiple space-separated values on the commandline) when passed as
+## the +:type+ parameter of #opt.
+
+# Option class for handling multiple Integers
+class IntegerArrayOption < IntegerOption
+  register_alias :fixnums, :ints, :integers
+  def type_format ; "=<i+>" ; end
+  def multi_arg? ; true ; end
+end
+
+# Option class for handling multiple Floats
+class FloatArrayOption < FloatOption
+  register_alias :doubles, :floats
+  def type_format ; "=<f+>" ; end
+  def multi_arg? ; true ; end
+end
+
+# Option class for handling multiple Strings
+class StringArrayOption < StringOption
+  register_alias :strings
+  def type_format ; "=<s+>" ; end
+  def multi_arg? ; true ; end
+end
+
+# Option class for handling multiple dates
+class DateArrayOption < DateOption
+  register_alias :dates
+  def type_format ; "=<date+>" ; end
+  def multi_arg? ; true ; end
+end
+
+# Option class for handling Files/URLs via 'open'
+class IOArrayOption < IOOption
+  register_alias :ios
+  def type_format ; "=<filename/uri+>" ; end
+  def multi_arg? ; true ; end
+end
+
 ## The easy, syntactic-sugary entry method into Trollop. Creates a Parser,
 ## passes the block to it, then parses +args+ with it, handling any errors or
 ## requests for help or version information appropriately (and then exiting).
@@ -740,7 +917,7 @@ end
 ##   p opts # => {:monkey=>true, :name=>nil, :num_limbs=>4, :help=>false, :monkey_given=>true}
 ##
 ## See more examples at http://trollop.rubyforge.org.
-def options args=ARGV, *a, &b
+def options(args = ARGV, *a, &b)
   @last_parser = Parser.new(*a, &b)
   with_standard_exception_handling(@last_parser) { @last_parser.parse args }
 end
@@ -770,20 +947,16 @@ end
 ##
 ## Requires passing in the parser object.
 
-def with_standard_exception_handling parser
-  begin
-    yield
-  rescue CommandlineError => e
-    $stderr.puts "Error: #{e.message}."
-    $stderr.puts "Try --help for help."
-    exit(-1)
-  rescue HelpNeeded
-    parser.educate
-    exit
-  rescue VersionNeeded
-    puts parser.version
-    exit
-  end
+def with_standard_exception_handling(parser)
+  yield
+rescue CommandlineError => e
+  parser.die(e.message, nil, e.error_code)
+rescue HelpNeeded
+  parser.educate
+  exit
+rescue VersionNeeded
+  puts parser.version
+  exit
 end
 
 ## Informs the user that their usage of 'arg' was wrong, as detailed by
@@ -804,9 +977,13 @@ end
 ##   end
 ##
 ##   Trollop::die "need at least one filename" if ARGV.empty?
-def die arg, msg=nil
+##
+## An exit code can be provide if needed
+##
+##   Trollop::die "need at least one filename", -2 if ARGV.empty?
+def die(arg, msg = nil, error_code = nil)
   if @last_parser
-    @last_parser.die arg, msg
+    @last_parser.die arg, msg, error_code
   else
     raise ArgumentError, "Trollop::die can only be called after Trollop::options"
   end
@@ -834,5 +1011,4 @@ def educate
 end
 
 module_function :options, :die, :educate, :with_standard_exception_handling
-
 end # module