chimps 0.1.9 → 0.2.0

data/lib/chimps/utils/uses_yaml_data.rb

@@ -9,10 +9,8 @@ module Chimps
         false
       end
 
-      attr_reader :data_file
-
       def data
-        @data ||= merge_all *(data_from_stdin + data_from_file + data_from_command_line)
+        @data ||= merge_all(*(data_from_stdin + data_from_file + data_from_command_line)) || {}
       end
       
       protected
@@ -38,13 +36,13 @@ module Chimps
               d.merge!(obj)
             end
           end
-        else raise CLIError.new("Unsuitable YAML data type #{data_type} -- can only combine Hashes and Arrays")
+        else raise CLIError.new("Incompatible YAML data type #{data_type} -- can only combine Hashes and Arrays")
         end
       end
 
       def params_from_command_line
         returning([]) do |d|
-          argv.each_with_index do |arg, index|
+          config.argv.each_with_index do |arg, index|
             next if index == 0 && ignore_first_arg_on_command_line
             next unless arg =~ /^(\w+) *=(.*)$/
             name, value = $1.downcase.to_sym, $2.strip
@@ -55,7 +53,7 @@ module Chimps
             
       def yaml_files_from_command_line
         returning([]) do |d|
-          argv.each_with_index do |arg, index|
+          config.argv.each_with_index do |arg, index|
             next if index == 0 && ignore_first_arg_on_command_line            
             next if arg =~ /^(\w+) *=(.*)$/
             path = File.expand_path(arg)
@@ -74,7 +72,7 @@ module Chimps
       end
 
       def data_from_file
-        [data_file ? YAML.load_file(data_file) : nil]
+        [config[:data_file] ? YAML.load_file(File.expand_path(config[:data_file])) : nil]
       end
 
       def data_from_stdin
@@ -86,12 +84,6 @@ module Chimps
         end
       end
 
-      def define_data_options
-        on_tail("-d", "--data-file PATH", "Path to a file containing key=value data") do |p|
-          @data_file = File.expand_path(p)
-        end
-      end
-
       def ensure_data_is_present!
         raise CLIError.new("Must provide some data to send, either on the command line, from an input file, or by piping to STDIN.  Try `chimps help #{name}'") unless data.present?
       end

data/lib/chimps/workflows/upload/bundler.rb

@@ -197,7 +197,7 @@ module Chimps
         # @return [String]
         def default_archive_path
           # in current working directory...
-          "chimps_#{dataset}-#{Time.now.strftime(Chimps::CONFIG[:timestamp_format])}.#{default_archive_extension}"
+          "chimps_#{dataset}-#{Time.now.strftime(Chimps::Config[:timestamp_format])}.#{default_archive_extension}"
         end
 
         # end <tt>zip</tt> if the data is less than 500 MB in size and
@@ -213,13 +213,13 @@ module Chimps
         #
         # @return [String]
         def readme_url
-          File.join(Chimps::CONFIG[:site][:host], "/README-infochimps")
+          File.join(Chimps::Config[:site][:host], "/README-infochimps")
         end
 
         # The URL to the ICSS file for this dataset on Infochimps
         # servers
         def icss_url
-          File.join(Chimps::CONFIG[:site][:host], "datasets", "#{dataset}.yaml")
+          File.join(Chimps::Config[:site][:host], "datasets", "#{dataset}.yaml")
         end
 
         # Both the local paths and remote paths to package.

data/lib/chimps/workflows/upload/notifier.rb

@@ -34,7 +34,7 @@ module Chimps
         #
         # @return [Hash]
         def data
-          { :package => {:fmt => token['fmt'], :pkg_size => bundler.size, :pkg_fmt => bundler.pkg_fmt, :summary => bundler.summary, :token_timestamp => token['timestamp'] } }
+          { :package => {:fmt => token['fmt'], :pkg_size => bundler.size, :pkg_fmt => bundler.pkg_fmt, :raw_summary => bundler.summary, :token_timestamp => token['timestamp'] } }
         end
 
         # Make a request to notify Infochimps of the new data.

data/lib/chimps.rb

@@ -9,7 +9,6 @@ require 'chimps/utils'
 module Chimps
 
   autoload :Config,       'chimps/config'
-  autoload :CONFIG,       'chimps/config'
   autoload :CLI,          'chimps/cli'
   autoload :Command,      'chimps/commands/base'
   autoload :Commands,     'chimps/commands'
@@ -18,5 +17,12 @@ module Chimps
   autoload :Response,     'chimps/response'
   autoload :Typewriter,   'chimps/typewriter'
   autoload :Workflows,    'chimps/workflows'
+
+  # Load and resolve configuration.
+  def self.boot!
+    Config.read Config[:site_config] if File.exist?(Config[:site_config])
+    Config.read Config[:config]      if File.exist?(Config[:config])
+    Config.resolve!
+  end
   
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chimps
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -9,59 +15,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -05:00
+date: 2010-10-10 00:00:00 -05:00
 default_executable: chimps
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
         version: 1.4.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: imw
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 2
+        - 3
         version: 0.2.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 description: Chimps! allows you to easily make API calls against Infochimps web services.  Chimps!'s Request and Response classes take care of all the details so you can remain calm and RESTful.  Chimps! also comes with a command-line tool to make it simple to query, create, update, upload, and download data on Infochimps
 email: coders@infochimps.org
 executables: 
@@ -117,9 +151,6 @@ files:
 - lib/chimps/workflows/upload/notifier.rb
 - lib/chimps/workflows/upload/token.rb
 - lib/chimps/workflows/upload/uploader.rb
-- spec/chimps/cli_spec.rb
-- spec/chimps/commands/base_spec.rb
-- spec/chimps/commands/list_spec.rb
 - spec/chimps/response_spec.rb
 - spec/chimps/typewriter_spec.rb
 - spec/chimps/workflows/upload/bundler_spec.rb
@@ -136,21 +167,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Chimps! is a Ruby wrapper and command-line interface for the Infochimps APIs (http://infochimps.org/api, http://api.infochimps.com)
@@ -158,9 +195,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/chimps/workflows/upload/bundler_spec.rb
 - spec/chimps/workflows/upload/token_spec.rb
-- spec/chimps/commands/base_spec.rb
-- spec/chimps/commands/list_spec.rb
 - spec/chimps/typewriter_spec.rb
-- spec/chimps/cli_spec.rb
 - spec/chimps/response_spec.rb
 - spec/support/custom_matchers.rb

data/spec/chimps/cli_spec.rb

@@ -1,22 +0,0 @@
-require File.join(File.dirname(__FILE__), '../spec_helper')
-
-describe Chimps::CLI do
-end
-
-describe Chimps::CLI::Runner do
-
-  it "should raise a CLIError when no command is given" do
-    lambda { Chimps::CLI::Runner.new([]).execute! }.should raise_error(Chimps::CLIError)
-  end
-
-  it "should raise a CLIError when an unrecognized command is given" do
-    lambda { Chimps::CLI::Runner.new(['foobar', 'arg1', 'arg2']).execute! }.should raise_error(Chimps::CLIError)
-  end
-
-  it "should recognize a command when given" do
-    Chimps::Commands.should_receive(:construct).with('list', ['arg1', 'arg2'])
-    Chimps::CLI::Runner.new(['list', 'arg1', 'arg2']).command # execute requires the command to be initialized and returned...
-  end
-  
-end
-

data/spec/chimps/commands/base_spec.rb

@@ -1,25 +0,0 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
-
-describe Chimps::Command do
-
-  it "should return its full name" do
-    Chimps::Command.name.should == "chimps::command"
-  end
-
-  it "should return just its command name" do
-    Chimps::Command.new([]).name.should == "command"
-  end
-
-  it "should run any methods beginning with `define' and ending with `options?'" do
-    klass = Class.new(Chimps::Command)
-    klass.class_eval <<RUBY
-      attr_accessor :test_property
-      def define_test_options
-        self.test_property=true
-      end
-RUBY
-    klass.new([]).test_property.should == true
-  end
-  
-  
-end

data/spec/chimps/commands/list_spec.rb

@@ -1,25 +0,0 @@
-require File.join(File.dirname(__FILE__), '../../spec_helper')
-
-describe Chimps::Commands::List do
-
-  it "should return its full name" do
-    Chimps::Command.name.should == "chimps::command"
-  end
-
-  it "should return just its command name" do
-    Chimps::Command.new([]).name.should == "command"
-  end
-
-  it "should run any methods beginning with `define' and ending with `options?'" do
-    klass = Class.new(Chimps::Command)
-    klass.class_eval <<RUBY
-      attr_accessor :test_property
-      def define_test_options
-        self.test_property=true
-      end
-RUBY
-    klass.new([]).test_property.should == true
-  end
-  
-  
-end