chimps 0.1.9 → 0.2.0

data/LICENSE

@@ -1,107 +1,20 @@
----
-layout: default
-title:  Apache License
----
-
-
-h1(gemheader). {{ site.gemname }} %(small):: license%
-
-
-The wukong code is __Copyright (c) 2009 Philip (flip) Kromer__
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an **AS IS** BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-h1. Apache License
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-<notextile><div class="toggle"></notextile>
-
-h2. 1. Definitions.
-
-* **License** shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-* **Licensor** shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-* **Legal Entity** shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, **control** means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-* **You** (or **Your**) shall mean an individual or Legal Entity exercising permissions granted by this License.
-* **Source** form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-* **Object** form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-* **Work** shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-* **Derivative Works** shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-* **Contribution** shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, **submitted** means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-* **Contributor** shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-# You must give any other recipients of the Work or Derivative Works a copy of this License; and
-# You must cause any modified files to carry prominent notices stating that You changed the files; and
-# You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-# If the Work includes a __NOTICE__ text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an **AS IS** BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-<notextile></div><div class="toggle"></notextile>
-
-h2. 9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-<notextile></div><div class="toggle"></notextile>
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an **AS IS** BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-<notextile></div></notextile>
+Copyright (c) 2010 Dhruv Bansal
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/bin/chimps

@@ -2,4 +2,4 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 require "chimps"
 require 'chimps/cli'
-exit    Chimps::CLI.execute!(ARGV.dup)
+exit    Chimps::CLI.execute!

data/lib/chimps/cli.rb

@@ -4,102 +4,25 @@ module Chimps
   # instantiated from the ARGV passed in on the command line.
   module CLI
 
-    # Execute the Chimps command specified by +argv+.
+    include Chimps::Commands
+
+    # Execute the Chimps command specified on the command line.
     #
     # Will exit the Ruby process with 0 on success or 1 on an error.
-    #
-    # @param [Array<String>] argv
-    def self.execute! argv
+    def self.execute!
       begin
-        Runner.new(argv).execute!
+        Chimps.boot!
+        command.execute!
         return 0
-      rescue Chimps::Error => e
+      rescue Chimps::Error, Configliere::Error => e
         puts e.message
         return 1
       rescue => e
         $stderr.puts("#{e.message} (#{e.class})")
         $stderr.puts(e.backtrace.join("\n"))
-        return 1
-      end
-    end
-
-    # Defines methods to parse the original ARGV and from it choose
-    # and instantiate the appropriate Chimps::Command subclass with
-    # the appropriate arguments.
-    class Runner
-      include Chimps::Commands
-
-      # The original ARGV passed in by the user.
-      attr_reader :argv
-
-      # Create a new Chimps::CLI::Runner from +argv+.
-      #
-      # @param [Array<String>] argv
-      # @return [Chimps::CLI::Runner]
-      def initialize argv
-        @argv = argv
-      end
-
-      # Execute this Runner's chosen and initialized command.
-      def execute!
-        command.execute!
-      end
-
-      # The chosen and initialized command for this Runner.
-      #
-      # @return [Chimps::Command]
-      def command
-        @command ||= construct(command_name, argv_for_command)
-      end
-
-      protected
-
-      # Return the index in ARGV of the command name to run.
-      #
-      # It may not always be the first element of ARGV because
-      #
-      #   chimps show my-dataset
-      #   chimps -v show my-dataset
-      #   chimps show -v my-dataset
-      #
-      # should all have the same behavior.
-      #
-      # @return [Integer] the index in ARGV of the command name.
-      def command_index
-        return @command_index if @command_index
-        argv.each_with_index do |arg, index|
-          if command_name?(arg)
-            @command_index = index
-            break
-          end
-        end
-        @command_index or raise CLIError.new("Must specify a command.  Try running `chimps help'")
-      end
-
-      # The name of the command to run.
-      #
-      # @return [String]
-      def command_name
-        @command_name ||= argv[command_index]
-      end
-
-      # The ARGV to pass to the command chosen to run.
-      #
-      # It differs from the original ARGV only in that the command's
-      # name has been stripped:
-      #
-      #   Chimps::CLI::Runner.new('show', '-v', 'my-dataset').argv_for_command
-      #   => ['-v','my-dataset']
-      #
-      # This does not always return "all but the first element" of
-      # ARGV; see Chimps::CLI::Runner#command_index for details.
-      def argv_for_command
-        returning(argv.dup) do |new_argv|
-          new_argv.delete_at(command_index)
-        end
+        return 2
       end
     end
-
   end
 end
 

data/lib/chimps/commands/base.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module Chimps
 
   # A base class from which to subclass specific commands.  A subclass
@@ -14,32 +12,30 @@ module Chimps
   #
   # - define a method <tt>execute!</tt> which will actually run the
   #   command.
-  class Command < OptionParser
+  class Command
 
     # Appears when printing help for this command, as the very first
     # line.  Should be one-line summary of how to use this command.
-    BANNER = "Define #{self}::BANNER when you subclass Chimps::Command"
+    USAGE = "Define #{self}::USAGE when you subclass Chimps::Command"
 
     # Appears when printing help for this command.  Should consist of
     # general help or examples of the command iteslf.  Help on
     # specific options is automatically generated.
     HELP   = "Define #{self}::HELP when you subclass Chimps::Command"
 
-    # The (processed) ARGV for this command.
-    attr_reader :argv
+    # The configuration settings for this command.
+    #
+    # @return [Configliere::Param]
+    attr_accessor :config
 
     # Create a new command.  Will define options specific to
     # subclases, parse the given +argv+, and load the global Chimps
     # configuration.  Will _not_ execute the command.
     #
-    # @param [Array<String>] argv
+    # @param  [Configliere::Param]
     # @return [Chimps::Command]
-    def initialize argv
-      super self.class::BANNER
-      @argv = argv
-      run_options_definers
-      parse_command_line!
-      Chimps.boot!
+    def initialize config
+      self.config = config
     end
 
     # The name of this command, including the
@@ -58,54 +54,6 @@ module Chimps
       self.class.name.split('::').last
     end
     
-    protected
-    
-    # Parse the command line.
-    def parse_command_line!
-      begin
-        parse!(argv)
-      rescue OptionParser::InvalidOption => e
-        raise CLIError.new("#{e.message}.  Try `chimps help #{name}'")
-      end
-    end
-
-    # Run all methods beginning with +define+ and ending with +option+
-    # or +options+.
-    #
-    # This is (hackish) mechanism for subclasses of Chimps::Command to
-    # define their own specific options.
-    def run_options_definers
-      # FIXME there's a better way to do this...      
-      methods.grep(/^define.+options?$/).each { |method| send method }
-    end
-
-    # Define options common to all Chimps' commands.  The two only two
-    # such options at the moment are <tt>-v</tt> (or
-    # <tt>--[no-]verbose</tt>) for verbosity, and <tt>-i</tt> (or
-    # <tt>--identity-file</tt>) for setting the identify file to use.
-    # <tt>--log-file</tt>) for setting the log file to use.
-    def define_common_options
-      separator self.class::HELP
-      separator "\nOptions include:"
-      
-      on("-v", "--[no-]verbose", "Be verbose, or not.") do |verbose|
-        Chimps::COMMAND_LINE_OPTIONS[:verbose] = verbose
-      end
-      
-      on("-i", "--identity-file PATH", "Use the given YAML identify file to authenticate with Infochimps instead of the default (~/.chimps) ") do |path|
-        Chimps::COMMAND_LINE_OPTIONS[:identity_file] = File.expand_path(path)
-      end
-
-      on("-l", "--log-file PATH", "Use the given path to log Chimps output (`-' is interpreted as $stdout).") do |path|
-        Chimps::COMMAND_LINE_OPTIONS[:log_file] = path # don't expand_path as it might be a `-'
-      end
-
-      on("-q", "--skip-plugins", "Don't load plugins from Chimps::CONFIG[:plugins] directory.") do |bool|
-        Chimps::CONFIG[:skip_plugins] = true
-      end
-
-    end
-
     # Run this command.
     #
     # Will raise a NotImplementedError for Chimps::Command itself --

data/lib/chimps/commands/batch.rb

@@ -4,7 +4,7 @@ module Chimps
     # A command for performing batch updates.
     class Batch < Chimps::Command
 
-      BANNER = "usage: chimps batch [OPTIONS] [INPUT_PATH] ..."
+      USAGE = "usage: chimps batch [OPTIONS] [INPUT_PATH] ..."
       HELP   = <<EOF
 
 Perform a batch operation on Infochimps by reading YAML input files.
@@ -26,40 +26,12 @@ The format of the YAML input files is given at
   http://infochimps.org/api
 EOF
 
-      # A path to store the intermediate batch response.  Useful for
-      # debugging.
-      attr_accessor :output_path
-
-      # The data format to annotate the upload with.
-      #
-      # Chimps will try to guess if this isn't given.
-      attr_reader :fmt
-
-      # Whether to continue to upload even if some of the resources
-      # had errors on update/create.
-      attr_accessor :upload_even_if_errors
-
       include Chimps::Utils::UsesYamlData
 
-      def define_options
-        on_tail("-o", "--output PATH", "Store the response from the server at PATH") do |o|
-          @output_path = File.expand_path(o)
-        end
-
-        on_tail("-e", "--force", "Attempt to upload data even when there were errors in the batch update request") do |e|
-          @upload_even_if_errors = e
-        end
-
-        on_tail("-f", "--format FORMAT", "Data format to annotate EACH upload with.  Tries to guess if not given.") do |f|
-          @fmt = f
-        end
-        
-      end
-
       # Perform the batch update and upload.
       def execute!
         ensure_data_is_present!
-        Chimps::Workflows::BatchUpdater.new(data, :output_path => output_path, :upload_even_if_errors => upload_even_if_errors, :fmt => fmt).execute!
+        Chimps::Workflows::BatchUpdater.new(data, :output_path => config[:output], :upload_even_if_errors => config[:force], :fmt => config[:format]).execute!
       end
       
     end

data/lib/chimps/commands/create.rb

@@ -5,7 +5,7 @@ module Chimps
     # Infochimps.
     class Create < Chimps::Command
 
-      BANNER = "usage: chimps create [OPTIONS] [PROP=VALUE] ..."
+      USAGE = "usage: chimps create [OPTIONS] [PROP=VALUE] ..."
       HELP   = <<EOF
 
 Create a single resource (defaults to a dataset) using the properties
@@ -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
 

data/lib/chimps/commands/destroy.rb

@@ -5,7 +5,7 @@ module Chimps
     # Infochimps.
     class Destroy < Chimps::Command
 
-      BANNER = "usage: chimps destroy [OPTIONS] ID_OR_HANDLE"
+      USAGE = "usage: chimps destroy [OPTIONS] ID_OR_HANDLE"
       HELP   = <<EOF
 
 Destroys a resource of a given type (defaults to dataset) identified
@@ -13,8 +13,6 @@ by ID_OR_HANDLE.
 
 EOF
 
-      # Models this command applies to (default first)
-      MODELS = %w[dataset package source license]
       include Chimps::Utils::UsesModel
 
       # Issue the DELETE request.

data/lib/chimps/commands/download.rb

@@ -4,7 +4,7 @@ module Chimps
     # A command to download data from Infochimps.
     class Download < Chimps::Command
 
-      BANNER = "usage: chimps download [OPTIONS] ID_OR_HANDLE"
+      USAGE = "usage: chimps download [OPTIONS] ID_OR_HANDLE"
       HELP   = <<EOF
 
 Download a dataset identified by the given ID_OR_HANDLE to the current
@@ -14,60 +14,30 @@ If the dataset isn't freely downloadable, you'll have to have
 purchased it first via the Web.
 EOF
 
-      # The chosen data format.
-      attr_reader :fmt
-
-      # The chosen package format.
-      attr_reader :pkg_fmt
-
-      # The local path to download the data to.
-      attr_reader :local_path
-      
-      # Set the format for the download token.
-      #
-      # Will try to normalize the input somewhat (downcasing,
-      # stripping leading periods)
-      #
-      # @param [String] new_fmt
-      def fmt= new_fmt
-        @fmt = new_fmt.downcase.strip.gsub(/^\./, '')
-      end
-
-      # Set the package format for the download token.
-      # 
-      # Will try to normalize the input somewhat (downcasing,
-      # stripping leading periods)
+      # Return the given string downcased and stripped of leading
+      # periods.
       #
-      # @param [String] new_pkg_fmt
-      def pkg_fmt= new_pkg_fmt
-        @pkg_fmt = new_pkg_fmt.downcase.strip.gsub(/^\./, '')
+      # @param [String] string
+      # @return [String, nil]
+      def normalize string
+        return string if string.blank?
+        string.downcase.strip.gsub(/^\./, '')
       end
       
       # The ID of the package to download.
       def dataset
-        raise CLIError.new("Must provide an ID or handle of a dataset to download.") if argv.first.blank?
-        argv.first
+        raise CLIError.new("Must provide an ID or handle of a dataset to download.") if config.argv.first.blank?
+        config.argv.first
+      end
+
+      def local_path
+        config[:output].blank? ? config[:output] : File.expand_path(config[:output])
       end
 
       # Issue the request for the token and the request for the
       # download.
       def execute!
-        Chimps::Workflows::Downloader.new(:dataset => dataset, :fmt => fmt, :pkg_fmt => pkg_fmt, :local_path => local_path).execute!
-      end
-
-      def define_options
-        on_tail("-o", "--output PATH", "Path to download file to") do |o|
-          @local_path = File.expand_path(o)
-        end
-
-        on_tail("-f", "--format FORMAT", "Choose a particular data format (csv, tsv, excel, &c.)") do |f|
-          self.fmt = f
-        end
-
-        on_tail("-p", "--package PACKAGE", "Choose a particular package type (zip or tar.bz2)") do |p|
-          self.pkg_fmt = p
-        end
-        
+        Chimps::Workflows::Downloader.new(:dataset => dataset, :fmt => normalize(config[:format]), :pkg_fmt => normalize(config[:pkg_fmt]), :local_path => local_path).execute!
       end
       
     end

data/lib/chimps/commands/help.rb

@@ -2,7 +2,8 @@ module Chimps
   module Commands
     class Help < Chimps::Command
 
-      BANNER = "usage: chimps help [COMMAND]"
+      USAGE = "usage: chimps help [OPTIONS] [COMMAND]"
+
       HELP = <<EOF
 
 This is the Infochimps command-line client.  You can use it to search,
@@ -58,7 +59,7 @@ for any of the commands above.
 = Setup
 
 Once you have obtained an API key and secret from Infochimps, place
-them in a file Chimps::CONFIG[:identity_file] in your home directory
+them in a file Chimps::Config[:config] in your home directory
 with the following format
 
   ---
@@ -74,12 +75,22 @@ with the following format
     :key: zei7eeloShoah3Ce
     :secret: eixairaichaxaaRe8eeya5moh8Uthahf0pi4eig7SoirohPhei6sai8aereu0yuepiefeipoozoegahchaeheedee8uphohoo9moongae8Fa0aih4BooSeiM
 EOF
+
+     
+      def fake_command name
+        Chimps::Commands.class_for(name).new(Chimps::Config.commands[name][:config])
+      end
       
       def execute!
-        if argv.first.blank?
-          puts self
+        if Chimps::Config.command?(config.argv.first)
+          command = fake_command(config.argv.first)
+          $stderr.puts command.class::USAGE
+          $stderr.puts command.class::HELP
+          command.config.dump_basic_help
+          Chimps::Config.dump_basic_help
         else
-          puts Chimps::Commands.construct(argv.first, [])
+          $stderr.puts Chimps::Config.usage
+          Chimps::Config.dump_help
         end
       end
 

data/lib/chimps/commands/list.rb

@@ -5,7 +5,7 @@ module Chimps
     # at Infochimps.
     class List < Chimps::Command
 
-      BANNER = "chimps list [OPTIONS]"
+      USAGE = "usage: chimps list [OPTIONS]"
       HELP   = <<EOF
 
 List resources of a given type (defaults to dataset).
@@ -14,24 +14,11 @@ Lists your resources by default but see options below.
 
 EOF
 
-      # Models that can be indexed (default first)
-      MODELS = %w[dataset license source]
       include Chimps::Utils::UsesModel
 
-      def define_options
-        on_tail("-a", "--all", "List all resources, not just those owned by you.") do |a|
-          @all = a
-        end
-
-        on_tail("-s", "--[no-]skip-column-names", "Don't print column names in output.") do |s|
-          @skip_column_names = s
-        end
-        
-      end
-
       # List all resources or just those owned by the Chimps user?
       def all?
-        @all
+        config[:all]
       end
 
       # Parameters to include in the query.
@@ -45,7 +32,7 @@ EOF
 
       # Issue the GET request.
       def execute!
-        Request.new(models_path, :params => params).get.print(:skip_column_names => @skip_column_names)
+        Request.new(models_path, :params => params).get.print(:skip_column_names => config[:skip_column_names])
       end
 
     end

data/lib/chimps/commands/query.rb

@@ -5,7 +5,7 @@ module Chimps
     # query API.
     class Query < Chimps::Command
 
-      BANNER = "usage: chimps query [OPTIONS] DATASET [PROP=VALUE] ..."
+      USAGE = "usage: chimps query [OPTIONS] DATASET [PROP=VALUE] ..."
       HELP   = <<EOF
 
 Make a query of the given DATASET on the Infochimps paid query API
@@ -34,8 +34,8 @@ EOF
       #
       # @return [String]
       def dataset
-        raise CLIError.new("Must provide a dataset to query.") if argv.first.blank?
-        argv.first
+        raise CLIError.new("Must provide a dataset to query.") if config.argv.first.blank?
+        config.argv.first
       end
 
       # The path on the Infochimps query API to query.
@@ -49,20 +49,14 @@ EOF
       #
       # @return [true, nil]
       def pretty_print?
-        @pretty_print
-      end
-
-      # Define options for queries.
-      def define_query_options
-        on_tail("-p", "--[no-]pretty-print", "Pretty print the output.") do |p|
-          @pretty_print = p
-        end
+        config[:pretty_print]
       end
 
       # The requests that will be sent to the server.
       #
       # @return [Array<Chimps::QueryRequest>]
       def requests
+        ensure_data_is_present!
         if data.is_a?(Hash)
           [QueryRequest.new(path, :query_params => data, :authenticate => true)]
         else # it's an Array, see Chimps::Utils::UsesYamlData