salesforce-deploy-tool 3.2.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 564089e30d21649d7dd0d313b63b09c6f8431c73
-  data.tar.gz: e2422efa9dd61c3ee7449a2aef97f0e3ea5ebbed
+  metadata.gz: 46b7b03cb5230e39c5e43b8abe978f495eb9203a
+  data.tar.gz: 6477f6b74bb04a2cad94faa32b4d873042959d76
 SHA512:
-  metadata.gz: 75f26823c0782c45d5e14946d9329d67d26fe91ade750e53c498c0f72322da8aa35431cf478941d95a62d63c879d7e270b1cbbe0d3e4198b8a4f2648de668654
-  data.tar.gz: e77174b0e7782992c9bae765ac69099db86e8b50903c23501b875d22725f5ca208718c9f2c9a30b411a20bf2f4f00d60aca3b43dd6c19ba824321d0a3cb41f0b
+  metadata.gz: 120c50b4c70e78e777f5b39a220ccf411fbec803d5228ebd1eed012dbc69e84946f8b27d6005534e2ddaa673f0bff1be822fcdf9be5747ef1a1ab46c291805c7
+  data.tar.gz: a8276c70f372a0b692028593e2bb3f5692cafb07afbae8d7ebd39cb1b856f9cd34057da8bf59c539a6a97016351f4aeb6f111640a6a8ebf6b98ed6566f1e31d7

data/bin/sf

@@ -65,14 +65,19 @@ abort "Config error: username not found in #{GLOBAL_CONFIG_FILE} or through SFDT
 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-'
+# Create a temporary directory if SFDT_TMP_DIR is set, use that and don't delete it
+# This is to facilitate testinig and inspecting build.xml file
+if !ENV['SFDT_TMP_DIR'].nil?
+  FileUtils.rm_rf ENV['SFDT_TMP_DIR']
+  FileUtils.mkdir ENV['SFDT_TMP_DIR']
+end
+config[:tmp_dir] = ENV['SFDT_TMP_DIR'] || Dir.mktmpdir('sfdt-')
 
-  SalesforceDeployTool::CLI.new.run config 
 begin
+  SalesforceDeployTool::CLI.new.run config 
 rescue => e
   puts "ERROR: #{e}"
   exit 1
 ensure
-  FileUtils.rm_rf config[:tmp_dir] if Dir.exists? config[:tmp_dir]
+  FileUtils.rm_rf config[:tmp_dir] if Dir.exists? config[:tmp_dir] unless ENV['SFDT_TMP_DIR']
 end

data/features/pull.feature

@@ -7,6 +7,9 @@ Feature: Pull code from salesforce
   Scenario: Retrieve code from the default sandbox
     When I run `sf pull`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
+    And the file "/tmp/sfdt-test/build.xml" should match /retrieveTarget/
+    And the file "/tmp/sfdt-test/build.xml" should match /unpackaged/
     And the output should match:
     """
     ^INFO: Pulling changes from testEnv using url https://test.salesforce.com.*OK
@@ -15,6 +18,7 @@ Feature: Pull code from salesforce
   Scenario: Retrieve code from a specific sandbox
     When I run `sf pull -s testEnvAlt`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
     And the output should match:
     """
     ^INFO: Pulling changes from testEnvAlt using url https://test.salesforce.com.*OK
@@ -26,6 +30,7 @@ Feature: Pull code from salesforce
       | SFDT_SALESFORCE_URL  | https://invalid_url.salesforce.com |
     When I run `sf pull`
     Then the exit status should be 1
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
     And the output should match:
     """
     ^INFO: Pulling changes from testEnv using url https://invalid_url.*
@@ -34,6 +39,7 @@ Feature: Pull code from salesforce
   Scenario: Retrieve code from a production
     When I run `sf pull -s prod`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
     And the output should match:
     """
     ^INFO: Pulling changes from prod using url https://login.salesforce.com.*OK$
