firebase-ruby 0.2.0.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ed31533488ea96baffad5a57685f0270a38e3c4
-  data.tar.gz: 21e8b7d9747ef1f43a614de297a54182781ccb0f
+SHA256:
+  metadata.gz: c81422955349a239c73df7add0f495be525dee6df19fb99c07fcc7a97ad5ea9b
+  data.tar.gz: c28b48f45899cc15a405baf006addb187eb80379d144522f9412ec5c3244daac
 SHA512:
-  metadata.gz: bfb8b6e5680a6be288405e3f3b69f074afbcb91849403d2b816c37985f079b6759e79cb35b06ded436c422d390b48db0f4406e1cf67b04d6e0981cfadd36e499
-  data.tar.gz: ef0cfe88733e0f8f6d17f5dd5f05b26e9bfcbe8e530b2f3ecc8ff0e3f15c23202685c031f68a35ae119f88d34ccc025220fd22eada415f36174f958098285421
+  metadata.gz: 1c81dbcaef8b12f675a85d07488c6979161d2a2bd3bdada1e5e3fd69a6b38745a396f44c80bda7e88a00b310ee7febde6f300025378c8614d4f3764b284bcf3f
+  data.tar.gz: 267c6bdbef1be804ddcccd6c20d534fa6f0a874751fa0479c240079933da0d9ea4cc0a22931fae3ebfb12551f6ff075f8849a0e2627ef56e150afca770372663

data/.codeclimate.yml

@@ -15,4 +15,4 @@ ratings:
      - "**"
 
 exclude_paths:
-  - lib/firebase-ruby/trollop.rb
+  - lib/firebase-ruby/optimist.rb

data/README.md

@@ -57,4 +57,4 @@ db.delete('/users/jack/name/last')
 
 Using the given credentials, `firebase-ruby` will automatically retrieve the [access token](https://firebase.google.com/docs/reference/rest/database/user-auth) from Google's server. The token is valid for 1 hour but a new token will be fetched right before it expires.
 
-`firebase-ruby` keeps the Google OAuth 2.0 process a black box. But for more details, see the document on Google Developers which the process is based on: [Using OAuth 2.0 for Server to Server Applications](https://developers.google.com/identity/protocols/OAuth2ServiceAccount).
+`firebase-ruby` keeps the Google OAuth 2.0 process a black box. But for more details, see the document on Google Developers which the process is based on: [Using OAuth 2.0 for Server to Server Applications](https://developers.google.com/identity/protocols/oauth2/service-account).

data/bin/fbrb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require 'firebase-ruby/trollop'
+require 'firebase-ruby/optimist'
 require 'firebase-ruby'
 require 'json'
 
 
-opts = Trollop::options do
+opts = Optimist::options do
   banner "fbrb [options] <URL>"
   opt :data, 'HTTP POST data', type: :string
   opt :id, 'Project ID', type: :string
@@ -32,29 +32,34 @@ log.debug("Command line arguments: #{opts}")
 path = opts[:path]
 path ||= ARGV.shift
 
-Trollop::die :path, "is missing" if path.nil?
+Optimist::die :path, "is missing" if path.nil?
 
 db = Firebase::Database.new()
 db.set_auth_with_key(path: opts[:key])
 
 method = opts[:request].downcase.to_sym
 
-case method
-when :get, :delete
-  data = db.public_send(method, path)
-when :put, :patch, :post
-  if opts[:data_given]
-    data = db.public_send(method, path, opts[:data])
-  else
-    Trollop::die :data, "is missing"
+begin
+  case method
+  when :get, :delete
+    data = db.public_send(method, path)
+  when :put, :patch, :post
+    if opts[:data_given]
+      data = db.public_send(method, path, opts[:data])
+    else
+      Optimist::die :data, "is missing"
+    end
   end
-end
 
-if data
-  if opts[:ruby]
-    puts data
-  else
-    json_opts = {indent: '  ', space: ' ', object_nl: "\n", array_nl: "\n"}
-    puts JSON.fast_generate(data, json_opts)
+  if data
+    if opts[:ruby]
+      puts data
+    else
+      json_opts = {indent: '  ', space: ' ', object_nl: "\n", array_nl: "\n"}
+      puts JSON.fast_generate(data, json_opts)
+    end
   end
+rescue => e
+  puts e.message
+  exit 1
 end

data/firebase-ruby.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.version       = Firebase::Version
   s.authors       = ['Ken J.']
   s.email         = ['kenjij@gmail.com']
-  s.summary       = %q{Pure Ruby Firebase REST library}
-  s.description   = %q{A simple Firebase Realtime Database REST API library in pure Ruby.}
+  s.summary       = %q{Pure simple Ruby based Firebase REST library}
+  s.description   = %q{Firebase REST library written in pure Ruby without external dependancy.}
   s.homepage      = 'https://github.com/kenjij/firebase-ruby'
   s.license       = 'MIT'
 
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 2.0'
-  s.add_runtime_dependency 'jwt', '~> 1.5'
+  s.add_runtime_dependency 'jwt', '~> 2.2'
 end

data/lib/firebase-ruby.rb

@@ -1,4 +1,3 @@
 require 'firebase-ruby/logger'
 require 'firebase-ruby/database'
 require 'firebase-ruby/auth'
-require 'firebase-ruby/http'

data/lib/firebase-ruby/auth.rb

@@ -1,17 +1,18 @@
 require 'jwt'
+require 'firebase-ruby/neko-http'
 
-module Firebase
 
+module Firebase
   class Auth
-
     GOOGLE_JWT_SCOPE = 'https://www.googleapis.com/auth/firebase.database https://www.googleapis.com/auth/userinfo.email'
-    GOOGLE_JWT_AUD = 'https://www.googleapis.com/oauth2/v4/token'
+    GOOGLE_JWT_AUD = 'https://oauth2.googleapis.com/token'
     GOOGLE_ALGORITHM = 'RS256'
     GOOGLE_GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:jwt-bearer'
-    GOOGLE_TOKEN_URL = 'https://www.googleapis.com/oauth2/v4/token'
+    GOOGLE_TOKEN_URL = 'https://oauth2.googleapis.com/token'
 
     attr_reader :project_id
     attr_reader :client_email
+    attr_reader :token_uri
     attr_reader :access_token
     attr_reader :expires
 
@@ -28,7 +29,7 @@ module Firebase
     def valid_token
       return access_token if access_token && !expiring?
       return access_token if request_access_token
-      return nil
+      raise 'No valid access token.'
     end
 
     # If token is expiring within a minute
@@ -52,7 +53,11 @@ module Firebase
       @private_key = cred[:private_key]
       @project_id = cred[:project_id]
       @client_email = cred[:client_email]
+      @token_uri = cred[:token_uri]
+      @token_uri ||= GOOGLE_TOKEN_URL
       Firebase.logger.info('Private key loaded from JSON')
+      s = [:project_id, :client_email].map{ |x| "#{x}: #{self.public_send(x)}" }
+      Firebase.logger.debug("The key contained:\n#{s.join("\n")}")
     end
 
     # @param path [String] path to JSON file with private key
@@ -64,14 +69,21 @@ module Firebase
 
     # Request new token from Google
     def request_access_token
-      Firebase.logger.info('Requesting access token to Google')
-      res = HTTP.post_form(GOOGLE_TOKEN_URL, jwt)
+      Firebase.logger.info('Requesting access token...')
+      Firebase.logger.debug("token_uri: #{token_uri}")
+      res = Neko::HTTP.post_form(token_uri, jwt)
       Firebase.logger.debug("HTTP response code: #{res[:code]}")
       if res.class == Hash && res[:code] == 200
         data = JSON.parse(res[:body], {symbolize_names: true})
         @access_token = data[:access_token]
         @expires = Time.now + data[:expires_in]
+        Firebase.logger.info('Access token acquired.')
+        s = "Token #{@access_token.length} bytes, expires #{@expires}"
+        Firebase.logger.debug(s)
         return true
+      else
+        Firebase.logger.error('Access token request failed.')
+        Firebase.logger.debug("HTTP #{res[:code]} #{res[:message]}")
       end
       return false
     end
@@ -90,7 +102,5 @@ module Firebase
       jwt = JWT.encode payload, pkey, GOOGLE_ALGORITHM
       return {grant_type: GOOGLE_GRANT_TYPE, assertion: jwt}
     end
-
   end
-
 end

data/lib/firebase-ruby/database.rb

@@ -1,7 +1,8 @@
-module Firebase
+require 'firebase-ruby/neko-http'
 
-  class Database
 
+module Firebase
+  class Database
     FIREBASE_URL_TEMPLATE = 'https://%s.firebaseio.com/'
 
     attr_accessor :auth, :print, :shallow
@@ -59,7 +60,7 @@ module Firebase
     def http
       unless @http
         url = FIREBASE_URL_TEMPLATE % project_id
-        @http = HTTP.new(url, {'Content-Type' => 'application/json'})
+        @http = Neko::HTTP.new(url, {'Content-Type' => 'application/json'})
       end
       @http.headers['Authorization'] = "Bearer #{auth.valid_token}"
       return @http
@@ -77,7 +78,5 @@ module Firebase
       end
       return JSON.parse(data[:body], {symbolize_names: true})
     end
-
   end
-
 end

data/lib/firebase-ruby/{http.rb → neko-http.rb}

@@ -1,11 +1,22 @@
+# NekoHTTP - Pure Ruby HTTP client using net/http
+# 
+# v.20200629
+
+require 'json'
+require 'logger'
 require 'net/http'
 require 'openssl'
 
+module Neko
+  def self.logger=(logger)
+    @logger = logger
+  end
 
-module Firebase
+  def self.logger
+    @logger ||= NullLogger.new()
+  end
 
   class HTTP
-
     METHOD_HTTP_CLASS = {
       get: Net::HTTP::Get,
       put: Net::HTTP::Put,
@@ -14,30 +25,66 @@ module Firebase
       delete: Net::HTTP::Delete
     }
 
-    def self.get(url, params)
-      h = HTTP.new(url)
+    # Simple GET request
+    # @param url [String] full URL string
+    # @param params [Array, Hash] it will be converted to URL encoded query
+    # @param hdrs [Hash] HTTP headers
+    # @return [Hash] contains: :code, :headers, :body, :message
+    def self.get(url, params, hdrs = nil)
+      h = HTTP.new(url, hdrs)
       data = h.get(params: params)
       h.close
       return data
     end
 
-    def self.post_form(url, params)
-      h = HTTP.new(url)
+    # Send POST request with form data URL encoded body
+    # @param url [String] full URL string
+    # @param params [Array, Hash] it will be converted to URL encoded body
+    # @param hdrs [Hash] HTTP headers
+    # @return (see #self.get)
+    def self.post_form(url, params, hdrs = nil)
+      h = HTTP.new(url, hdrs)
       data = h.post(params: params)
       h.close
       return data
     end
 
+    # Send POST request with JSON body
+    # It will set the Content-Type to application/json.
+    # @param url [String] full URL string
+    # @param obj [Array, Hash, String] Array/Hash will be converted to JSON
+    # @param hdrs [Hash] HTTP headers
+    # @return (see #self.get)
+    def self.post_json(url, obj, hdrs = {})
+      hdrs['Content-Type'] = 'application/json'
+      h = HTTP.new(url, hdrs)
+      case obj
+      when Array, Hash
+        body = JSON.fast_generate(obj)
+      when String
+        body = obj
+      else
+        raise ArgumentError, 'Argument is neither Array, Hash, String'
+      end
+      data = h.post(body: body)
+      h.close
+      return data
+    end
+
     attr_reader :init_uri, :http
-    attr_accessor :headers
+    attr_accessor :logger, :headers
 
+    # Instance constructor for tailored use
+    # @param url [String] full URL string
+    # @param hdrs [Hash] HTTP headers
     def initialize(url, hdrs = nil)
+      @logger = Neko.logger
       @init_uri = URI(url)
       raise ArgumentError, 'Invalid URL' unless @init_uri.class <= URI::HTTP
       @http = Net::HTTP.new(init_uri.host, init_uri.port)
       http.use_ssl = init_uri.scheme == 'https'
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      self.headers = hdrs
+      @headers = hdrs
     end
 
     def get(path: nil, params: nil, query: nil)
@@ -72,24 +119,28 @@ module Firebase
       when :get, :delete
         if params
           query = URI.encode_www_form(params)
-          Firebase.logger.info('Created urlencoded query from params')
+          logger.info('Created urlencoded query from params')
         end
-        uri.query = query
+        uri.query = query if query
         req = METHOD_HTTP_CLASS[method].new(uri)
       when :put, :patch, :post
         uri.query = query if query
         req = METHOD_HTTP_CLASS[method].new(uri)
         if params
           req.form_data = params
-          Firebase.logger.info('Created form data from params')
+          logger.info('Created form data from params')
         elsif body
           req.body = body
         end
       else
         return nil
       end
+      if uri.userinfo
+        req.basic_auth(uri.user, uri.password)
+        logger.info('Created basic auth header from URL')
+      end
       data = send(req)
-      data = redirect(method, uri, params: params, body: body, query: query) if data.class <= URI::HTTP
+      data = redirect(method, uri: data, body: req.body) if data.class <= URI::HTTP
       return data
     end
 
@@ -102,36 +153,34 @@ module Firebase
     def send(req)
       inject_headers_to(req)
       unless http.started?
-        Firebase.logger.info('HTTP session not started; starting now')
+        logger.info('HTTP session not started; starting now')
         http.start
-        Firebase.logger.debug("Opened connection to #{http.address}:#{http.port}")
+        logger.debug("Opened connection to #{http.address}:#{http.port}")
       end
-      Firebase.logger.debug("Sending HTTP #{req.method} request to #{req.path}")
-      Firebase.logger.debug("Body size: #{req.body.length}") if req.request_body_permitted?
+      logger.debug("Sending HTTP #{req.method} request to #{req.path}")
+      logger.debug("Body size: #{req.body.length}") if req.request_body_permitted?
       res = http.request(req)
       return handle_response(res)
     end
 
     def inject_headers_to(req)
       return if headers.nil?
-      headers.each do |k, v|
-        req[k] = v
-      end
-      Firebase.logger.info('Header injected into HTTP request header')
+      headers.each { |k, v| req[k] = v }
+      logger.info('Header injected into HTTP request header')
     end
 
     def handle_response(res)
       if res.connection_close?
-        Firebase.logger.info('HTTP response header says connection close; closing session now')
+        logger.info('HTTP response header says connection close; closing session now')
         close
       end
       case res
       when Net::HTTPRedirection
-        Firebase.logger.info('HTTP response was a redirect')
+        logger.info('HTTP response was a redirect')
         data = URI(res['Location'])
         if data.class == URI::Generic
           data = uri_with_path(res['Location'])
-          Firebase.logger.debug("Full URI object built for local redirect with path: #{data.path}")
+          logger.debug("Full URI object built for local redirect with path: #{data.path}")
         end
       # when Net::HTTPSuccess
       # when Net::HTTPClientError
@@ -147,25 +196,23 @@ module Firebase
       return data
     end
 
-    def redirect(method, uri, params: nil, body: nil, query: nil)
+    def redirect(method, uri:, body: nil)
       if uri.host == init_uri.host && uri.port == init_uri.port
-        Firebase.logger.info("Local #{method.upcase} redirect, reusing HTTP session")
-        new_http = http
+        logger.info("Local #{method.upcase} redirect, reusing HTTP session")
+        new_http = self
       else
-        Firebase.logger.info("External #{method.upcase} redirect, spawning new HTTP object")
+        logger.info("External #{method.upcase} redirect, spawning new HTTP object")
         new_http = HTTP.new("#{uri.scheme}://#{uri.host}#{uri.path}", headers)
       end
-      case method
-      when :get, :delete
-        data = operate(method, uri, params: params, query: query)
-      when :put, :patch, :post
-        data = new_http.public_send(method, uri, params: params, body: body, query: query)
-      else
-        data = nil
-      end
-      return data
+      new_http.__send__(:operate, method, path: uri.path, body: body, query: uri.query)
     end
-
   end
 
+  class NullLogger < Logger
+    def initialize(*args)
+    end
+
+    def add(*args, &block)
+    end
+  end
 end

data/lib/firebase-ruby/{trollop.rb → optimist.rb}

@@ -1,17 +1,17 @@
-# lib/trollop.rb -- trollop command-line processing library
+# lib/optimist.rb -- optimist command-line processing library
 # Copyright (c) 2008-2014 William Morgan.
 # Copyright (c) 2014 Red Hat, Inc.
-# trollop is licensed under the MIT license.
+# optimist is licensed under the MIT license.
 
 require 'date'
 
-module Trollop
+module Optimist
   # note: this is duplicated in gemspec
   # please change over there too
-VERSION = "2.1.2"
+VERSION = "3.0.1"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
-## you're using the Trollop::options entry.
+## you're using the Optimist::options entry.
 class CommandlineError < StandardError
   attr_reader :error_code
 
@@ -22,12 +22,12 @@ class CommandlineError < StandardError
 end
 
 ## Thrown by Parser if the user passes in '-h' or '--help'. Handled
-## automatically by Trollop#options.
+## automatically by Optimist#options.
 class HelpNeeded < StandardError
 end
 
 ## Thrown by Parser if the user passes in '-v' or '--version'. Handled
-## automatically by Trollop#options.
+## automatically by Optimist#options.
 class VersionNeeded < StandardError
 end
 
@@ -38,15 +38,38 @@ FLOAT_RE = /^-?((\d+(\.\d+)?)|(\.\d+))([eE][-+]?[\d]+)?$/
 PARAM_RE = /^-(-|\.$|[^\d\.])/
 
 ## The commandline parser. In typical usage, the methods in this class
-## will be handled internally by Trollop::options. In this case, only the
+## will be handled internally by Optimist::options. In this case, only the
 ## #opt, #banner and #version, #depends, and #conflicts methods will
 ## typically be called.
 ##
 ## If you want to instantiate this class yourself (for more complicated
 ## argument-parsing logic), call #parse to actually produce the output hash,
 ## and consider calling it from within
-## Trollop::with_standard_exception_handling.
+## Optimist::with_standard_exception_handling.
 class Parser
+
+  ## 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:
 
   ## The values from the commandline that were not interpreted by #parse.
@@ -75,7 +98,7 @@ class Parser
     @educate_on_error = false
     @synopsis = nil
     @usage = nil
-    
+
     # instance_eval(&b) if b # can't take arguments
     cloaker(&b).bind(self).call(*a) if b
   end
@@ -90,7 +113,7 @@ class Parser
   ## [+: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+. 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+.
+  ## [+:default+] Set the default value for an argument. Without a default value, the hash returned by #parse (and thus Optimist::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.
   ## [+:multi+] If set to +true+, allows multiple occurrences of the option on the commandline. Otherwise, only a single instance of the option is allowed. (Note that this is different from taking multiple parameters. See below.)
   ##
@@ -116,7 +139,7 @@ class Parser
   ## There's one ambiguous case to be aware of: when +:multi+: is true and a
   ## +:default+ is set to an array (of something), it's ambiguous whether this
   ## is a multi-value argument as well as a multi-occurrence argument.
-  ## In thise case, Trollop assumes that it's not a multi-value argument.
+  ## In thise case, Optimist assumes that it's not a multi-value argument.
   ## If you want a multi-value, multi-occurrence argument with a default
   ## value, you must specify +:type+ as well.
 
@@ -164,7 +187,7 @@ class Parser
 
   ## Marks two (or more!) options as requiring each other. Only handles
   ## undirected (i.e., mutual) dependencies. Directed dependencies are
-  ## better modeled with Trollop::die.
+  ## better modeled with Optimist::die.
   def depends(*syms)
     syms.each { |sym| raise ArgumentError, "unknown option '#{sym}'" unless @specs[sym] }
     @constraints << [:depends, syms]
@@ -182,7 +205,7 @@ class Parser
   ## intact.
   ##
   ## A typical use case would be for subcommand support, where these
-  ## would be set to the list of subcommands. A subsequent Trollop
+  ## would be set to the list of subcommands. A subsequent Optimist
   ## invocation would then be used to parse subcommand options, after
   ## shifting the subcommand off of ARGV.
   def stop_on(*words)
@@ -203,7 +226,7 @@ class Parser
     @educate_on_error = true
   end
 
-  ## Parses the commandline. Typically called by Trollop::options,
+  ## Parses the commandline. Typically called by Optimist::options,
   ## but you can call it directly if you need more control.
   ##
   ## throws CommandlineError, HelpNeeded, and VersionNeeded exceptions.
@@ -240,7 +263,7 @@ class Parser
 
       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?
@@ -255,7 +278,7 @@ class Parser
       # The block returns the number of parameters taken.
       num_params_taken = 0
 
-      unless params.nil?
+      unless params.empty?
         if @specs[sym].single_arg?
           given_args[sym][:params] << params[0, 1]  # take the first parameter
           num_params_taken = 1
@@ -301,20 +324,7 @@ class Parser
 
       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(&: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 opts.single_arg?
         if opts.multi?        # multiple options, each with a single parameter
@@ -344,41 +354,13 @@ class Parser
     vals
   end
 
-  def parse_date_parameter(param, arg) #:nodoc:
-    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
-
   ## Print the help message to +stream+.
   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}, " : "") + "--#{spec.long}" +
-        case spec.type
-        when :flag    then ""
-        when :int     then "=<i>"
-        when :ints    then "=<i+>"
-        when :string  then "=<s>"
-        when :strings then "=<s+>"
-        when :float   then "=<f>"
-        when :floats  then "=<f+>"
-        when :io      then "=<filename/uri>"
-        when :ios     then "=<filename/uri+>"
-        when :date    then "=<date>"
-        when :dates   then "=<date+>"
-        end +
-        (spec.flag? && spec.default ? ", --no-#{spec.long}" : "")
-    end
+    @specs.each { |name, spec| left[name] = spec.educate }
 
     leftcol_width = left.values.map(&:length).max || 0
     rightcol_start = leftcol_width + 6 # spaces
@@ -400,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   then "<stdout>"
-        when $stdin    then "<stdin>"
-        when $stderr   then "<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
@@ -460,8 +423,9 @@ class Parser
     end
   end
 
-  ## The per-parser version of Trollop::die (see that for documentation).
+  ## The per-parser version of Optimist::die (see that for documentation).
   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}."
     else
@@ -489,47 +453,60 @@ private
       when /^--$/ # arg terminator
         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]
@@ -543,29 +520,6 @@ 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)
-    if param =~ /^(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)
     params = []
     pos = start_at
