salesforce-deploy-tool 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585dac2205744a81b1864062cddab4fa113c468a
-  data.tar.gz: 47b53f0925188b68dcc7dd7a513114408ff95b42
+  metadata.gz: 564089e30d21649d7dd0d313b63b09c6f8431c73
+  data.tar.gz: e2422efa9dd61c3ee7449a2aef97f0e3ea5ebbed
 SHA512:
-  metadata.gz: 0b5fa61af545b693f545a561efc13d02917152c5424bc325b4f5e31b9ea206f118f4ef90f7964b263929c0d3ff486a7219749ded616425a74366722e04ad8d49
-  data.tar.gz: 452142bee6a902cd78a4db0ca39effd9663e1188e621b921cea2b5a2bceff2f2bc9eec916eee86e3a8cfe05d3d9e329aea47b3816fe6695c4c3bc558533cac25
+  metadata.gz: 75f26823c0782c45d5e14946d9329d67d26fe91ade750e53c498c0f72322da8aa35431cf478941d95a62d63c879d7e270b1cbbe0d3e4198b8a4f2648de668654
+  data.tar.gz: e77174b0e7782992c9bae765ac69099db86e8b50903c23501b875d22725f5ca208718c9f2c9a30b411a20bf2f4f00d60aca3b43dd6c19ba824321d0a3cb41f0b

data/README.md

@@ -1,29 +1,55 @@
-# Salesforce::Deploy::Tool
+# Salesforce Deploy Tool
 
-TODO: Write a gem description
+Salesforce deploy tool is a command line tool that sits on top of ant to facilitate
+salesforce deploys.
+
+## Features
+
+* push code / pull code / validate / destructive push support
+* Easier than using ant
+* Specify environment to deploy using a flag
+* Exclude and include metadata and metadata types
+* Destructive Changes autogeneration
+* GIT integration
+* Production / Test deployment support
+* Fast deploy support
+* Specify different ant libraries so to use different APIs
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ gem install salesforce-deploy-tool
 
-    gem 'salesforce-deploy-tool'
+## Quick Start
 
-And then execute:
+To generate a configuration file do
 
-    $ bundle
+    $ sf config
 
-Or install it yourself as:
+## Example
 
-    $ gem install salesforce-deploy-tool
+For how to use this tool just run:
+
+    $ sf pull -h
+    $ sf push -h
+
+### specific examples
+
+```
+$ sf pull -d
+$ sf pull -d -s mySandbox
+$ sf push -T
+$ sf push -l /path/to/ant-salesforce.jar
+$ sf push -s prod
+$ sf push -i apexclass
+$ sf push -i apexclass -e TestClass -d -s myOtherSandbox
+$ sf push -a
+```
 
-## Usage
+## Contrib
 
-TODO: Write usage instructions here
+Feel free to fork and request a pull, or submit a ticket
+http://github.com/BreinsNet/salesforce-deploy-tool/issues
 
-## Contributing
+## License
 