@@ -42,6 +48,7 @@ Feature: Pull code from salesforce
   Scenario: Retrieve code from the default sandbox with debug output
     When I run `sf pull -d`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
     And the output should contain "BUILD SUCCESSFUL"
     And the output should match:
     """
@@ -51,6 +58,7 @@ Feature: Pull code from salesforce
   Scenario: Retrieve code from a specific sandbox with debug output
     When I run `sf pull -s testEnv -d`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
     And the output should contain "BUILD SUCCESSFUL"
     And the output should match:
     """
@@ -61,6 +69,7 @@ Feature: Pull code from salesforce
   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 file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
     And the output should match:
     """
     ^INFO: Pulling changes from testEnv using url https://test.salesforce.com  $
@@ -78,6 +87,7 @@ Feature: Pull code from salesforce
       | SFDT_ANT_LIB              | lib/ant34.jar           |
     When I run `sf pull -d`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:retrieve/
     And the output should match:
     """
     ^INFO: Pulling changes from testEnv using url https://test.salesforce.com  $

data/features/push.feature

@@ -8,6 +8,7 @@ Feature: Push code to salesforce
     When I run `sf push`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """
@@ -20,6 +21,7 @@ Feature: Push code to salesforce
     When I run `sf push -s testEnvAlt`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """
@@ -31,6 +33,7 @@ Feature: Push code to salesforce
   Scenario: Push code to production should use the url login.salesorce.com
     When I run `sf push -s prod`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """
@@ -53,6 +56,8 @@ Feature: Push code to salesforce
   Scenario: Push code to a sandbox and trigger all the tests
     When I run `sf push -T`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /runAllTests.*true/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
     And the output should match:
@@ -64,6 +69,8 @@ Feature: Push code to salesforce
   Scenario: Push code to a sandbox and trigger all the tests in debug mode
     When I run `sf push -T -d`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /runAllTests.*true/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
     And the output should match /^.* testEnv .*BUILD SUCCESSFUL.*Diff between.*Changes detected.*File generated.*Running Test:.*DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL.*$/
@@ -71,6 +78,7 @@ Feature: Push code to salesforce
   Scenario: Push code to a sandbox in append mode
     When I run `sf push -a`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And a file named "repo/salesforce/src/destructiveChanges.xml" should not exist
     And the output should match:
     """
@@ -80,6 +88,8 @@ Feature: Push code to salesforce
   Scenario: Push code to a sandbox in append mode and run all tests
     When I run `sf push -a -T`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /runAllTests.*true/
     And a file named "repo/salesforce/src/destructiveChanges.xml" should not exist
     And the output should match:
     """
@@ -89,6 +99,8 @@ Feature: Push code to salesforce
   Scenario: Push code to a sandbox in append mode and run all tests and output debug information
     When I run `sf push -a -T -d`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /runAllTests.*true/
     And a file named "repo/salesforce/src/destructiveChanges.xml" should not exist
     And the output should match:
     """
@@ -110,6 +122,7 @@ Feature: Push code to salesforce
     When I watch "repo/salesforce/src/classes/VersionTest.cls" for changes and copy to "test_file"
     And I run `sf push --build_number 123456789`
     Then the exit status should be 0
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "test_file" should contain "123456789"
     And the file "repo/salesforce/src/classes/VersionTest.cls" should contain "%%BUILD_NUMBER%%"
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
@@ -131,6 +144,7 @@ Feature: Push code to salesforce
     And the file "test_file" should contain "aac66ee0d404c124fbcafd32a054664de4fdd3da"
     And the file "repo/salesforce/src/classes/VersionTest.cls" should contain "%%COMMIT_HASH%%"
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the output should match:
     """
     ^INFO: Pulling changes from testEnv using url https://test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
@@ -162,6 +176,9 @@ Feature: Push code to salesforce
     When I run `sf push -r individual_test -d`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /testLevel.*RunSpecifiedTests/
+    And the file "/tmp/sfdt-test/build.xml" should match /runTest/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """
@@ -183,6 +200,7 @@ Feature: Push code to salesforce
     And I run `sf push --build_number 123456789`
     Then the exit status should be 0
     And the file "test_file" should contain "123456789"
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/classes/VersionTest.cls" should contain "%%BUILD_NUMBER%%"
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
@@ -201,6 +219,7 @@ Feature: Push code to salesforce
     And I run `sf push`
     Then the exit status should be 0
     And the file "test_file" should contain "aac66ee0d404c124fbcafd32a054664de4fdd3da"
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/classes/VersionTest.cls" should contain "%%COMMIT_HASH%%"
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
@@ -233,6 +252,9 @@ Feature: Push code to salesforce
     When I run `sf push -r individual_test -d`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /testLevel.*RunSpecifiedTests/