@@ -621,173 +575,318 @@ private
   end
 end
 
-## The option for each flag
 class Option
-  ## 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
-
-  attr_accessor :name, :opts
-
-  def initialize(name, desc="", opts={}, &b)
-    ## fill in :type
-    opts[:type] = # normalize
-      case opts[:type]
-      when :boolean, :bool then :flag
-      when :integer        then :int
-      when :integers       then :ints
-      when :double         then :float
-      when :doubles        then :floats
-      when Class
-        case opts[:type].name
-        when 'TrueClass',
-             'FalseClass'  then :flag
-        when 'String'      then :string
-        when 'Integer'     then :int
-        when 'Float'       then :float
-        when 'IO'          then :io
-        when 'Date'        then :date
-        else
-          raise ArgumentError, "unsupported argument type '#{opts[:type].class.name}'"
-        end
-      when nil             then nil
-      else
-        raise ArgumentError, "unsupported argument type '#{opts[:type]}'" unless TYPES.include?(opts[:type])
-        opts[:type]
-      end
+  attr_accessor :name, :short, :long, :default
+  attr_writer :multi_given
 
-    ## 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].kind_of?(Array) && !opts[:type]
-      opts[:default].first
-    else
-      opts[:default]
+  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
 
-    type_from_default =
-      case disambiguated_default
-      when Integer     then :int
-      when Numeric     then :float
-      when TrueClass,
-           FalseClass  then :flag
-      when String      then :string
-      when IO          then :io
-      when Date        then :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 then :ints
-          when Numeric then :floats
-          when String  then :strings
-          when IO      then :ios
-          when Date    then :dates
-          else
-            raise ArgumentError, "unsupported multiple argument type '#{opts[:default][0].class.name}'"
-          end
-        end
-      when nil         then nil
-      else
-        raise ArgumentError, "unsupported argument type '#{opts[:default].class.name}'"
-      end
+  ## Factory class methods ...
+
+  # Determines which type of object to create based on arguments passed
+  # to +Optimist::opt+.  This is trickier in Optimist, 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 = Optimist::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 #{type_from_default})" if opts[:type] && type_from_default && opts[:type] != type_from_default
+    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)
 