-1. Fork it ( https://github.com/[my-github-username]/salesforce-deploy-tool/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+This project is available under the MIT license. See LICENSE for details.

data/bin/sf

@@ -50,18 +50,26 @@ config[:build_number_pattern]  =  ENV["SFDT_BUILD_NUMBER_PATTERN"]  ||  config[:
 config[:commit_hash_pattern]   =  ENV["SFDT_COMMIT_HASH_PATTERN"]   ||  config[:commit_hash_pattern]
 config[:deploy_ignore_files]   =  ENV["SFDT_DEPLOY_IGNORE_FILES"].nil? ? config[:deploy_ignore_files] : ENV["SFDT_DEPLOY_IGNORE_FILES"].split(',')
 
+# Ant options
+config[:libant]                =  ENV["SFDT_ANT_LIB"]               ||  config[:libant]
+
 # Minimal config validation
-abort "Config error: src_dir not found in #{GLOBAL_CONFIG_FILE} or through SFDT_SRC_DIR" if config[:src_dir].nil?
-abort "Config error: git_dir not found in #{GLOBAL_CONFIG_FILE} or through SFDT_GIT_DIR" if config[:git_dir].nil?
-abort "Config error: git_repo not found in #{GLOBAL_CONFIG_FILE} or through SFDT_GIT_DIR" if config[:git_repo].nil?
-abort "Config error: username not found in #{GLOBAL_CONFIG_FILE} or through SFDT_USERNAME" if config[:username].nil? && ARGV[0] != 'config'
-abort "Config error: password not found in #{GLOBAL_CONFIG_FILE} or through SFDT_PASSWORD" if config[:password].nil? && ARGV[0] != 'config'
+abort "Config error: src_dir not found in #{GLOBAL_CONFIG_FILE} or through SFDT_SRC_DIR" \
+  if config[:src_dir].nil? && !['-v'].include?(ARGV.first)
+abort "Config error: git_dir not found in #{GLOBAL_CONFIG_FILE} or through SFDT_GIT_DIR" \
+  if config[:git_dir].nil? && !['-v'].include?(ARGV.first)
+abort "Config error: git_repo not found in #{GLOBAL_CONFIG_FILE} or through SFDT_GIT_DIR" \
+  if config[:git_repo].nil? && !['-v'].include?(ARGV.first)
+abort "Config error: username not found in #{GLOBAL_CONFIG_FILE} or through SFDT_USERNAME" \
+  if config[:username].nil? && !['config','-v'].include?(ARGV.first)
+abort "Config error: password not found in #{GLOBAL_CONFIG_FILE} or through SFDT_PASSWORD" \
+  if config[:password].nil? && !['config','-v'].include?(ARGV.first)
 
 # Create a temporary directory
 config[:tmp_dir] = Dir.mktmpdir 'sfdt-'
 
-begin
   SalesforceDeployTool::CLI.new.run config 
+begin
 rescue => e
   puts "ERROR: #{e}"
   exit 1

data/features/pull.feature

@@ -57,3 +57,42 @@ Feature: Pull code from salesforce
     ^INFO: Pulling changes from testEnv using url https://test.salesforce.com.*$
     """
 
+  @ant
+  Scenario: Retrieve code from the default sandbox with debug output and specifying ant library path
+    When I run `sf pull -d -l lib/ant34.jar`
+    Then the exit status should be 0
+    And the output should match:
+    """
+    ^INFO: Pulling changes from testEnv using url https://test.salesforce.com  $
+    ^$
+    ^AntLibraryFile: .*lib/ant34.jar$
+    ^Buildfile: .*$
+    ^$
+    ^retrieveCode:$
+    """
+
+  @ant
+  Scenario: Retrieve code from the default sandbox with debug output and specifying ant library path
+    Given I set the environment variables to:
+      | variable                  | value                   |
+      | SFDT_ANT_LIB              | lib/ant34.jar           |
+    When I run `sf pull -d`
+    Then the exit status should be 0
+    And the output should match:
+    """
+    ^INFO: Pulling changes from testEnv using url https://test.salesforce.com  $
+    ^$
+    ^AntLibraryFile: .*lib/ant34.jar$
+    ^Buildfile: .*$
+    ^$
+    ^retrieveCode:$
+    """
+
+  @ant
+  Scenario: Retrieve code from the default sandbox with debug output and specifying a wrong ant library path
+    When I run `sf pull -d -l lib/invalid_ant34.jar`
+    Then the exit status should be 1
+    And the output should match:
+    """
+    ^error: ant library file .* not found$
+    """

data/features/push.feature

@@ -101,6 +101,7 @@ Feature: Push code to salesforce
     And the output should match /Running Test/
     And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
 
+  @test
   Scenario: Push code to a sandbox with a build number
     Given I set the environment variables to:
       | variable                  | value                   |
@@ -119,7 +120,6 @@ Feature: Push code to salesforce
     ^INFO: Deploying code to testEnv:.*OK$
     """
 
-  @test
   Scenario: Push code to a sandbox with the commit hash stamped into a version file
     Given I set the environment variables to:
       | variable                  | value                   |
@@ -280,7 +280,6 @@ Feature: Push code to salesforce
     And the output should match /INFO: Deploying code to testEnv/
     And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
 
-  @new
   Scenario: Push code to a sandbox in debug mode and specifieng specific metadata exclude from destructive change
     When I run `sf push -e NewVersionTest -d`
     Then the exit status should be 0
@@ -292,3 +291,47 @@ Feature: Push code to salesforce
     And the output should match /excluded: NewVersionTest/
     And the output should match /INFO: Deploying code to testEnv/
     And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
+
+  @ant
+  Scenario: Push code to a sandbox using a different ant library path in debug mode should show the library path in the output
+    Given I set the environment variables to:
+      | variable                  | value                   |
+      | SFDT_ANT_LIB              | lib/ant34.jar           |
+    When I run `sf push -d`
+    Then the exit status should be 0
+    And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
+    And the output should match:
+    """
+    ^INFO: Deploying code to .*$
+    ^$
+    ^AntLibraryFile: .*lib/ant34.jar$
+    ^Buildfile: .*$
+    ^$
+    ^deployCode:$
+    """
+
+  @ant
+  Scenario: Push code to a sandbox using a different ant library path in debug mode should show the library path in the output
+    When I run `sf push -l lib/ant34.jar -d`
+    Then the exit status should be 0
+    And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
+    And the output should match:
+    """
+    ^INFO: Deploying code to .*$
+    ^$
+    ^AntLibraryFile: .*lib/ant34.jar$
+    ^Buildfile: .*$
+    ^$
+    ^deployCode:$
+    """
+
+  @ant
+  Scenario: Push code to a sandbox using a invalid ant library path should fail
+    When I run `sf push -l lib/invalid_ant34.jar`
+    Then the exit status should be 1
+    And the output should match:
+    """
+    ^error: ant library file .* not found$
+    """

data/features/resources/mock/ant

@@ -1,6 +1,17 @@
 #!/bin/bash
 
-COMMAND=$1
+if [[ $1 == '-lib' ]] ;then 
+  COMMAND=$3
+  ANTLIB=$2
+else
+  COMMAND=$1
+  ANTLIB=$2
+fi
+
+if [[ ! -z $ANTLIB ]] && [[ ! -f $ANTLIB ]]; then
+  echo "ERROR: ANT lib path not found"
+  exit 1
+fi
 
 if [[ -z $SF_SRC_DIR ]]; then
   echo "ERROR: SF_SRC_DIR Not defined"
@@ -75,7 +86,7 @@ case $COMMAND in
   # Add two more classes and two more pages so to simulate
   # Destructive changes
   cd $SF_SRC_DIR
-  git reset --hard
+  git reset --hard > /dev/null 2>&1
   old_dir=`pwd`
   cd $SF_SRC_DIR/classes
   ls|tail -2|while read class;do cp $class New$class;done
@@ -146,8 +157,40 @@ BUILD SUCCESSFUL
 EOF
 fi
 ;;
-"deployAndTestCode"|"deployAndRunSpecifiedTests")
-    cat << EOF
+"deployAndTestCode")
+  cat << EOF
+Buildfile: ${PWD}/build.xml
+
+${COMMAND}:
+[sf:deploy] Request for a deploy submitted successfully.
+[sf:deploy] Request ID for the current deploy task: 0Af2400000a0FeVCAU
+[sf:deploy] Waiting for server to finish processing the request...
+[sf:deploy] Request Status: Pending
+[sf:deploy] Request Status: InProgress (94/1473)  -- Processing Type: CustomObject
+[sf:deploy] Request Status: InProgress
+[sf:deploy] Request Status: InProgress (1204/1473)  -- Processing Type: ApprovalProcess
+[sf:deploy] Request Status: InProgress (1212/1473)  -- Processing Type: ApexClass
+[sf:deploy] Request Status: InProgress (1212/1473)  -- Processing Type: ApexClass
+[sf:deploy] Request Status: InProgress (1442/1473)  -- Processing Type: PermissionSet
+[sf:deploy] Request Status: InProgress (7/227)  -- Running Test: FooClassTest
+[sf:deploy] Request Status: InProgress (26/227)  -- Running Test: BarClassTest
+[sf:deploy] Request Status: Succeeded
+[sf:deploy] *********** DEPLOYMENT SUCCEEDED ***********
+[sf:deploy] Finished request 0Af2400000a0FeVCAU successfully.
+
+BUILD SUCCESSFUL
+EOF
+;;
+"deployAndRunSpecifiedTests")
+  if ! grep 'testLevel="RunSpecifiedTests"' build.xml > /dev/null 2>&1; then
+    echo "ERROR: RunSpecifiedTests is not in build.xml"
+    exit 1
+  fi
+  if ! grep -E '<runTest>.*<\/runTest>' build.xml > /dev/null 2>&1; then
+    echo "ERROR: <runTest> tag is not in build.xml"
+    exit 1
+  fi
+  cat << EOF
 Buildfile: ${PWD}/build.xml
 
 ${COMMAND}:
@@ -198,4 +241,7 @@ EOF
 
 esac
 
-sleep 0.4
+# Sleep 2 seconds so that the tests with version files can detect changes on it
+[[ ! -z $SFDT_VERSION_FILE ]] && sleep 1
+
+exit 0

data/features/support/env.rb

@@ -2,13 +2,6 @@ require 'aruba/cucumber'
 require 'filewatcher'
 require 'git'
 
-# Necesary environment variables:
-ENV["SFDT_GIT_REPO"] = File.join(Dir.pwd,'features/resources/repo')
-ENV["SFDT_GIT_DIR"] = 'repo'
-ENV["SFDT_SRC_DIR"] = 'salesforce/src'
-ENV["SFDT_USERNAME"] = 'john.doe@example.com'
-ENV["SFDT_PASSWORD"] = 'mysecurepass'
-ENV["SFDT_SANDBOX"] = 'testEnv'
 
 # Create a temprary home directory:
 new_home = File.join(Dir.pwd,'tmp','home') 
@@ -28,13 +21,30 @@ Before '@config' do
   FileUtils.rm_rf File.join(File.expand_path('~/'),'.sf')
 end
 
-# Before push and pull clone the repository
-Before '@push,@pull' do 
+Before '@push,@pull,@config' do 
+
+  # Necesary environment variables:
+  ENV["SFDT_GIT_REPO"] = File.join(Dir.pwd,'features/resources/repo')
+  ENV["SFDT_GIT_DIR"] = 'repo'
+  ENV["SFDT_SRC_DIR"] = 'salesforce/src'
+  ENV["SFDT_USERNAME"] = 'john.doe@example.com'
+  ENV["SFDT_PASSWORD"] = 'mysecurepass'
+  ENV["SFDT_SANDBOX"] = 'testEnv'
+
+  # Clone repository
   uri = ENV['SFDT_GIT_REPO']
   name = File.join 'tmp', 'aruba', ENV['SFDT_GIT_DIR']
   Git.clone(uri, name)
+
+  # Simulate a different ant library
+  FileUtils.mkdir File.join 'tmp','aruba','lib'
+  FileUtils.touch File.join 'tmp','aruba','lib','ant34.jar'
 end
 
 at_exit do
-  FileUtils.rm 'bin/ant'
+  FileUtils.rm 'bin/ant' if File.exists? 'bin/ant'
+end
+
+After do |s| 
+  Cucumber.wants_to_quit = true if s.failed?
 end

data/features/support/hooks.rb

@@ -8,7 +8,7 @@ When /^I watch "(.+)" for changes and copy to "(.+)"$/ do |file,dest|
   fork do
     FileWatcher.new(file).watch do |filename|
       FileUtils.cp file, dest
-      exit
+      exit 0
     end
   end
 end

data/lib/salesforcedeploytool/app.rb

@@ -25,6 +25,7 @@ module SalesforceDeployTool
       @commit_hash_pattern = config[:commit_hash_pattern]
       @username = @sandbox == 'prod' ? @username : @username + '.' + @sandbox 
       @server_url = config[:salesforce_url]
+      @libant = File.expand_path(config[:libant]) if config[:libant]
 
       # Defaults
       @check_only = false
@@ -109,7 +110,9 @@ module SalesforceDeployTool
       env_vars += " SF_USERNAME=" + @username
       env_vars += " SF_PASSWORD=" + @password
       env_vars += " SF_SERVERURL=" + @server_url
-      cmd = " ant retrieveCode"
+      cmd = " ant"
+      cmd += " -lib #{@libant}" if @libant
+      cmd += " retrieveCode"
 
       full_cmd = env_vars + cmd
 
@@ -167,21 +170,23 @@ module SalesforceDeployTool
         exec_options[:failmsg]  =   nil
       end
 
+      ant_cmd = " ant"
+      ant_cmd += " -lib #{@libant}" if @libant
       if @run_all_tests  
-        cmd = " ant deployAndTestCode" 
+        cmd = " deployAndTestCode" 
       else
         if ! @run_tests.empty?
