lib/salesforcedeploytool/app.rb in salesforce-deploy-tool-3.1.0 vs lib/salesforcedeploytool/app.rb in salesforce-deploy-tool-3.2.0

- old
+ new

@@ -23,10 +23,11 @@ @deploy_ignore_files = config[:deploy_ignore_files].map {|f| File.expand_path(File.join(@full_src_dir,f)) } if !config[:deploy_ignore_files].nil? @build_number_pattern = config[:build_number_pattern] @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 @run_tests = [] @debug ||= config[:debug] @@ -107,11 +108,13 @@ 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 retrieveCode" + cmd = " ant" + cmd += " -lib #{@libant}" if @libant + cmd += " retrieveCode" full_cmd = env_vars + cmd exec_options = { :stderr => @debug, @@ -165,24 +168,26 @@ if @debug exec_options[:okmsg] = nil 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| FileUtils.rm file if File.exists? file end