-    opts[:type] = opts[:type] || type_from_default || :flag
+    opt_inst = (opttype || opttype_from_default || Optimist::BooleanOption.new)
 
     ## fill in :long
-    opts[:long] = opts[:long] ? opts[:long].to_s : name.to_s.gsub("_", "-")
-    opts[:long] = case opts[:long]
-      when /^--([^-].*)$/ then $1
-      when /^[^-]/        then opts[:long]
-      else                     raise ArgumentError, "invalid long option name #{opts[:long].inspect}"
-    end
+    opt_inst.long = handle_long_opt(opts[:long], name)
 
     ## fill in :short
-    opts[:short] = opts[:short].to_s if opts[:short] && opts[:short] != :none
-    opts[:short] = case opts[:short]
-      when /^-(.)$/          then $1
-      when nil, :none, /^.$/ then opts[:short]
-      else                   raise ArgumentError, "invalid short option name '#{opts[:short].inspect}'"
-    end
+    opt_inst.short = handle_short_opt(opts[:short])
 
-    if opts[:short]
-      raise ArgumentError, "a short option name can't be a number or a dash" if opts[:short] =~ ::Trollop::Parser::INVALID_SHORT_ARG_REGEX
-    end
+    ## fill in :multi
+    multi_given = opts[:multi] || false
+    opt_inst.multi_given = multi_given
 
     ## fill in :default for flags
-    opts[:default] = false if opts[:type] == :flag && opts[:default].nil?
+    defvalue = opts[:default] || opt_inst.default
 
     ## autobox :default for :multi (multi-occurrence) arguments
-    opts[:default] = [opts[:default]] if opts[:default] && opts[:multi] && !opts[:default].kind_of?(Array)
+    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
 
-    ## fill in :multi
-    opts[:multi] ||= false
+  private
 
-    self.name = name
-    self.opts = opts
+  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 key?(name)
-    opts.key?(name)
+  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 Optimist::Parser.registry_getopttype(type_from_default)
   end
 
-  def type ; opts[:type] ; end
-  def flag? ; type == :flag ; end
-  def single_arg?
-    SINGLE_ARG_TYPES.include?(type)
+  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 multi ; opts[:multi] ; end
-  alias multi? multi
+  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
 
-  def multi_arg?
-    MULTI_ARG_TYPES.include?(type)
+    if sopt
+      raise ArgumentError, "a short option name can't be a number or a dash" if sopt =~ ::Optimist::Parser::INVALID_SHORT_ARG_REGEX
+    end
+    return sopt
   end
 
-  def default ; opts[:default] ; end
-  #? def multi_default ; opts.default || opts.multi && [] ; end
-  def array_default? ; opts[:default].kind_of?(Array) ; end
+end
 
-  def short ; opts[:short] ; end
-  def short? ; short && short != :none ; end
-  # not thrilled about this
-  def short=(val) ; opts[:short] = val ; end
-  def long ; opts[:long] ; end
-  def callback ; opts[:callback] ; end
-  def desc ; opts[:desc] ; 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
 
-  def required? ; opts[:required] ; 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
 
-  def self.create(name, desc="", opts={})
-    new(name, desc, opts)
+# 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
 
-## The easy, syntactic-sugary entry method into Trollop. Creates a Parser,
+### 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 Optimist. 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).
 ## Modifies +args+ in place. Returns a hash of option values.
@@ -804,8 +903,8 @@ end
 ##
 ## Example:
 ##
-##   require 'trollop'
-##   opts = Trollop::options do
+##   require 'optimist'
+##   opts = Optimist::options do
 ##     opt :monkey, "Use monkey mode"                    # a flag --monkey, defaulting to false
 ##     opt :name, "Monkey name", :type => :string        # a string --name <s>, defaulting to nil
 ##     opt :num_limbs, "Number of limbs", :default => 4  # an integer --num-limbs <i>, defaulting to 4
@@ -817,13 +916,13 @@ end
 ##   ## if called with --monkey
 ##   p opts # => {:monkey=>true, :name=>nil, :num_limbs=>4, :help=>false, :monkey_given=>true}
 ##
-## See more examples at http://trollop.rubyforge.org.
+## See more examples at http://optimist.rubyforge.org.
 def options(args = ARGV, *a, &b)
   @last_parser = Parser.new(*a, &b)
   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
+## If Optimist::options doesn't do quite what you want, you can create a Parser
 ## object and call Parser#parse on it. That method will throw CommandlineError,
 ## HelpNeeded and VersionNeeded exceptions when necessary; if you want to
 ## have these handled for you in the standard manner (e.g. show the help
@@ -834,15 +933,15 @@ end
 ##
 ## Usage example:
 ##
-##   require 'trollop'
-##   p = Trollop::Parser.new do
+##   require 'optimist'
+##   p = Optimist::Parser.new do
 ##     opt :monkey, "Use monkey mode"                     # a flag --monkey, defaulting to false
 ##     opt :goat, "Use goat mode", :default => true       # a flag --goat, defaulting to true
 ##   end
 ##
-##   opts = Trollop::with_standard_exception_handling p do
+##   opts = Optimist::with_standard_exception_handling p do
 ##     o = p.parse ARGV
-##     raise Trollop::HelpNeeded if ARGV.empty? # show help screen
+##     raise Optimist::HelpNeeded if ARGV.empty? # show help screen
 ##     o
 ##   end
 ##
@@ -877,12 +976,16 @@ end
 ##     opt :whatever # ...
 ##   end
 ##
-##   Trollop::die "need at least one filename" if ARGV.empty?
+##   Optimist::die "need at least one filename" if ARGV.empty?
+##
+## An exit code can be provide if needed
+##
+##   Optimist::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, error_code
   else
-    raise ArgumentError, "Trollop::die can only be called after Trollop::options"
+    raise ArgumentError, "Optimist::die can only be called after Optimist::options"
   end
 end
 
@@ -897,13 +1000,13 @@ end
 ##   EOS
 ##   end
 ##
-##   Trollop::educate if ARGV.empty?
+##   Optimist::educate if ARGV.empty?
 def educate
   if @last_parser
     @last_parser.educate
     exit
   else
-    raise ArgumentError, "Trollop::educate can only be called after Trollop::options"
+    raise ArgumentError, "Optimist::educate can only be called after Optimist::options"
   end
 end