-          cmd = " ant deployAndRunSpecifiedTests"
+          cmd = " deployAndRunSpecifiedTests"
         else
-          cmd = " ant deployCode"
+          cmd = " deployCode"
         end
       end
 
       if @check_only
-        cmd = " ant checkOnlyCode"
+        cmd = " checkOnlyCode"
       end
-        
-      full_cmd = env_vars + cmd
+       
+      full_cmd = env_vars + ant_cmd + cmd
 
       # Delete files to be ignored:
       @deploy_ignore_files.each do |file|

data/lib/salesforcedeploytool/cli.rb

@@ -16,9 +16,6 @@ module SalesforceDeployTool
         abort "ERROR: The source directory #{full_src_dir} is not a valid salesforce source directory"
       end
 
-      # Chdir to working directory
-      Dir.chdir config[:tmp_dir]
-
       # saleforce-deploy-tool version and description
       program :version, SalesforceDeployTool::VERSION
       program :description, 'A cli tool to help manage and deploy salesforce sandboxes with git'
@@ -32,34 +29,49 @@ module SalesforceDeployTool
         c.option "--append", "Pull code appending it to the local repository"
         c.option "--debug", "Verbose output"
         c.option "--sandbox NAME", "-s NAME", "use 'prod' to deploy production or sandbox name"
+        c.option "--lib-ant PATH", "-l PATH", "Path to the ant-library to use"
         c.action do |args, options|
 
           # short flag mapping
           options.sandbox = options.s if options.s
+          options.libant = options.l if options.l
 
           # Parameter validation:
           if options.sandbox.nil? and config[:sandbox].nil?
             puts "error: please specify sandbox using --sandbox or sf sandbox"
             exit 1
           end
+
+          if options.libant && !File.exists?(File.expand_path options.libant)
+            puts "error: ant library file #{options.libant} not found"
+            exit 1
+          end
+
+          # Config array
+          config[:libant] =  config[:libant] || options.libant
+          config[:libant] =  File.expand_path(config[:libant]) if config[:libant]
           config[:sandbox] = options.sandbox if options.sandbox
           config[:debug] = options.debug.nil? ? false : true
-
-          # The salesforce URL
           config[:salesforce_url] = 
             ENV["SFDT_SALESFORCE_URL"] ||                                                                   # First from environment variables
             config[:salesforce_url]    ||                                                                   # Second from the configuration files
             ( config[:sandbox] == 'prod' ? 'https://login.salesforce.com' : 'https://test.salesforce.com' ) # If not defined anywhere, use defaults
 
+          # Chdir to working directory
+          Dir.chdir config[:tmp_dir]
+
           # Initialize
           sfdt = SalesforceDeployTool::App.new config
 
           # Clean all files from repo
           sfdt.clean_git_dir unless options.append
 
-          # Pull the changes
+          # output message
           print "INFO: Pulling changes from #{config[:sandbox]} using url #{config[:salesforce_url]}  "
           print "\n\n" if options.debug
+          print "AntLibraryFile: #{config[:libant]}\n" if config[:libant] && options.debug
+
+          # Pull
           sfdt.pull
           sfdt.clean_version
 
@@ -81,6 +93,7 @@ module SalesforceDeployTool
         c.option "--run-tests CSV_LIST", "-r CSV_LIST", "a CSV list of individual classes to run tests"
         c.option "--check-only", "-c", "Check only, don't deploy"
         c.option "--include CSV_LIST", "-i CSV_LIST", "A CSV list of metadata type to include when creating destructiveChange.xml"
+        c.option "--lib-ant PATH", "-l PATH", "Path to the ant-library to use"
         c.action do |args, options|
 
           # short flag mapping
@@ -90,6 +103,7 @@ module SalesforceDeployTool
           options.exclude = options.x if options.x
           options.sandbox = options.s if options.s
           options.include = options.i if options.i
+          options.libant = options.l if options.l
 
           # Parameter validation:
           if options.run_all_tests and options.run_tests
@@ -100,15 +114,25 @@ module SalesforceDeployTool
             puts "error: please specify the sandbox to pull from using --sandbox"
             exit 1
           end
+
+          if options.libant && !File.exists?(File.expand_path options.libant)
+            puts "error: ant library file #{options.libant} not found"
+            exit 1
+          end
+
+          # Config array
+          config[:libant] =  config[:libant] || options.libant
+          config[:libant] =  File.expand_path(config[:libant]) if config[:libant]
           config[:sandbox] = options.sandbox if options.sandbox
           config[:debug] = options.debug.nil? ? false : true
-
-          # The salesforce URL
           config[:salesforce_url] = 
             ENV["SFDT_SALESFORCE_URL"] ||                                                                   # First from environment variables
             config[:salesforce_url]    ||                                                                   # Second from the configuration files
             ( config[:sandbox] == 'prod' ? 'https://login.salesforce.com' : 'https://test.salesforce.com' ) # If not defined anywhere, use defaults
 
+          # Chdir to working directory
+          Dir.chdir config[:tmp_dir]
+
           # Initialize
           sfdt = SalesforceDeployTool::App.new config
 
@@ -123,8 +147,11 @@ module SalesforceDeployTool
             FileUtils.cp_r config[:git_dir],config_tmp[:git_dir]
             sfdt_tmp = SalesforceDeployTool::App.new config_tmp
             sfdt_tmp.clean_git_dir
+            
             print "INFO: Pulling changes from #{config[:sandbox]} using url #{config[:salesforce_url]} to temporary directory to generate destructiveChanges.xml  "
             print( options.debug.nil? ? "" : "\n\n" )
+            print "AntLibraryFile: #{config[:libant]}\n" if config[:libant] && options.debug
+
             sfdt_tmp.pull
 
             # Create destructiveChanges.xml
@@ -153,9 +180,12 @@ module SalesforceDeployTool
             # Check only option:
             sfdt.check_only = options.check_only
 
-            # Push
+            # Output message:
             print( options.run_all_tests.nil? && options.run_tests.nil? ? "INFO: Deploying code to #{config[:sandbox]}:   ": "INFO: Deploying and Testing code to #{config[:sandbox]}:  " )
             print( options.debug.nil? ? "" : "\n\n" )
+            print "AntLibraryFile: #{config[:libant]}\n" if config[:libant] && options.debug
+
+            # Push
             sfdt.push
           ensure
             sfdt.clean_version

data/lib/salesforcedeploytool/functions.rb

@@ -47,16 +47,20 @@ def myexec cmd, opts = {}
     # try to read. Loop every 1 second over and over the same process until 
     # the process finishes or timeout is reached.
     elapsed = 0
-    while wait_thr.status and (elapsed = Time.now - start) < opts[:timeout]
+    while wait_thr.status && (elapsed = Time.now - start) < opts[:timeout]
+
+      # Monitor stdout and stderr for changes
       Kernel.select([stdout,stderr],nil,nil,1)
 
       # Read STDIN in a nonblock way.
       begin
-        stdout_line = stdout.read_nonblock(100) 
-        print stdout_line if opts[:stdout]
-        stdout_all += stdout_line
-        # spin the pinwheel
-        pinwheel.spin_it if opts[:spinner]
+        # Read the full buffer
+        while (stdout_line = stdout.read_nonblock(100))
+          print stdout_line if opts[:stdout]
+          stdout_all += stdout_line
+          # spin the pinwheel
+          pinwheel.spin_it if opts[:spinner]
+        end
       rescue IO::WaitReadable
         # Exception raised when there is nothing to read
       rescue EOFError
@@ -80,6 +84,7 @@ def myexec cmd, opts = {}
 
     end
 
+
     # Log stdout output
     logger.info "\n" + stdout_all if logger and ! stdout_all.empty?
     logger.error "\n" + stderr_all if logger and ! stderr_all.empty?

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/tpl/build.xml.erb

@@ -2,12 +2,6 @@
 
     <property environment="env"/>
 
-    <taskdef resource="com/salesforce/antlib.xml" uri="antlib:com.salesforce">
-        <classpath>
-            <pathelement location="../ant-salesforce.jar" />
-        </classpath>
-    </taskdef>
-
     <target name="deployCode">
       <sf:deploy 
         username="${env.SF_USERNAME}" 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,6 @@ files:
 - README.md
 - Rakefile
 - bin/sf
-- build.xml
 - features/config.feature
 - features/misc.feature
 - features/pull.feature

data/build.xml

@@ -1 +0,0 @@
-deployCode