lib/salesforcedeploytool/app.rb in salesforce-deploy-tool-1.2.0 vs lib/salesforcedeploytool/app.rb in salesforce-deploy-tool-1.3.0
- old
+ new
@@ -74,21 +74,19 @@
exit 1
end
end
- def clean_git_dir message = nil
+ def clean_git_dir
- print message
Dir[File.join(@git_dir,'src','*')].each do |dir|
FileUtils.rm_rf dir unless dir =~ /.*package.xml$/
end
- puts "OK" unless message.nil?
end
- def pull message = nil
+ def pull
env_vars = ""
env_vars += " SF_USERNAME=" + @username
env_vars += " SF_PASSWORD=" + @password
env_vars += " SF_SERVERURL=" + @server_url
@@ -100,17 +98,15 @@
exec_options = {
:stderr => @debug,
:stdout => @debug,
:spinner => ! @debug,
- :message => message,
:okmsg => "OK",
:failmsg => "FAILED",
}
if @debug
- exec_options[:message] += "\n\n"
exec_options[:okmsg] = nil
exec_options[:failmsg] = nil
end
# Pull the code
@@ -147,13 +143,9 @@
if @debug
exec_options[:okmsg] = nil
exec_options[:failmsg] = nil
end
-
- # Deploy code
- exec_options[:message] = @test ? "INFO: Deploying and Testing code to #{@sandbox}: " : "INFO: Deploying code to #{@sandbox}: "
- exec_options[:message] += "\n\n" if @debug
cmd = @test ? " ant deployAndTestCode" : " ant deployCode"
full_cmd = env_vars + cmd
# Delete files to be ignored: