metaforce 0.3.5 → 0.4.0

data/README.md

@@ -16,46 +16,24 @@ client = Metaforce::Metadata::Client.new :username => 'username',
     :password => 'password',
     :security_token => 'security token')
 
+# Describe the metadata on the organization
 client.describe
 # => { :metadata_objects => [{ :child_xml_names => "CustomLabel", :directory_name => "labels" ... }
 
+# List all custom objects
 client.list(:type => "CustomObject")
 # => [{ :created_by_id => "005U0000000EGpcIAG", :created_by_name => "Eric Holmes", ... }]
 
-deployment = client.deploy(File.dirname(__FILE__))
+# Deploy metadata to the organization
+deployment = client.deploy(File.expand_path('path/to/src'))
 # => #<Metaforce::Transaction:0x00000102779bf8 @id="04sU0000000WNWoIAO" @type=:deploy> 
 
-deployment.done?
-# => false
-
-deployment.result(:wait_until_done => true)
+# Get the result
+deployment.result
 # => { :id => "04sU0000000WNWoIAO", :messages => [{ :changed => true ... :success => true }
-```
-
-## DSL
-Metaforce includes a lightweight DSL to make deployments and retrieve's easier.
-
-```ruby
-require "metaforce/dsl"
-include Metaforce::DSL::Metadata
-
-login :username => 'username', :password => 'password', :security_token => 'security token' do
 
