sf in salesforce-deploy-tool-0.3.2

- old
+ new

@@ -57,18 +57,16 @@
 command :pull do |c|
   c.syntax = 'sf pull'
   c.summary = 'Pull code from the sandbox'
   c.description = "Pull code from sandbox and update #{config[:git_dir]}"
   c.example 'usage:', 'sf pull'
-  c.example 'usage:', 'sf pull -c -d'
-  c.option "--no-clean", "-c", "Do not clean the currrent source code before pulling"
+  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.action do |args, options|
 
-    options.no_clean = true unless options.c
-    options.sandbox = options.s if options.s
+    pp options
 
     # Parameter validation:
     if options.sandbox.nil? and sandbox.nil?
       puts "error: please specify the sandbox to pull from using --sandbox"
       exit 1
@@ -78,11 +76,11 @@
 
     # Initialize
     sfdt = SalesforceDeployTool::App.new config
 
     # Clean all files from repo
-    sfdt.clean_git_dir unless options.no_clean
+    sfdt.clean_git_dir unless options.append
 
     # Pull the changes
     sfdt.pull "INFO: Pulling changes from #{config[:sandbox]}  "
 
   end
@@ -150,10 +148,10 @@
   end
 end
 
 command :sandbox do |c|
   c.syntax = 'sf sandbox SANDBOX_NAME'
-  c.summary = 'Set sandbox to work on, this will override --sandbox '
+  c.summary = 'Set sandbox to work on, this can be overriden by --sandbox '
   c.description = 'Set the sandbox to work with pull and push. If no parameter defined, it will print the current sandbox selected.'
   c.action do |args, options|
 
     if args.size > 1
       puts "error: Wrong number of arguments"