chimps 0.1.9 → 0.2.0

data/lib/chimps/commands/search.rb

@@ -5,10 +5,12 @@ module Chimps
     # Infochimps.
     class Search < Chimps::Command
 
+      # Describes usage of search command.
+      USAGE = "usage: chimps search [OPTIONS] QUERY"
+
       # Default number of search results returned.
       # DEFAULT_LIMIT  = 20
       
-      BANNER = "usage: chimps search [OPTIONS] QUERY"
       HELP   = <<EOF
 
 Perform a search on Infochimps.  By default the search will be of
@@ -18,8 +20,6 @@ EOF
       # Path to search resource
       PATH   = 'search.json'
       
-      # Models this command applies to (default first)
-      MODELS = %w[dataset collection source license]
       include Chimps::Utils::UsesModel
 
       # FIXME have to implement this on the server side.
@@ -27,20 +27,9 @@ EOF
       #   @limit ||= DEFAULT_LIMIT
       # end
 
-      def define_options
-        # on_tail("-n", "--num-results NUM", "Return the given number of results instead of the default #{DEFAULT_LIMIT}") do |n|
-        #   @limit = n.to_i
-        # end
-
-        on_tail("-s", "--[no-]skip-column-names", "don't print column names in output.") do |s|
-          @skip_column_names = s
-        end
-        
-      end
-
       def query
-        raise CLIError.new("Must provide a query to search for") if argv.blank?
-        argv.join(' ')
+        raise CLIError.new("Must provide a query to search for") if config.argv.blank?
+        config.argv.join(' ')
       end
 
       def params
@@ -51,7 +40,7 @@ EOF
       end
 
       def execute!
-        Chimps::Request.new(PATH, :params => params).get.print(:skip_column_names => @skip_column_names)
+        Chimps::Request.new(PATH, :params => params).get.print(:skip_column_names => config[:skip_column_names])
       end
     end
   end

data/lib/chimps/commands/show.rb

@@ -3,15 +3,13 @@ module Chimps
 
     class Show < Chimps::Command
 
-      BANNER = "usage: chimps show [OPTIONS] ID_OR_HANDLE"
+      USAGE = "usage: chimps show [OPTIONS] ID_OR_HANDLE"
       HELP   = <<EOF
 
 Return a description of the resource (defaults to dataset) with the
 given ID or HANDLE
 EOF
 
-      # Models this command applies to (default first)
-      MODELS = %w[dataset collection source license tag category]
       include Chimps::Utils::UsesModel
 
       # The path of the URL to send a Request to.

data/lib/chimps/commands/test.rb

@@ -5,7 +5,7 @@ module Chimps
     # working.
     class Test < Chimps::Command
 
-      BANNER = "usage: chimps test"
+      USAGE = "usage: chimps test"
       HELP = <<EOF
 
 Print diagnostic information on the API credentials being used by chimps
@@ -16,12 +16,11 @@ EOF
 
       # Path to submit test requests to.
       def path
-        "api_accounts/#{Chimps::CONFIG[:site][:key]}"
+        "api_accounts/#{Chimps::Config[:site][:key]}"
       end
 
       # Issue the request.
       def execute!
-        puts "Reading identity file at #{CONFIG[:identity_file]}" if Chimps.verbose?
         response = Chimps::Request.new(path, :sign => true).get
         if response.error?
           case 

data/lib/chimps/commands/update.rb

@@ -5,7 +5,7 @@ module Chimps
     # Infochimps.
     class Update < Chimps::Command
 
-      BANNER = "usage: chimps update [OPTIONS] ID_OR_HANDLE [PROP=VALUE] ..."
+      USAGE = "usage: chimps update [OPTIONS] ID_OR_HANDLE [PROP=VALUE] ..."
       HELP   = <<EOF
 
 Updates a single resource of a given type (defaults to dataset)
@@ -16,8 +16,6 @@ from an input YAML file, or multiple YAML documents streamed in via
 STDIN, in order of decreasing precedence.
 EOF
 
-      # Models this command applies to (default first)
-      MODELS = %w[dataset source license]
       include Chimps::Utils::UsesModel
       include Chimps::Utils::UsesYamlData
       def ignore_first_arg_on_command_line

data/lib/chimps/commands/upload.rb

@@ -4,7 +4,7 @@ module Chimps
     # A command for uploading data to Infochimps.
     class Upload < Chimps::Command
 
-      BANNER = "usage: chimps upload [OPTIONS] ID_OR_HANDLE PATH [PATH] ..."
+      USAGE  = "usage: chimps upload [OPTIONS] ID_OR_HANDLE PATH [PATH] ..."
       HELP   = <<EOF
 
 Upload data from your local machine for an existing dataset identified
@@ -24,44 +24,25 @@ Supplied paths are allowed to be remote files so someting like
 will work.
 EOF
 
-      # The path to the archive
-      attr_reader :archive
-
-      # The data format to annotate the upload with.
-      #
-      # Chimps will try to guess if this isn't given.
-      attr_reader :fmt
-
       # The ID or handle of the dataset to upload data for.
       #
       # @return [String]
       def dataset
-        raise CLIError.new("Must provide an ID or URL-escaped handle as the first argument") if argv.first.blank?
-        argv.first
+        raise CLIError.new("Must provide an ID or URL-escaped handle as the first argument") if config.argv.first.blank?
+        config.argv.first
       end
 
       # A list of paths to upload.
       #
       # @return [Array<String>]
       def paths
-        raise CLIError.new("Must provide some paths to upload") if argv.length < 2
-        argv[1..-1]
+        raise CLIError.new("Must provide some paths to upload") if config.argv.length < 2
+        config.argv[1..-1]
       end
       
-      def define_upload_options
-        on_tail("-a", "--archive-path", "Path to the archive to be created.  Defaults to a timestamped ZIP file named after the dataset in the current directory.") do |path|
-          @archive = path
-        end
-
-        on_tail("-f", "--format FORMAT", "Data format to annotate upload with.  Tries to guess if not given.") do |f|
-          @fmt = f
-        end
-          
-      end
-
       # Upload the data.
       def execute!
-        Chimps::Workflows::Up.new(:dataset => dataset, :archive => archive, :paths => paths, :fmt => fmt).execute!.print
+        Chimps::Workflows::Up.new(:dataset => dataset, :archive => config[:archive], :paths => paths, :fmt => config[:format]).execute!.print
       end
     end
   end

data/lib/chimps/commands.rb

@@ -1,46 +1,125 @@
+require 'configliere'
+
 module Chimps
 
+  Config.use :commands
+
   # A namespace to hold the various commands Chimps defines.
   module Commands
 
-    # Construct a new command from the given +command_name+ and +argv.
-    # The resulting command will be initialized but will not have been
-    # executed.
-    #
-    # @param [String] command_name
-    # @param [Array<String>] argv
-    # @return [Chimps::Command]
-    def self.construct command_name, argv
-      self.constants.each do |constant_name|
-        return "Chimps::Commands::#{constant_name}".constantize.new(argv) if constant_name.downcase == command_name
+    def self.class_for name
+      "Chimps::Commands::#{name.to_s.capitalize}".constantize
+    end
+
+    def self.included obj
+      obj.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      # Create a new command from the given +command_name+.  The
+      # resulting command will be initialized but will not have been
+      # executed.
+      #
+      # @return [Chimps::Command]
+      def command
+        raise Chimps::CLIError.new("Must specify a command.  Try `chimps help'.") unless Chimps::Config.command
+        Chimps::Config.command_settings.resolve!
+        Chimps::Commands.class_for(Chimps::Config.command_name).new(Chimps::Config.command_settings)
       end
-      raise CLIError.new("Invalid command: #{command_name}.  Try running `chimps help'")
     end
 
-    # Construct a new command from the given +command_name+ and
-    # +argv+.
+    protected
+    
+    def self.define_skip_column_names command
+      command.define :skip_column_names, :description => "Don't print column names in output", :flag => :s, :type => :boolean
+    end
+
+    def self.define_model command, models=%w[dataset collection source license]
+      models_string = models[0..-2].map { |m| "'#{m}'" }.join(', ') + ", or '#{models.last}'"
+      command.define :model, :description => "Model to search (one of #{models_string})", :flag => :m, :default => models.first, :type => String
+    end
+
+    def self.define_data_file command
+      command.define :data_file, :description => "Path to a file containing YAML data.", :flag => :d
+    end
+
+    #
+    # Core REST actions
     #
-    # Delegates to Chimps::Commands.construct, so see its
-    # documentation for more information.
-    def construct command_name, argv
-      Chimps::Commands.construct command_name, argv
+
+    Chimps::Config.define_command :list, :description => "List resources" do |command|
+      define_skip_column_names(command)
+      define_model(command)
+      command.define :all, :description => "List all resources, not just those owned by you", :flag => :a
+    end
+    
+    Chimps::Config.define_command :show, :description => "Show a resource in detail" do |command|
+      define_model(command, %w[dataset collection source license category tag])
     end
 
+    Chimps::Config.define_command :create, :description => "Create a new resource" do |command|
+      define_model(command, %w[dataset source license])
+      define_data_file(command)
+    end
+
+    Chimps::Config.define_command :update, :description => "Update an existing resource" do |command|
+      define_model(command, %w[dataset source license])
+      define_data_file(command)
+    end
+
+    Chimps::Config.define_command :destroy, :description => "Destroy an existing resource" do |command|
+      define_model(command, %w[dataset package source license])
+    end
+
+    #
+    # Workflows
+    #
+
+    Chimps::Config.define_command :download, :description => "Download a dataset" do |command|
+      command.define :output, :description => "Path to output file (defaults to sensible path in current directory)", :flag => :o, :type => String
+      command.define :format, :description => "Preferred data-format (csv, tsv, xls, &c.)", :flag => :f, :type => String
+      command.define :pkg_fmt, :description => "Preferred package-format (zip, tar.bz2, &c.)", :flag => :p, :type => String
+    end
+
+    Chimps::Config.define_command :upload, :description => "Upload a dataset" do |command|
+      command.define :archive, :description => "Path to the local archive that will be created (defaults to a sensibly named ZIP file in the current directory)", :type => String, :flag => :a
+      command.define :format, :description => "Data format (tsv, csv, xls, &c.) of the uploaded data (will guess if not given)", :type => String, :flag => :f
+    end
+
+    Chimps::Config.define_command :batch, :description => "Perform a batch processing request" do |command|
+      command.define :output, :description => "Path to store the server's response", :type => String, :flag => :o
+      command.define :force, :description => "Force upload of data even if there were errors in the batch request.", :flag => :F
+      command.define :format, :description => "Data format to annotate each upload with (will guess if not given)", :type => String, :flag => :f
+      define_data_file(command)
+    end
+
+    #
+    # Miscellaneous
+    #
+
+    Chimps::Config.define_help_command!
+
+    Chimps::Config.define_command :search, :description => 'Search resources' do |command|
+      define_skip_column_names(command)
+      define_model(command)
+    end
+
+    Chimps::Config.define_command :query, :description => "Get a response from the Query API" do |command|
+      command.define :pretty_print, :description => "Pretty-print output", :flag => :p
+      define_data_file(command)
+    end
+    
+    Chimps::Config.define_command :test, :description => "Test your authentication credentials with Infochimps"
+
+
     # A list of all the commmand names defined by Chimps.  Each name
     # maps to a corresponding subclass of Chimps::Command living in
     # the Chimps::Commands module.
-    NAMES = %w[search help test create show update destroy upload list download batch query]
+    #Configliere::COMMANDS += %w[search help test create show update destroy upload list download batch query]
     
-    NAMES.each do |name|
-      autoload name.capitalize.to_sym, "chimps/commands/#{name}"
+    Chimps::Config.commands.keys.each do |command|
+      autoload command.to_s.capitalize.to_sym, "chimps/commands/#{command}"
     end
 
-    # Is +name+ a Chimps command name?
-    #
-    # @param [String] name
-    # @return [true, false]
-    def command_name? name
-      NAMES.include?(name)
-    end
   end
 end

data/lib/chimps/config.rb

@@ -1,91 +1,54 @@
-module Chimps
-
-  # Load all configuration, load plugins, and resolve options.
-  def self.boot!
-    Chimps::Config.load
-    Chimps::Config.load_plugins
-    Chimps::Config.resolve_options!
-  end
+require 'configliere'
 
-  # Options that can be overriden by the command-line.
-  COMMAND_LINE_OPTIONS = {
-    :identity_file    => ENV["CHIMPS_RC"] || (ENV["HOME"] && File.expand_path("~/.chimps"))
-    # log_file -- will be specified on command line
-    # verbose  -- will be specified on command line
-  }
+module Chimps
 
-  # Default configuration for Chimps.  User-specific configuration
-  # lives in a YAML file <tt>~/.chimps</tt>.
-  CONFIG = {
-    :query => {
-      :host => ENV["CHIMPS_QUERY_HOST"] || 'http://api.infochimps.com'
-    },
-    :site => {
-      :host => ENV["CHIMPS_HOST"]       || 'http://infochimps.org'
-    },
-    :timestamp_format => "%Y-%m-%d_%H-%M-%S",
-    :plugins => ["/usr/local/share/chimps"]
-  }
+  # Chimps configuration.  Managed by
+  # Configliere[http://github.com/infochimps/configliere]
+  Config = Configliere.new
+
+  Config.define :site_config,      :description => "Path to site-wide configuration file", :env_var => "CHIMPS_ETC", :default => "/etc/chimps/chimpsrc.yaml", :type => String, :no_help => true
+  Config.define :config,           :description => "Path to user configuration file", :env_var => "CHIMPS_RC", :default => (ENV["HOME"] && File.expand_path("~/.chimps")), :flag => :c, :type => String
+  Config.define :log,              :description => "Path to log file", :flag => :l, :type => String
+  Config.define :timestamp_format, :description => "Format for timestamps", :type => String, :no_help => true, :default => "%Y%m%d-%H%M%S"
+  Config.define :plugin_dirs,      :description => "List of directories from which to load plugins", :type => Array, :no_help => true, :default => ['/usr/share/chimps', '/usr/local/share/chimps']
+  Config.define :skip_plugins,     :description => "Don't load any plugins", :flag => :q, :type => :boolean
+  Config.define :verbose,          :description => "Be verbose", :flag => :v, :type => :boolean
+   
+  Config.define 'query.host',      :description => "Host to send Query API requests to", :type => String, :default => "http://api.infochimps.com", :no_help => true, :env_var => "CHIMPS_QUERY_HOST"
+  Config.define 'query.key',       :description => "API key for the Query API", :type => String, :no_help => true
+  
+  Config.define 'site.username',   :description => "Your Infochimps username", :type => String
+  Config.define 'site.host',       :description => "Host to send Dataset API requests to", :type => String, :default => "http://infochimps.org", :env_var => "CHIMPS_DATASET_HOST"
+  Config.define 'site.key',        :description => "API key for the Dataset API", :type => String
+  Config.define 'site.secret',     :description => "API secret for the Dataset API", :type => String
 
   # Is Chimps in verbose mode?
   #
   # @return [true, false, nil]
   def self.verbose?
-    CONFIG[:verbose]
+    Config[:verbose]
   end
 
   # The username Chimps will pass to Infochimps.
   #
   # @return [String]
   def self.username
-    CONFIG[:site][:username] or raise AuthenticationError.new("No site username set in #{Chimps::CONFIG[:identity_file]}")
+    Config[:site][:username] or raise AuthenticationError.new("No Dataset API username set in #{Chimps::Config[:config]} or #{Chimps::Config[:site_config]}")
   end
 
-  # Defines methods to load the Chimps configuration.
-  module Config
-    
-    # Ensure that certain options (verbosity, log file) that can be
-    # passed on the command-line override those stored in a
-    # configuration file (if present).
-    def self.resolve_options!
-      Chimps::CONFIG.merge!(Chimps::COMMAND_LINE_OPTIONS) # overwrites from command line if necessary
-    end
-    
-    # The root of the Chimps source base.
-    #
-    # @return [String]
-    def self.chimps_root
-      File.expand_path File.join(File.dirname(__FILE__), '../..')
-    end
-
-    # Require all ruby files in the directory
-    # Chimps::CONFIG[:plugins].
-    def self.load_plugins
-      return if Chimps::CONFIG[:skip_plugins]
-      plugin_dirs = Chimps::CONFIG[:plugins]
-      return if plugin_dirs.blank?
-      plugin_dirs.each do |dir|
-        Dir[File.expand_path(dir) + "/*.rb"].each { |plugin| require plugin }
-      end
-    end
+  def self.version
+    version_path = File.join(File.dirname(__FILE__), '../../VERSION')
+    @version ||= File.exist?(version_path) && File.new(version_path).read
+  end
 
-    # Load the configuration settings from the configuration/identity
-    # file.
-    def self.load
-      # FIXME this is a terrible hack...and it only goes to 2 deep!
-      if File.exist?(COMMAND_LINE_OPTIONS[:identity_file])
-        require 'yaml'
-        YAML.load_file(COMMAND_LINE_OPTIONS[:identity_file]).each_pair do |key, value|
-          case
-          when value.is_a?(Hash) && CONFIG.include?(key)
-            CONFIG[key].merge!(value)
-          when value.is_a?(Array) && CONFIG.include?(key)
-            CONFIG[key] += value
-          else
-            CONFIG[key] = value
-          end
-        end
-      end
+  # Require all Ruby files in the directory
+  # Chimps::Config[:plugin_dirs].
+  def self.load_plugins
+    return if Chimps::Config[:skip_plugins]
+    plugin_dirs = Chimps::Config[:plugin_dirs]
+    plugin_dirs.each do |dir|
+      Dir[File.expand_path(dir) + "/*.rb"].each { |plugin| require plugin }
     end
   end
+
 end

data/lib/chimps/request.rb

@@ -10,7 +10,7 @@ module Chimps
   class Request < RestClient::Resource
 
     # Default headers to pass with every request.
-    DEFAULT_HEADERS = { :content_type => 'application/json', :accept => 'application/json' }
+    DEFAULT_HEADERS = { :content_type => 'application/json', :accept => 'application/json', :user_agent => "Chimps #{Chimps.version}" }
 
     # Path of the URL to submit to.  Must be a String.
     attr_accessor :path
@@ -66,7 +66,7 @@ module Chimps
     #
     # @return [true, false]
     def authenticable?
-      !Chimps::CONFIG[:site][:key].blank? && !Chimps::CONFIG[:site][:secret].blank?
+      !Chimps::Config[:site][:key].blank? && !Chimps::Config[:site][:secret].blank?
     end
     alias_method :signable?, :authenticable?
 
@@ -74,7 +74,7 @@ module Chimps
     #
     # @return [String]
     def host
-      @host ||= Chimps::CONFIG[:site][:host]
+      @host ||= Chimps::Config[:site][:host]
     end
 
     # Return the URL for this request with the (signed, if necessary)
@@ -170,9 +170,9 @@ module Chimps
     # false.
     def authenticate_if_necessary!
       return unless authenticate?
-      raise Chimps::AuthenticationError.new("API key or secret missing from #{CONFIG[:identity_file]}") unless (authenticable? || @forgive_authentication_error)
+      raise Chimps::AuthenticationError.new("API key or secret missing from #{Config[:config]} or #{Config[:site_config]}") unless (authenticable? || @forgive_authentication_error)
       query_params[:requested_at] = Time.now.to_i.to_s
-      query_params[:apikey]      = Chimps::CONFIG[:site][:key]
+      query_params[:apikey]      = Chimps::Config[:site][:key]
     end
 
     # Return an unsigned query string for this request.
@@ -200,7 +200,7 @@ module Chimps
     # @return [String]
     def data_text
       require 'json'
-      @data_text ||= data.to_json
+      @data_text ||= JSON.generate(data, {:max_nesting => false})
     end
 
     # Sign +string+ by concatenting it with the secret and computing
@@ -209,9 +209,9 @@ module Chimps
     # @param [String]
     # @return [String]
     def sign string
-      raise Chimps::AuthenticationError.new("No API secret stored in #{CONFIG[:identity_file]}.") unless (authenticable? || @forgive_authentication_error)
+      raise Chimps::AuthenticationError.new("No API secret stored in #{Config[:config]} or #{Config[:site_config]}.") unless (authenticable? || @forgive_authentication_error)
       require 'digest/md5'
-      Digest::MD5.hexdigest(string + CONFIG[:site][:secret])
+      Digest::MD5.hexdigest(string + Config[:site][:secret])
     end
 
     # Append the signature to the unsigned query string.
@@ -250,14 +250,14 @@ module Chimps
     #
     # @return [true, false]
     def authenticable?
-      !Chimps::CONFIG[:query][:key].blank?
+      !Chimps::Config[:query][:key].blank?
     end
 
     # The host to send requests to.
     #
     # @return [String]
     def host
-      @host ||= Chimps::CONFIG[:query][:host]
+      @host ||= Chimps::Config[:query][:host]
     end
 
     # All Query API requests must be signed.
@@ -275,9 +275,9 @@ module Chimps
     # false.
     def authenticate_if_necessary!
       return unless authenticate?
-      raise Chimps::AuthenticationError.new("API key or secret missing from #{CONFIG[:identity_file]}") unless (authenticable? || @forgive_authentication_error)
+      raise Chimps::AuthenticationError.new("API key or secret missing from #{Config[:config]} or #{Config[:site_config]}") unless (authenticable? || @forgive_authentication_error)
       query_params[:requested_at] = Time.now.to_i.to_s
-      query_params[:apikey]       = Chimps::CONFIG[:query][:key]
+      query_params[:apikey]       = Chimps::Config[:query][:key]
     end
 
     # Sign +string+ by concatenting it with the secret and computing
@@ -286,9 +286,9 @@ module Chimps
     # @param [String]
     # @return [String]
     def sign string
-      raise Chimps::AuthenticationError.new("No API secret stored in #{CONFIG[:identity_file]}.") unless (authenticable? || @forgive_authentication_error)
+      raise Chimps::AuthenticationError.new("No API secret stored in #{Config[:config]} or #{Config[:site_config]}.") unless (authenticable? || @forgive_authentication_error)
       require 'digest/md5'
-      Digest::MD5.hexdigest(string + CONFIG[:key][:secret])
+      Digest::MD5.hexdigest(string + Config[:query][:secret])
     end
 
     # Append the signature to the unsigned query string.

data/lib/chimps/typewriter.rb

@@ -98,6 +98,10 @@ module Chimps
             accumulate_resource(resource_name, resource_data)
           when %w[errors batch search api_account message].include?(resource_name.to_s)
             send("accumulate_#{resource_name}", resource_data)
+          when %w[message].include?(resource_name.to_s)
+            self << [resource_data]
+          when %w[error].include?(resource_name.to_s)
+            nil
           when :array  == resource_name         # constructed by Chimps::Response
             accumulate_listing(resource_data)
           when :string == resource_name         # constructed by Chimps::Response 

data/lib/chimps/utils/log.rb

@@ -1,6 +1,6 @@
 module Chimps
 
-  # The Chimps logger.  Set via Chimps::CONFIG[:log_file] and defaults
+  # The Chimps logger.  Set via Chimps::Config[:log] and defaults
   # to $stdout.
   #
   # @return [Logger]
@@ -31,15 +31,13 @@ module Chimps
       end
     end
 
-    protected
-    # Return either the path to the log file in
-    # Chimps::CONFIG[:log_file] or $stdout if the path is blank or
-    # equal to `-'.
+    # Return either the path to the log file in Chimps::Config[:log]
+    # or $stdout if the path is blank or equal to `-'.
     #
     # @return [String, $stdout] the path to the log or $stdout
     def self.log_file
-      if Chimps::CONFIG[:log_file]
-        Chimps::CONFIG[:log_file].strip == '-' ? $stdout : Chimps::CONFIG[:log_file]
+      if Chimps::Config[:log]
+        Chimps::Config[:log].strip == '-' ? $stdout : Chimps::Config[:log]
       else
         $stdout
       end

data/lib/chimps/utils/uses_model.rb

@@ -3,7 +3,7 @@ module Chimps
     module UsesModel
 
       def model
-        @model ||= self.class::MODELS.first
+        config[:model]
       end
 
       def plural_model
@@ -15,8 +15,8 @@ module Chimps
       end
 
       def model_identifier
-        raise CLIError.new("Must provide an ID or URL-escaped handle as the first argument") if argv.first.blank?
-        argv.first
+        raise CLIError.new("Must provide an ID or URL-escaped handle as the first argument") if config.argv.first.blank?
+        config.argv.first
       end
 
       def models_path
@@ -27,23 +27,6 @@ module Chimps
         "#{plural_model}/#{model_identifier}.json"
       end
       
-      def model= model
-        raise CLIError.new("Invalid model: #{model}.  Must be one of #{models_string}") unless self.class::MODELS.include?(model)
-        @model = model
-      end
-
-      def models_string
-        returning(self.class::MODELS.dup) do |parts|
-          parts[0]   = "#{parts.first} (default)"
-          parts[-1]  = "or #{parts.last}"
-        end.join(', ')
-      end
-
-      def define_model_option
-        on_tail("-m", "--model MODEL", "Use a different resource, one of: #{models_string}") do |m|
-          self.model= m
-        end
-      end
     end
   end
 end