-  deploy File.dirname(__FILE__) do |result|
-      puts "Successful deployment!"
-      puts result
-  end
-
-  retrieve File.expand_path("../src/package.xml", __FILE__) |result, zip|
-      puts "Successful retrieve!"
-      puts result
-      File.open("retrieve.zip", "wb") do |file|
-        file.write(zip)
-      end
-  end
-
-  retrieve File.expand_path("../src/package.xml", __FILE__), :to => "directory"
-end
+# Retrieve the metadata components specified in package.xml and unzip to the "retrieved" directory
+client.retrieve(File.expand_path('path/to/package.xml')).to('retrieved')
 ```
 
 ## Roadmap
@@ -67,8 +45,6 @@ need to be done.
 * Implement CRUD based calls <http://www.salesforce.com/us/developer/docs/api_meta/Content/meta_crud_based_calls_intro.htm>.
 * Implement some helper methods for diffing metadata.
 * Ability to deploy directly from a git repository.
-* <del>Implement .retrieve for retrieving metadata.</del>
-* <del>Implement a DSL.</del>
 * And some other stuff that I haven't quite thought of yet...
 
 ## Contributing
@@ -77,6 +53,11 @@ feature on a new branch, then send me a pull request with a detailed
 description. Please provide applicable rspec specs.
 
 ## Version History
+**0.4.0** (March 2, 2012)
+
+* Various bug fixes and improvements.
+* Removed DSL to focus on core functionality.
+
 **0.3.5** (February 11, 2012)
 
 * Allow rake tasks to get credentials from a metaforce.yml file.

data/Rakefile

@@ -1,6 +1,18 @@
 require "bundler/gem_tasks"
 
+task :default => :spec
+
+desc "Run rspec specs"
+task :spec do
+  sh "bundle exec rspec spec"
+end
+
 desc "Start an irb session"
 task :console do
   sh "irb -I lib -r metaforce"
 end
+
+desc "Build and publish gem on rubygems.org"
+task :publish do
+  sh "gem build metaforce.gemspec && gem push metaforce-*.gem"
+end

data/lib/metaforce/config.rb

@@ -43,7 +43,17 @@ module Metaforce
     # Defaults to false.
     attr_accessor :test
     # Causes Metaforce::Transaction.result to loop until the transaction is
-    # complete. Defaults to false.
+    # complete. Defaults to true.
+    #
+    # If you want to do custom polling, set this to false.
+    #
+    # == Example
+    #
+    #   Metaforce.configuration.wait_until_done = false;
+    #
+    #   deploy = client.deploy File.expand_path("myeclipseproj")
+    #   begin; while !deploy.done?
+    #   deploy.result
     attr_accessor :wait_until_done
 
     def initialize
@@ -51,7 +61,7 @@ module Metaforce
       HTTPI.log        = false
       @api_version     = "23.0"
       @test            = false
-      @wait_until_done = false
+      @wait_until_done = true
     end
 
     def logger

data/lib/metaforce/error.rb

@@ -0,0 +1,3 @@
+module Metaforce
+  class SalesforceError < StandardError; end
+end

data/lib/metaforce/metadata/client.rb

@@ -2,13 +2,11 @@ require 'metaforce/manifest'
 require 'savon'
 require 'zip/zip'
 require 'base64'
-require 'ostruct'
+require 'tmpdir'
 
 module Metaforce
   module Metadata
     class Client
-      DEPLOY_ZIP = 'deploy.zip' # :nodoc:
-      RETRIEVE_ZIP = 'retrieve.zip' # :nodoc:
 
       # Performs a login and sets the session_id and metadata_server_url.
       #
@@ -45,9 +43,7 @@ module Metaforce
       #   client.list([{ :type => "CustomObject" }, { :type => "ApexComponent" }])
       #   #=> ["ContractContactRole", "Solution", "Invoice_Statements__c", ... ]
       def list(queries=[])
-        unless queries.is_a?(Array)
-          queries = [ queries ]
-        end
+        queries = [ queries ] unless queries.is_a?(Array)
         response = @client.request(:list_metadata) do |soap|
           soap.header = @header
           soap.body = {
@@ -127,8 +123,12 @@ module Metaforce
         self.status(id)[:done] || false
       end
 
-      # Deploys +dir+ to the organisation.
+      # Deploys +path+ to the organisation. +path+ can either be a path to
+      # a directory or a path to a zip file.
+      #
+      # +options+ can contain any of the following keys:
       #
+      # +options+: 
       # See http://www.salesforce.com/us/developer/docs/api_meta/Content/meta_deploy.htm#deploy_options
       # for a list of _deploy_options_. Options should be convereted from
       # camelCase to an :underscored_symbol.
@@ -143,12 +143,11 @@ module Metaforce
       #
       #   deploy.status[:state]
       #   #=> "Completed"
-      def deploy(dir, deploy_options={})
-        if dir.is_a?(String)
-          filename = File.join(File.dirname(dir), DEPLOY_ZIP)
-          zip_contents = create_deploy_file(filename, dir)
-        elsif dir.is_a?(File)
-          zip_contents = Base64.encode64(dir.read)
+      def deploy(path, options={})
+        if path.is_a?(String)
+          zip_contents = create_deploy_file(path)
+        elsif path.is_a?(File)
+          zip_contents = Base64.encode64(path.read)
         end
 
         Metaforce.log('Executing deploy')
@@ -157,7 +156,7 @@ module Metaforce
           soap.header = @header
           soap.body = {
             :zip_file => zip_contents,
-            :deploy_options => deploy_options
+            :deploy_options => options[:options] || {}
           }
         end
         Transaction.deployment self, response[:deploy_response][:result][:id]
@@ -167,56 +166,56 @@ module Metaforce
       #
       # See http://www.salesforce.com/us/developer/docs/api_meta/Content/meta_retrieve_request.htm
       # for a list of _retrieve_request_ options. Options should be convereted from
-      # camelCase to an :underscored_symbol.
-      def retrieve(retrieve_request={})
+      # camelCase to an :underscored_symbol. _retrieve_request_ options should
+      # be specified under the +:options+ key in options.
+      def retrieve(options={})
         Metaforce.log('Executing retrieve')
 
         response = @client.request(:retrieve) do |soap|
           soap.header = @header
           soap.body = {
-            :retrieve_request => retrieve_request
+            :retrieve_request => options[:options] || {}
           }
         end
         Transaction.retrieval self, response[:retrieve_response][:result][:id]
       end
 
-      # Retrieves files specified in the manifest file (package.xml). Specificy any extra +retrieve_request+ options in +extra+.
+      # Retrieves files specified in the manifest file (package.xml). Specificy any extra options in +options[:options]+.
       #
       # == Examples
       #
       #   retrieve = client.retrieve_unpackaged File.expand_path("spec/fixtures/sample/src/package.xml")
       #   #=> #<Metaforce::Transaction:0x1159bd0 @id='04sU0000000Wx6KIAS' @type=:retrieve>
-      def retrieve_unpackaged(manifest, extra=nil)
+      def retrieve_unpackaged(manifest, options={})
         if manifest.is_a?(Metaforce::Manifest)
           package = manifest.to_package
         elsif manifest.is_a?(String)
           package = Metaforce::Manifest.new(File.open(manifest).read).to_package
         end
-        retrieve_request = { 
+        options[:options] = {
           :api_version => Metaforce.configuration.api_version,
           :single_package => true,
           :unpackaged => {
             :types => package
           }
-        }
-        retrieve_request.merge!(extra) if extra.is_a?(Hash)
-        retrieve(retrieve_request)
+        }.merge(options[:options] || {})
+        retrieve(options)
       end
 
     private
     
       # Creates the deploy file, reads in the contents and returns the base64
       # encoded data
-      def create_deploy_file(filename, dir)
-        File.delete(filename) if File.exists?(filename)
-        Zip::ZipFile.open(filename, Zip::ZipFile::CREATE) do |zip|
-          Dir["#{dir}/**/**"].each do |file|
-            zip.add(file.sub(dir + '/', ''), file)
+      def create_deploy_file(dir)
+        Dir.mktmpdir do |path|
+          path = File.join path, 'deploy.zip'
+          Zip::ZipFile.open(path, Zip::ZipFile::CREATE) do |zip|
+            Dir["#{dir}/**/**"].each do |file|
+              zip.add(file.sub("#{File.dirname(dir)}/", ''), file)
+            end
           end
+          Base64.encode64(File.open(path, "rb").read)
         end
-        contents = Base64.encode64(File.open(filename, "rb").read)
-        File.delete(filename)
-        contents
       end
 
     end

data/lib/metaforce/metadata/transaction.rb

@@ -13,6 +13,7 @@ module Metaforce
       @client = client
       @id     = id
       @type   = type
+      wait_until_done if Metaforce.configuration.wait_until_done
     end
 
     # Creates a new transaction and sets type to +:deploy+.
@@ -41,11 +42,11 @@ module Metaforce
     # Returns the decoded content of the returned zip file.
     def zip_file
       raise 'Request was not a retrieve.' unless @type == :retrieve
-      Base64.decode64(@result[:zip_file])
+      Base64.decode64(result[:zip_file])
     end
 
     # Unzips the returned zip file to +destination+.
-    def unzip(destination)
+    def to(destination)
       zip = zip_file
       file = Tempfile.new('retrieve')
       file.write(zip)
@@ -59,13 +60,13 @@ module Metaforce
           zip.extract(f, path) { true }
         end
       end
+      self
     end
     
     # Returns the deploy or retrieve result
     def result(options={})
-      self.wait_until_done if (options[:wait_until_done] || Metaforce.configuration.wait_until_done)
-      raise 'Request has not completed.' unless @done
       @result = @client.status(@id, @type) if @result.nil?
+      raise SalesforceError, @result[:message] if @result[:state] == "Error"
       @result
     end
 

data/lib/metaforce/rake/deploy.rb

@@ -0,0 +1,35 @@
+require 'metaforce'
+require 'term/ansicolor'
+require 'rake'
+require 'rake/tasklib'
+include Term::ANSIColor
+
+module Metaforce
+  module Rake
+
+    class DeployTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      # The directory to deploy
+      attr_accessor :directory
+
+      def initialize(name = 'metaforce:deploy')
+        @name      = name
+        @directory = File.expand_path('src')
+        yield self if block_given?
+        define
+      end
+
+      def define
+        desc "Deploy metadata"
+        task @name do
+          client = Metaforce::Rake.client
+          d = client.deploy(@directory)
+          puts green "Deployed #{@directory} successfully" if d.result[:success]
+        end
+      end
+
+    end
+    
+  end
+end

data/lib/metaforce/rake/retrieve.rb

@@ -0,0 +1,39 @@
+require 'metaforce'
+require 'term/ansicolor'
+require 'rake'
+require 'rake/tasklib'
+include Term::ANSIColor
+
+module Metaforce
+  module Rake
+
+    class RetrieveTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      # Path to the manifest file
+      attr_accessor :manifest
+
+      # The directory to unzip the retrieved files to
+      attr_accessor :directory
+
+      def initialize(name = 'metaforce:retrieve')
+        @name      = name
+        @manifest  = File.expand_path('src/package.xml')
+        @directory = File.expand_path('retrieved')
+        yield self if block_given?
+        define
+      end
+
+      def define
+        desc "Retrieve metadata"
+        task @name do
+          client = Metaforce::Rake.client
+          r = client.retrieve_unpackaged(@manifest).to(@directory)
+          puts green "Files retrieved sucessfully to #{@directory}"
+        end
+      end
+
+    end
+    
+  end
+end

data/lib/metaforce/rake/tests.rb

@@ -0,0 +1,62 @@
+require 'metaforce'
+require 'term/ansicolor'
+require 'rake'
+require 'rake/tasklib'
+include Term::ANSIColor
+
+module Metaforce
+  module Rake
+
+    class TestsTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      # The directory to deploy
+      attr_accessor :directory
+
+      def initialize(name = 'metaforce:tests:ci')
+        @name      = name
+        @directory = File.expand_path('src')
+        yield self if block_given?
+        define
+      end
+
+      def define
+        desc "Deploy metadata, run all tests, then undeploy"
+        task @name do
+          ENV['env'] = ENV['env'] || 'ci'
+          client = Metaforce::Rake.client
+          Metaforce.log = false
+          result = client.deploy(@directory, :options => { :run_all_tests => true }).result
+          failures = result[:run_test_result][:failures]
+
+          if failures
+            failures = [failures] unless failures.is_a?(Array)
+            puts "Failures:"
+            failures.each_with_index do |failure, index|
+              index = index + 1
+              puts
+              puts         "\t#{index}) #{failure[:method_name]}"
+              puts red     "\t   #{failure[:message]}"
+              puts
+              puts magenta "\t   ##{failure[:stack_trace]}"
+              puts
+            end
+          end
+
+          color = failures ? :red : :green
+          puts "Finished in #{Float(result[:run_test_result][:total_time]) / 100} seconds"
+          puts send(color, "#{result[:run_test_result][:num_tests_run]} tests, #{result[:run_test_result][:num_failures]} failures")
+
+          if failures
+            puts "\nFailed tests:\n"
+            failures.each do |failure|
+              puts "#{red failure[:stack_trace]} #{magenta "# #{failure[:method_name]}"}"
+            end
+          end
+
+          abort if failures
+        end
+      end
+    end
+  end
+end

data/lib/metaforce/rake.rb

@@ -0,0 +1,42 @@
+require 'yaml'
+require 'metaforce/rake/deploy'
+require 'metaforce/rake/retrieve'
+require 'metaforce/rake/tests'
+
+module Metaforce
+  module Rake
+
+    class << self
+      CONFIG_FILE = 'metaforce.yml'
+
+      # Loads the config and creates a client
+      def client
+        load_config
+        Metaforce::Metadata::Client.new :username => @username,
+          :password => @password,
+          :security_token => @security_token
+      end
+
+      # Loads configuration settings from metaforce.yml
+      def load_config
+        if File.exists?(CONFIG_FILE)
+          config = YAML.load_file(CONFIG_FILE)
+          env = ENV['env'] || 'default'
+          config = config.has_key?(env) ? config[env] : config
+          @username       = config["username"]
+          @password       = config["password"]
+          @security_token = config["security_token"] || ''
+          @test           = config["test"] || false
+          @log            = config["log"] || true
+          Metaforce.log = @log
+          Metaforce.configuration.test = @test
+        else
+          print "username: "; @username = STDIN.gets.chomp
+          print "password: "; @password = STDIN.gets.chomp
+          print "security token: "; @security_token = STDIN.gets.chomp
+        end
+      end
+
+    end
+  end
+end

data/lib/metaforce/tasks/README.md

@@ -4,6 +4,7 @@ metadata using Rake and Metaforce. The following rake tasks are provided:
 
 * metaforce:deploy
 * metaforce:retrieve
+* metaforce:tests:ci
 
 You can include the rake tasks by adding the following to your Rakefile:
 
@@ -51,7 +52,11 @@ This would deploy using the `sandbox` environment:
 
 `rake metaforce:deploy env="sandbox"`
 
-This would retrieve code using the `production` environment and would unzip the
-contents to "production\_code" rather than the default of "src".
+## Continuous Integration
+The `metaforce:tests:ci` task is provided to make continuous integration with
+something like [Jenkins](http://jenkins-ci.org) easier.
 
-`rake metaforce:retrieve env="production" dir="production_code"`
+By default, the `metaforce:tests:ci` task will use the `ci` environment in
+metaforce.yml, so you should set that up before you use this task.
+
+The task will deploy the metadata and run all tests.

data/lib/metaforce/tasks/metaforce.rake

@@ -1,45 +1,5 @@
-namespace :metaforce do
-  Metaforce.log = true
+require 'metaforce/rake'
 
-  task :login do
-    if File.exists?('metaforce.yml')
-      require 'yaml'
-      config = YAML.load_file('metaforce.yml')
-      env = ENV['env'] || 'default'
-      root = config.has_key?(env) ? config[env] : config
-      username       = root["username"]
-      password       = root["password"]
-      security_token = root["security_token"] || ''
-      test           = root["test"] || false
-      Metaforce.configuration.test = test
-    else
-      print "username: "; username = STDIN.gets.chomp
-      print "password: "; password = STDIN.gets.chomp
-      print "security token: "; security_token = STDIN.gets.chomp
-    end
-    @client = Metaforce::Metadata::Client.new :username => username,
-      :password => password,
-      :security_token => security_token
-  end
-
-  desc "Deploy current directory to the organization"
-  task :deploy => :login do
-    deployment = @client.deploy File.dirname(__FILE__)
-    result = deployment.result(:wait_until_done => true)
-    if result[:success]
-      puts "Successfully deployed metadata."
-    else
-      puts "An error occurred."
-    end
-  end
-
-  desc "Retrieve metadata from the organization to src directory"
-  task :retrieve => :login do
-    dir = ENV['dir'] || 'src'
-    retrieval = @client.retrieve_unpackaged(File.expand_path('src/package.xml'))
-    result = retrieval.result(:wait_until_done => true)
-    retrieval.unzip(File.expand_path(dir))
-    puts "Successfully retrieved metadata to '#{dir}'."
-  end
-
-end
+Metaforce::Rake::DeployTask.new
+Metaforce::Rake::RetrieveTask.new
+Metaforce::Rake::TestsTask.new

data/lib/metaforce/version.rb

@@ -1,3 +1,3 @@
 module Metaforce
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/metaforce.rb

@@ -1,5 +1,6 @@
 require 'metaforce/version'
 require 'metaforce/config'
+require 'metaforce/error'
 require 'metaforce/manifest'
 require 'metaforce/services'
 require 'metaforce/metadata'

data/metaforce.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "nokogiri", "~> 1.5.0"
   s.add_dependency "savon", "~> 0.9.7"
   s.add_dependency "rubyzip", "~> 0.9.5"
+  s.add_dependency "term-ansicolor"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/spec/fixtures/sample/Rakefile

@@ -1,8 +1,2 @@
-begin
-  require 'metaforce'
-  load 'metaforce/tasks/metaforce.rake'
-rescue LoadError
-  task :metaforce do
-    puts "Couldn't load metaforce tasks"
-  end
-end
+require 'metaforce/rake'
+load 'metaforce/tasks/metaforce.rake'

data/spec/lib/metadata/metadata_spec.rb

@@ -129,6 +129,7 @@ describe Metaforce::Metadata::Client do
 
       it "deploys the directory and returns a transaction" do
         savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
+        savon.expects(:check_status).with(:ids => ['04sU0000000WNWoIAO']).returns(:done);
         deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
         deployment.should be_a(Metaforce::Transaction)
         deployment.id.should eq("04sU0000000WNWoIAO")
@@ -138,8 +139,9 @@ describe Metaforce::Metadata::Client do
 
     it "allows deploy options to be configured via a hash" do
       savon.expects(:deploy).with(:zip_file => '', :deploy_options => { :run_all_tests => true }).returns(:in_progress)
+      savon.expects(:check_status).with(:ids => ['04sU0000000WNWoIAO']).returns(:done);
       expect {
-        client.deploy('', { :run_all_tests => true })
+        client.deploy('', :options => { :run_all_tests => true })
       }.to_not raise_error
     end
 
@@ -188,11 +190,12 @@ describe Metaforce::Metadata::Client do
       context "when given extra retrieve options" do
         before(:each) do
           savon.expects(:retrieve).with(:retrieve_request => { :api_version => Metaforce.configuration.api_version, :single_package => true, :unpackaged => { :types => manifest.to_package }, :extra => true }).returns(:in_progress)
+          savon.expects(:check_status).with(:ids => ['04sU0000000WkdIIAS']).returns(:done);
         end
 
         it "merges the options" do
           expect {
-            retrieval = client.retrieve_unpackaged(File.expand_path('../../../fixtures/sample/src/package.xml', __FILE__), { :extra => true })
+            retrieval = client.retrieve_unpackaged(File.expand_path('../../../fixtures/sample/src/package.xml', __FILE__), :options => { :extra => true })
           }.to_not raise_error
         end
 

data/spec/lib/metadata/transaction_spec.rb

@@ -15,15 +15,15 @@ describe Metaforce::Transaction do
 
     it "allows you to check if the transaction has completed" do
       savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
-      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       savon.expects(:check_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
+      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       deployment.done?.should eq(true)
     end
 
     it "doesn't send a request if it has already completed" do
       savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
-      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       savon.expects(:check_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
+      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       deployment.done?.should eq(true)
       expect { deployment.done?.should eq(true) }.to_not raise_error
     end
@@ -34,6 +34,7 @@ describe Metaforce::Transaction do
 
     it "returns the status" do
       savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
+      savon.expects(:check_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
       deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       savon.expects(:check_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
       deployment.status.should be_a(Hash)
@@ -43,16 +44,10 @@ describe Metaforce::Transaction do
 
   describe ".result" do
 
-    it "raises an error if .done? hasn't been called" do
-      savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
-      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
-      expect { deployment.result }.to raise_error
-    end
-
     it "allows you to check the transaction result" do
       savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
-      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       savon.expects(:check_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
+      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       deployment.done?.should eq(true)
       savon.expects(:check_deploy_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
       deployment.result.should be_a(Hash)
@@ -60,8 +55,8 @@ describe Metaforce::Transaction do
 
     it "doesn't send a request if it has already retrieved the result" do
       savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
-      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       savon.expects(:check_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
+      deployment = client.deploy(File.expand_path('../../../fixtures/sample', __FILE__))
       deployment.done?.should eq(true)
       savon.expects(:check_deploy_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
       deployment.result.should be_a(Hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaforce
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9127740 !ruby/object:Gem::Requirement
+  requirement: &2152167300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *9127740
+  version_requirements: *2152167300
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &9127260 !ruby/object:Gem::Requirement
+  requirement: &2152166720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *9127260
+  version_requirements: *2152166720
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &9126870 !ruby/object:Gem::Requirement
+  requirement: &2152164880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *9126870
+  version_requirements: *2152164880
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &2152180240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152180240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9126570 !ruby/object:Gem::Requirement
+  requirement: &2152176860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9126570
+  version_requirements: *2152176860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9126200 !ruby/object:Gem::Requirement
+  requirement: &2152175140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9126200
+  version_requirements: *2152175140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &9125950 !ruby/object:Gem::Requirement
+  requirement: &2152188880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9125950
+  version_requirements: *2152188880
 - !ruby/object:Gem::Dependency
   name: savon_spec
-  requirement: &9125560 !ruby/object:Gem::Requirement
+  requirement: &2152186660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +98,7 @@ dependencies:
         version: 0.1.6
   type: :development
   prerelease: false
-  version_requirements: *9125560
+  version_requirements: *2152186660
 description: A Ruby gem for interacting with the Salesforce Metadata API
 email:
 - eric@ejholmes.net
@@ -103,11 +114,15 @@ files:
 - Rakefile
 - lib/metaforce.rb
 - lib/metaforce/config.rb
-- lib/metaforce/dsl.rb
+- lib/metaforce/error.rb
 - lib/metaforce/manifest.rb
 - lib/metaforce/metadata.rb
 - lib/metaforce/metadata/client.rb
 - lib/metaforce/metadata/transaction.rb
+- lib/metaforce/rake.rb
+- lib/metaforce/rake/deploy.rb
+- lib/metaforce/rake/retrieve.rb
+- lib/metaforce/rake/tests.rb
 - lib/metaforce/services.rb
 - lib/metaforce/services/client.rb
 - lib/metaforce/tasks/README.md
@@ -134,7 +149,6 @@ files:
 - spec/fixtures/sample/src/classes/TestClass.cls-meta.xml
 - spec/fixtures/sample/src/package.xml
 - spec/lib/config_spec.rb
-- spec/lib/dsl_spec.rb
 - spec/lib/manifest_spec.rb
 - spec/lib/metadata/metadata_spec.rb
 - spec/lib/metadata/transaction_spec.rb
@@ -185,7 +199,6 @@ test_files:
 - spec/fixtures/sample/src/classes/TestClass.cls-meta.xml
 - spec/fixtures/sample/src/package.xml
 - spec/lib/config_spec.rb
-- spec/lib/dsl_spec.rb
 - spec/lib/manifest_spec.rb
 - spec/lib/metadata/metadata_spec.rb
 - spec/lib/metadata/transaction_spec.rb

data/lib/metaforce/dsl.rb

@@ -1,42 +0,0 @@
-require 'tempfile'
-require 'zip/zip'
-
-module Metaforce
-  module DSL
-    module Metadata
-
-      # Logs in and creates a new instance of Metaforce::Metadata::Client
-      def login(options)
-        @client = Metaforce::Metadata::Client.new options
-        yield if block_given?
-      end
-
-      # Deploy the contents of _dir_ to the target organization
-      def deploy(dir, options={})
-        deployment = @client.deploy(dir, options)
-        result = deployment.result(:wait_until_done => true)
-        raise "Deploy failed." if !result[:success]
-        yield result if block_given?
-      end
-      
-      # Retrieve the metadata specified in the manifest file. If manifest is a
-      # Hash, the underlying .retrieve method is used instead of
-      # .retrieve_unpackaged.
-      #
-      # If _options_ # contains a key _:to_, the resulting zip
-      # file that is retrieved is unzipped to the directory specified.
-      def retrieve(manifest, options={})
-        if manifest.is_a?(Hash)
-          retrieval = @client.retrieve(manifest)
-        else
-          retrieval = @client.retrieve_unpackaged(manifest)
-        end
-        result = retrieval.result(:wait_until_done => true)
-        zip_contents = retrieval.zip_file
-        retrieval.unzip(options[:to]) if options.has_key?(:to)
-        yield result, zip_contents if block_given?
-      end
-
-    end
-  end
-end

data/spec/lib/dsl_spec.rb

@@ -1,93 +0,0 @@
-require "spec_helper"
-require "metaforce/dsl"
-include Metaforce::DSL::Metadata
-
-describe Metaforce::DSL::Metadata do
-
-  let(:manifest) do
-    Metaforce::Manifest.new(File.open(File.expand_path('../../fixtures/sample/src/package.xml', __FILE__)).read)
-  end
-
-  let(:valid_credentials) do
-    { :username => 'valid', :password => 'password' }
-  end
-
-  describe ".login" do
-
-    before(:each) do
-      savon.expects(:login).with(valid_credentials).returns(:success)
-    end
-
-    it "logs the user in" do
-      expect { login valid_credentials }.to_not raise_error
-    end
-
-  end
-
-  describe ".deploy" do
-
-    before(:each) do
-      Metaforce::Metadata::Client.any_instance.stubs(:create_deploy_file).returns('')
-      savon.expects(:login).with(valid_credentials).returns(:success)
-      savon.expects(:deploy).with(:zip_file => '', :deploy_options => {}).returns(:in_progress)
-      savon.expects(:check_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
-      savon.expects(:check_deploy_status).with(:ids => [ "04sU0000000WNWoIAO" ]).returns(:done)
-    end
-
-    context "when given a directory" do
-
-      it "deploys the directory" do
-        login valid_credentials
-        expect {
-          deploy File.expand_path('../../../fixtures/sample', __FILE__) do |result|
-            result.should be_a(Hash)
-          end
-        }.to_not raise_error
-      end
-
-    end
-
-  end
-
-  describe ".retrieve" do
-    before(:each) do
-      savon.expects(:login).with(valid_credentials).returns(:success)
-      savon.expects(:retrieve).with(:retrieve_request => { :api_version => Metaforce.configuration.api_version, :single_package => true, :unpackaged => { :types => manifest.to_package } }).returns(:in_progress)
-      savon.expects(:check_status).with(:ids => ['04sU0000000WkdIIAS']).returns(:done)
-      savon.expects(:check_retrieve_status).with(:ids => ['04sU0000000WkdIIAS']).returns(:success)
-    end
-
-    context "when given a manifest file" do
-
-      it "retrieves the components" do
-        login valid_credentials
-        expect {
-          retrieve manifest do |result, zip|
-            result.should be_a(Hash)
-            zip.should be_a(String)
-          end
-        }.to_not raise_error
-      end
-
-      context "and :to is specified" do
-
-        before(:each) do
-          Metaforce::Transaction.any_instance.stubs(:unzip).returns('')
-        end
-
-        it "retrieves the components and unzips them to the directory" do
-          login valid_credentials
-          expect {
-            retrieve manifest, :to => "test_retrieve" do |result, zip|
-              result.should be_a(Hash)
-              zip.should be_a(String)
-            end
-          }.to_not raise_error
-        end
-
-      end
-
-    end
-
-  end
-end