+    And the file "/tmp/sfdt-test/build.xml" should match /runTest/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """
@@ -245,10 +267,31 @@ Feature: Push code to salesforce
     And the output should match /Running Test: .*/
     And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
 
+  Scenario: Push code to a sandbox in check only mode using debug and Test
+    When I run `sf push -c -d -T`
+    Then the exit status should be 0
+    And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /checkOnly.*true/
+    And the file "/tmp/sfdt-test/build.xml" should match /runAllTests.*true/
+    And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
+    And the output should match:
+    """
+    ^INFO: Deploying and Testing code to testEnv:.*$
+    ^$
+    ^Buildfile: .*$
+    ^$
+    ^checkAndTestCode:$
+    """
+    And the output should match /Running Test/
+    And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
+
   Scenario: Push code to a sandbox in check only mode using debug
     When I run `sf push -c -d`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
+    And the file "/tmp/sfdt-test/build.xml" should match /checkOnly.*true/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """
@@ -256,7 +299,7 @@ Feature: Push code to salesforce
     ^$
     ^Buildfile: .*$
     ^$
-    ^checkOnlyCode:$
+    ^checkCode:$
     """
     And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
 
@@ -264,6 +307,7 @@ Feature: Push code to salesforce
     When I run `sf push -e Account.Sort__c -d`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the output should match /Pulling.*testEnv.*https:..test.salesforce.com.*destructiveChanges.xml/
     And the output should match /excluded: Account.Sort__c/
     And the output should match /INFO: Deploying code to testEnv/
@@ -273,6 +317,7 @@ Feature: Push code to salesforce
     When I run `sf push -i apexclass -d`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/destructiveChanges.xml" should contain "ApexClass"
     And the file "repo/salesforce/src/destructiveChanges.xml" should not contain "ApexPage"
     And the output should match /Pulling.*testEnv.*https:..test.salesforce.com.*destructiveChanges.xml/
@@ -284,6 +329,7 @@ Feature: Push code to salesforce
     When I run `sf push -e NewVersionTest -d`
     Then the exit status should be 0
     And a file named "repo/salesforce/src/destructiveChanges.xml" should exist
+    And the file "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/destructiveChanges.xml" should not contain "ApexClass"
     And the file "repo/salesforce/src/destructiveChanges.xml" should not contain "NewVersionTest"
     And the file "repo/salesforce/src/destructiveChanges.xml" should contain "ApexPage"
@@ -300,6 +346,7 @@ Feature: Push code to salesforce
     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 "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """
@@ -316,6 +363,7 @@ Feature: Push code to salesforce
     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 "/tmp/sfdt-test/build.xml" should match /sf:deploy/
     And the file "repo/salesforce/src/destructiveChanges.xml" should match /ApexClass|ApexPage/
     And the output should match:
     """

data/features/resources/mock/ant

@@ -157,7 +157,7 @@ BUILD SUCCESSFUL
 EOF
 fi
 ;;
-"deployAndTestCode")
+"deployAndTestCode"|"checkAndTestCode")
   cat << EOF
 Buildfile: ${PWD}/build.xml
 
@@ -213,11 +213,11 @@ ${COMMAND}:
 BUILD SUCCESSFUL
 EOF
 ;;
-"checkOnlyCode")
+"checkCode")
   cat << EOF
 Buildfile: /home/vagrant/salesforce/build.xml
 
-checkOnlyCode:
+checkCode:
 [sf:deploy] Request for a deploy submitted successfully.
 [sf:deploy] Request ID for the current deploy task: 0Afg000000Dwn66CAB
 [sf:deploy] Waiting for server to finish processing the request...

data/features/support/env.rb

@@ -9,6 +9,9 @@ ENV["HOME"] = new_home
 FileUtils.rm_rf new_home if Dir.exists? new_home
 FileUtils.mkdir new_home
 
+# Set a temporary dir to inspect build.xml
+ENV["SFDT_TMP_DIR"] = '/tmp/sfdt-test'
+
 # Cucumber / aruba configuration parameters
 Before do
   @aruba_timeout_seconds = 300

data/lib/salesforcedeploytool/app.rb

@@ -102,19 +102,16 @@ module SalesforceDeployTool
       # Parameter validation
       raise "package.xml not found under #{@full_src_dir}" if !File.exists? File.join(@full_src_dir,'package.xml')
 
-      renderer = ERB.new(@buildxml_erb, nil,'%<>-')
-      File.open('build.xml','w') {|f| f.write renderer.result(binding) }
-
       env_vars = ""
       env_vars += " SF_SRC_DIR=" + @full_src_dir
       env_vars += " SF_USERNAME=" + @username
       env_vars += " SF_PASSWORD=" + @password
       env_vars += " SF_SERVERURL=" + @server_url
-      cmd = " ant"
-      cmd += " -lib #{@libant}" if @libant
-      cmd += " retrieveCode"
+      ant_cmd = " ant"
+      ant_cmd += " -lib #{@libant}" if @libant
+      target = " retrieveCode"
 
-      full_cmd = env_vars + cmd
+      full_cmd = env_vars + ant_cmd + target
 
       exec_options = {
         :stderr => @debug,
@@ -129,7 +126,9 @@ module SalesforceDeployTool
         exec_options[:failmsg] = nil
       end
 
-      # Pull the code
+      # Generate build.xml and run command
+      renderer = ERB.new(@buildxml_erb, nil,'%<>-')
+      File.open('build.xml','w') {|f| f.write renderer.result(binding) }
       exit_code = myexec full_cmd, exec_options
 
       # Delete files to be ignored:
@@ -146,16 +145,6 @@ module SalesforceDeployTool
       # Parameter validation
       raise "package.xml not found under #{@full_src_dir}" if !File.exists? File.join(@full_src_dir,'package.xml')
 
-      renderer = ERB.new(@buildxml_erb, nil,'%<>-')
-      File.open('build.xml','w') {|f| f.write renderer.result(binding) }
-
-      # Set env variables to run ant
-      env_vars = ""
-      env_vars += " SF_SRC_DIR=" + @full_src_dir
-      env_vars += " SF_USERNAME=" + @username
-      env_vars += " SF_PASSWORD=" + @password
-      env_vars += " SF_SERVERURL=" + @server_url
-
       # myexec options
       exec_options = {
         :stderr   =>  @debug,
@@ -170,30 +159,42 @@ module SalesforceDeployTool
         exec_options[:failmsg]  =   nil
       end
 
+      # Set env variables to run ant
+      env_vars = ""
+      env_vars += " SF_SRC_DIR=" + @full_src_dir
+      env_vars += " SF_USERNAME=" + @username
+      env_vars += " SF_PASSWORD=" + @password
+      env_vars += " SF_SERVERURL=" + @server_url
+
+      # Command
       ant_cmd = " ant"
       ant_cmd += " -lib #{@libant}" if @libant
+
+      # Target
       if @run_all_tests  
-        cmd = " deployAndTestCode" 
+        target = " deployAndTestCode" 
       else
         if ! @run_tests.empty?
-          cmd = " deployAndRunSpecifiedTests"
+          target = " deployAndRunSpecifiedTests"
         else
-          cmd = " deployCode"
+          target = " deployCode"
         end
       end
 
       if @check_only
-        cmd = " checkOnlyCode"
+        target = target.gsub('deploy','check')
       end
        
-      full_cmd = env_vars + ant_cmd + cmd
+      full_cmd = env_vars + ant_cmd + target
 
       # Delete files to be ignored:
       @deploy_ignore_files.each do |file|
         FileUtils.rm file if File.exists? file
       end
 
-      # Push the code
+      # Generate build.xml and run command
+      renderer = ERB.new(@buildxml_erb, nil,'%<>-')
+      File.open('build.xml','w') {|f| f.write renderer.result(binding) }
       exit_code = myexec full_cmd, exec_options
 
       # exit with exit_code

data/lib/salesforcedeploytool/functions.rb

@@ -21,7 +21,7 @@ def myexec cmd, opts = {}
   opts[:stderr] = false if opts[:stderr].nil?
   opts[:stdout] = false if opts[:stdout].nil?
   opts[:exit_on_error] = true if opts[:exit_on_error].nil?
-  opts[:timeout] = 600 if opts[:timeout].nil?
+  opts[:timeout] = 7200 if opts[:timeout].nil?
   opts[:spinner] = true if opts[:spinner].nil?
   opts[:message] = false if opts[:message].nil?
   opts[:okmsg] = false if opts[:okmsg].nil?

data/lib/salesforcedeploytool/version.rb

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

data/tpl/build.xml.erb

@@ -2,65 +2,36 @@
 
     <property environment="env"/>
 
-    <target name="deployCode">
-      <sf:deploy 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        deployRoot="${env.SF_SRC_DIR}" 
+    <target name="<%= target.gsub(' ','') %>">
+      <sf:<%= target.match(/deploy|check/) ? 'deploy' : 'retrieve'%>
         maxPoll="200" 
-        rollbackOnError="true" >
-      </sf:deploy>
-    </target>
-
-    <target name="checkOnlyCode">
-      <sf:deploy 
         username="${env.SF_USERNAME}" 
         password="${env.SF_PASSWORD}" 
         serverurl="${env.SF_SERVERURL}" 
+<% if target.match(/retrieve/) -%>
+        retrieveTarget="${env.SF_SRC_DIR}"
+        unpackaged="${env.SF_SRC_DIR}/package.xml"
+<% end -%>
+<% if target.match(/deploy|check/) -%>
         deployRoot="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
+        rollbackOnError="true" 
+<% end -%>
+<% if @check_only -%>
         checkOnly="true"
-        rollbackOnError="true" >
-      </sf:deploy>
-    </target>
-
-    <target name="deployAndRunSpecifiedTests">
-      <sf:deploy 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        deployRoot="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
-        rollbackOnError="true"
-        testLevel="RunSpecifiedTests">
+<% end -%>
+<% if @run_all_tests -%>
+        runAllTests="true" 
+<% end -%>
+<% if !@run_tests.empty? -%>
+        testLevel="RunSpecifiedTests"
+<% end -%>
+<% if !@check_only -%>
+<% end -%>
+        >
 <% @run_tests.each do |test| -%>
       <runTest><%= test %></runTest>
 <% end -%>
-      </sf:deploy>
-    </target>
-
-    <target name="deployAndTestCode">
-      <sf:deploy 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        deployRoot="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
-        runAllTests="true" 
-        rollbackOnError="true" >
-      </sf:deploy>
-    </target>
-
-    <target name="retrieveCode">
-      <sf:retrieve 
-        username="${env.SF_USERNAME}" 
-        password="${env.SF_PASSWORD}" 
-        serverurl="${env.SF_SERVERURL}" 
-        retrieveTarget="${env.SF_SRC_DIR}" 
-        maxPoll="200" 
-        unpackaged="${env.SF_SRC_DIR}/package.xml"
-      />
+      </sf:<%= target.match(/deploy|check/) ? 'deploy' : 'retrieve'%>>
     </target>
 
 </project>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler