salesforce-deploy-tool 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe3021d67e55804a0f2815e685d08c2ba4cc6e4
-  data.tar.gz: 9d80f486d15a382c4956992ec4c86cce4085133f
+  metadata.gz: 947f71272fa457667c1003576a2459182155903a
+  data.tar.gz: ffbc084e4ecea361755fc80ceb3875785c80f63a
 SHA512:
-  metadata.gz: 608e4a229fcdb828cc15c8b16320a85b3c0f1fc4202f3c2961863cb09a8a9859311b77c90f5a90d181d270957dfbe06c3a2cdc4fe89e259a7beed93f26565777
-  data.tar.gz: 81ac889d4979f9e81eddb4216770b65d0921e40a6225f41def605bd28e264b79ce74278521fb3f4c89849efd81dd2dd5c4d7471a0a80184e1e6b9b3f27036830
+  metadata.gz: 3658f66f329e1c875e17c263db2ba5608f3ad11b97dbc6996dab49528d6e0192c0540e7d374267219a4edd1c24bad93e8ae0c383df441b39688f53a1146df13c
+  data.tar.gz: 4ee7cd94cdac963328742b783f2fed28f3f9251f1067663e71aad6f52b860cdd3dd41e27b6b3f2bae50a33559d5432297410666f3085d94e40e9e7563a69ccd4

data/.gitignore

@@ -24,4 +24,4 @@ mkmf.log
 test_data
 credentials.yaml
 envvars
-config.yaml
+cucumber-config.yaml

data/bin/sf

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-require 'pp'
-require 'yaml'
-require 'fileutils'
+require 'salesforcedeploytool'
 
 # Disable stdout buffer
 STDOUT.sync = true
@@ -29,244 +27,44 @@ end
 
 # Read sandbox environment
 begin
-  sandbox = File.open(File.expand_path(SANDBOX_CONFIG_FILE)).read
+  config[:sandbox] = File.open(File.expand_path(SANDBOX_CONFIG_FILE)).read
 rescue
-  sandbox = nil
+  config[:sandbox] = nil
 end
 
-# Grab variables from env if not in the config files
-config[:git_dir]               =  ENV["SFDT_GIT_DIR"]               ||  config[:git_dir]
-config[:tmp_dir]               =  ENV["SFDT_TMP_DIR"]               ||  config[:tmp_dir]
-config[:version_file]          =  ENV["SFDT_VERSION_FILE"]          ||  config[:version_file]
-config[:build_number_pattern]  =  ENV["SFDT_BUILD_NUMBER_PATTERN"]  ||  config[:build_number_pattern]
-config[:commit_hash_pattern]   =  ENV["SFDT_COMMIT_HASH_PATTERN"]   ||  config[:commit_hash_pattern]
+# Configuration variables firrst from ENV , if not config file
+
+# Git configs:
 config[:git_repo]              =  ENV["SFDT_GIT_REPO"]              ||  config[:git_repo]
+config[:git_dir]               =  ENV["SFDT_GIT_DIR"]               ||  config[:git_dir]
+config[:src_dir]               =  ENV["SFDT_SRC_DIR"]               ||  config[:src_dir]
+
+# Salesforce credential configs
 config[:username]              =  ENV["SFDT_USERNAME"]              ||  config[:username]
 config[:password]              =  ENV["SFDT_PASSWORD"]              ||  config[:password]
 config[:salesforce_url]        =  ENV["SFDT_SALESFORCE_URL"]        ||  config[:salesforce_url] 
-config[:deploy_ignore_files]   =  ENV["SFDT_DEPLOY_IGNORE_FILES"].nil? ? config[:deploy_ignore_files] : ENV["SFDT_DEPLOY_IGNORE_FILES"].split(',')
 
-# Default values
-config[:buildxml_dir] = ENV["SFDT_BUILDXML_DIR"] || config[:buildxml_dir] || ''
+# Project configs
+config[:version_file]          =  ENV["SFDT_VERSION_FILE"]          ||  config[:version_file]
+config[:build_number_pattern]  =  ENV["SFDT_BUILD_NUMBER_PATTERN"]  ||  config[:build_number_pattern]
+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(',')
 
 # 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: tmp_dir not found in #{GLOBAL_CONFIG_FILE} or through SFDT_TMP_DIR" if config[:tmp_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'
 
-# If the repository is not cloned then fail:
-if !File.exists?(config[:git_dir]) && ['pull','push'].include?(ARGV[0])
-  abort "ERROR: The environment is not properly configured, please run sf config to clone the repo and setup the credentials"
-end
-
-# Normalize file paths:
-config[:git_dir] = File.expand_path config[:git_dir]
-config[:tmp_dir] = File.expand_path config[:tmp_dir]
-
-require 'salesforcedeploytool'
-
-program :version, SalesforceDeployTool::VERSION
-program :description, 'A cli tool to help manage and deploy salesforce sandboxes with git'
-
-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.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|
-
-    # short flag mapping
-    options.sandbox = options.s if options.s
-
-    # Parameter validation:
-    if options.sandbox.nil? and sandbox.nil?
-      puts "error: please specify sandbox using --sandbox or sf sandbox"
-      exit 1
-    end
-    config[:sandbox] = options.sandbox || 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
-
-    # Initialize
-    sfdt = SalesforceDeployTool::App.new config
-
-    # Clean all files from repo
-    sfdt.clean_git_dir unless options.append
-
-    # Pull the changes
-    print "INFO: Pulling changes from #{config[:sandbox]} using url #{config[:salesforce_url]} "
-    print "\n\n" if options.debug
-    sfdt.pull
-    sfdt.clean_version
-
-  end
-
-end
-
-command :push do |c|
-  c.syntax = 'sf push [options]'
-  c.summary = 'Push code into a sandbox'
-  c.description = ''
-  c.example 'description', "Push the code that is located into #{config[:git_dir]} into the active sandbox"
-  c.option "--sandbox NAME", "-s NAME", "use 'prod' to deploy production or sandbox name"
-  c.option "--debug", "Verbose output"
-  c.option "--test", "-T", "Deploy and test"
-  c.option "--exclude LIST", "-x LIST", "a CSV list of metadata to exclude when creating destructiveChange.xml"
-  c.option "--append", "Disable destructive change and do an append deploy"
-  c.option "--build_number NUMBER","Record build number on version file"
-  c.action do |args, options|
-
-    # short flag mapping
-    options.test = true if options.T
-    options.exclude = options.x if options.x
-    options.sandbox = options.s if options.s
-
-    # Parameter validation:
-    if options.sandbox.nil? and sandbox.nil?
-      puts "error: please specify the sandbox to pull from using --sandbox"
-      exit 1
-    end
-    config[:sandbox] = options.sandbox || sandbox
-    config[:test] = options.test.nil? ? false : true
-    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
-
-    # Initialize
-    sfdt = SalesforceDeployTool::App.new config.clone
+# Create a temporary directory
+config[:tmp_dir] = Dir.mktmpdir 'sfdt-'
 
-    # Remove destructive change if there is one
-    DESTRUCTIVE_CHANGE_FILE = File.join(config[:git_dir],config[:buildxml_dir],'src','destructiveChanges.xml')
-    FileUtils.rm DESTRUCTIVE_CHANGE_FILE if File.exists? DESTRUCTIVE_CHANGE_FILE
-
-    if ! options.append
-      # Pull changes from sandbox to temporary directory:
-      config_tmp = config.clone
-      config_tmp[:git_dir] = config_tmp[:tmp_dir]
-      FileUtils.rm_rf config_tmp[:git_dir] if File.exists? config_tmp[:git_dir]
-      FileUtils.cp_r config[:git_dir],config_tmp[:git_dir]
-      sfdt_tmp = SalesforceDeployTool::App.new config_tmp
-      print "INFO: Pulling changes from #{config[:sandbox]} using url #{config[:salesforce_url]} to temporary directory #{config[:tmp_dir]} to generate destructiveChanges.xml  "
-      sfdt_tmp.pull
-
-      # Create destructiveChanges.xml
-      puts "INFO: Creating destructive changes xml"
-      dc_gen = Dcgen::App.new
-      dc_gen.master = File.join(config[:git_dir],config[:buildxml_dir],'src')
-      dc_gen.destination = File.join(config[:tmp_dir],config[:buildxml_dir],'src')
-      dc_gen.output = DESTRUCTIVE_CHANGE_FILE
-      dc_gen.exclude = options.exclude.split(',') unless options.exclude.nil?
-      dc_gen.verbose = false if not options.debug
-      dc_gen.generate_destructive_changes
-    
-    end
-
-    # Push code to sandbox
-    begin
-      # Set version
-      sfdt.build_number = options.build_number if not options.build_number.nil?
-      sfdt.set_version
-
-      # Enable test if option enabled
-      sfdt.test = options.test.nil? ? false : true
-
-      # Push
-      print(options.test.nil? ? "INFO: Deploying code to #{config[:sandbox]}:   ": "INFO: Deploying and Testing code to #{config[:sandbox]}:  \n\n")
-      sfdt.push
-    ensure
-      sfdt.clean_version
-    end
-
-  end
-end
-
-command :sandbox do |c|
-  c.syntax = 'sf sandbox SANDBOX_NAME'
-  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"
-    end
-
-    if args.size == 0
-      if ! sandbox.nil?
-         puts "sandbox: " + sandbox
-         exit 0
-      else
-        puts "WARN: Sandbox has not been set yet"
-        exit 1
-      end
-    end
-    File.open(File.expand_path(SANDBOX_CONFIG_FILE),'w').write args.first
-
-  end
-end
-
-command :config do |c|
-  c.syntax = 'sf config'
-  c.summary = 'Go through the configuration wizard to config your environment'
-  c.action do |args, options|
-
-    if args.size != 0
-      puts "error: Wrong number of arguments"
-    end
-
-    config_new = {}
-
-    config_new[:username] = ask "Please enter your SalesForce production login user name" do |q|
-      q.validate = /^\S+@\S+$/ 
-    end.to_s
-
-    config_new[:password] = ask "Please enter your Salesforce production password" do |q|
-      q.echo = "x"
-    end.to_s
-
-    git_name = ask "Please enter your Full name to be used as commit owner on GIT" do |q|
-      q.validate = /^[a-zA-Z\s]+$/ 
-    end
-
-    git_email = ask "Please enter your email to be used as commit email on GIT" do |q|
-      q.validate = /^\S+@\S+$/ 
-    end
-
-    sandbox = ask "Please enter your sandbox so to be used as default when push and pull" do |q|
-      q.validate = /^[a-zA-Z]+$/ 
-    end
-
-    %x[git config --global user.email "#{git_email}"]
-    %x[git config --global user.name "#{git_name}"]
-
-    config[:username] = config_new[:username]
-    config[:password] = config_new[:password]
-    config[:sandbox] = sandbox
-
-    File.open(File.expand_path(SANDBOX_CONFIG_FILE),'w').write sandbox
-    File.open(File.expand_path(CONFIG_FILE),'w').write config_new.to_yaml
-
-    # Initialize
-    sfdt = SalesforceDeployTool::App.new config
-
-    # Clone
-    sfdt.clone
-
-  end
+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]
 end
-
-default_command :help
-
-

data/cucumber-config.yaml-tpl

@@ -0,0 +1,15 @@
+:production_username: 'john.doe@example.com'
+:production_password: 'passw0rd'
+:git_full_name: 'John Doe'
+:git_email_address: 'john.doe@example.com'
+:sandbox: 'test'
+:environment_variables:
+  :sfdt_git_repo: '/url/to/git/repo/with/test/salesforce/classes'
+  :sfdt_git_dir: 'where/to/be/cloned'
+  :sfdt_src_dir: 'within/the/repo/path/to/salesforce/source/code'
+:replacement_patterns:
+  :env_a: 'testa'
+  :env_b: 'testb'
+  :build_number_pattern: '%%BUILD_NUMBER%%'
+  :commit_hash_pattern: '%%COMMIT_HASH%%'
+  :version_file: 'classes/VersionTest.cls'

data/features/push.feature

@@ -7,10 +7,10 @@ Feature: Push code to salesforce
   Scenario: Push code to a sandbox
     When I run `sf push`
     Then the exit status should be 0
-    And a file named "dcxml_location/destructiveChanges.xml" should exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a using url https:\/\/test.salesforce.com to temporary directory .*tmp_repo.* to generate destructiveChanges.xml.*OK$
+    ^INFO: Pulling changes from env_a using url https:\/\/test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_a:.*OK$
     """
@@ -18,10 +18,10 @@ Feature: Push code to salesforce
   Scenario: Push code to a different sandbox
     When I run `sf push -s env_b`
     Then the exit status should be 0
-    And a file named "dcxml_location/destructiveChanges.xml" should exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
     And the output should match:
     """
-    ^INFO: Pulling changes from env_b using url https://test.salesforce.com to temporary directory .*tmp_repo.* to generate destructiveChanges.xml.*OK$
+    ^INFO: Pulling changes from env_b using url https://test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_b:.*OK$
     """
@@ -35,28 +35,28 @@ Feature: Push code to salesforce
     Then the exit status should be 1
     And the output should match:
     """
-    ^INFO: Pulling changes from prod using url https://login.salesforce.com to temporary directory .*tmp_repo.* to generate destructiveChanges.xml.*$
+    ^INFO: Pulling changes from prod using url https://login.salesforce.com to temporary directory to generate destructiveChanges.xml.*$
     """
 
   Scenario: Push code to a sandbox with debug information
     When I run `sf push -d`
     Then the exit status should be 0
     And the output should match /^.* env_a .*BUILD SUCCESSFUL.*Diff between.*Changes detected.*File generated.*BUILD SUCCESSFUL.*$/
-    And a file named "dcxml_location/destructiveChanges.xml" should exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
 
   Scenario: Push code to a sandbox with debug information to a different sandbox
     When I run `sf push -d -s env_b`
     Then the exit status should be 0
     And the output should match /^.* env_b .*BUILD SUCCESSFUL.*Diff between.*Changes detected.*File generated.*BUILD SUCCESSFUL.*$/
-    And a file named "dcxml_location/destructiveChanges.xml" should exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
 
   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 a file named "dcxml_location/destructiveChanges.xml" should exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory .*tmp_repo.* to generate destructiveChanges.xml.*OK$
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying and Testing code to env_a:.*OK$
     """
@@ -64,13 +64,13 @@ 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 a file named "dcxml_location/destructiveChanges.xml" should exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
     And the output should match /^.* env_a .*BUILD SUCCESSFUL.*Diff between.*Changes detected.*File generated.*Running Test:.*DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL.*$/
 
   Scenario: Push code to a sandbox in append mode
     When I run `sf push -a`
     Then the exit status should be 0
-    And a file named "dcxml_location/destructiveChanges.xml" should not exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should not exist
     And the output should match:
     """
     ^INFO: Deploying code to env_a:.*OK$
@@ -79,24 +79,23 @@ 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 a file named "dcxml_location/destructiveChanges.xml" should not exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should not exist
     And the output should match:
     """
     ^INFO: Deploying and Testing code to env_a:.*OK$
     """
 
-  @test
   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 a file named "dcxml_location/destructiveChanges.xml" should not exist
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should not exist
     And the output should match:
     """
     ^INFO: Deploying and Testing code to env_a:  $
     ^$
     ^Buildfile: .*$
     ^$
-    ^deployAndTestCode:$
+    ^deployAndTestAllCode:$
     """
     And the output should match /Running Test/
     And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
@@ -106,14 +105,14 @@ Feature: Push code to salesforce
       | variable                  | value                |
       | SFDT_VERSION_FILE         | version_file         |
       | SFDT_BUILD_NUMBER_PATTERN | build_number_pattern |
-    When I watch "sfdt_git_dir/version_file" for changes and copy to "test_file"
+    When I watch "sfdt_git_dir/sfdt_src_dir/version_file" 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 "test_file" should contain "123456789"
-    And the file "sfdt_git_dir/version_file" should contain "build_number_pattern"
+    And the file "sfdt_git_dir/sfdt_src_dir/version_file" should contain "build_number_pattern"
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory .*tmp_repo.* to generate destructiveChanges.xml.*OK$
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_a:.*OK$
     """
@@ -123,14 +122,14 @@ Feature: Push code to salesforce
       | variable                  | value                |
       | SFDT_VERSION_FILE         | version_file         |
       | SFDT_COMMIT_HASH_PATTERN  | commit_hash_pattern  |
-    When I watch "sfdt_git_dir/version_file" for changes and copy to "test_file"
+    When I watch "sfdt_git_dir/sfdt_src_dir/version_file" for changes and copy to "test_file"
     And I run `sf push`
     Then the exit status should be 0
     And the file "test_file" should not contain "commit_hash_pattern"
-    And the file "sfdt_git_dir/version_file" should contain "commit_hash_pattern"
+    And the file "sfdt_git_dir/sfdt_src_dir/version_file" should contain "commit_hash_pattern"
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory .*tmp_repo.* to generate destructiveChanges.xml.*OK$
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_a:.*OK$
     """
@@ -141,7 +140,7 @@ Feature: Push code to salesforce
     Then the exit status should be 1
     And the output should match:
     """
-    ^ERROR: The environment is not properly configured, please run sf config to clone the repo and setup the credentials$
+    ^ERROR: The source directory .* is not a valid salesforce source directory
     """
 
   Scenario: Push code to a sandbox specifying a different URL
@@ -155,4 +154,86 @@ Feature: Push code to salesforce
     .*Failed to login: Failed to send request to https://invalid_url.salesforce.com.*
     """
 
-    # TODO: Scenario: Push code to a sandbox excluding files
+  Scenario: Push code to a sandbox and trigger individual tests in debug mode
+    When I run `sf push -r individual_test -d`
+    Then the exit status should be 0
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
+    And the output should match:
+    """
+    ^INFO: Deploying and Testing code to env_a:  $
+    ^$
+    ^Buildfile: .*$
+    ^$
+    ^deployAndTestAllCode:$
+    """
+    And the output should match /Running Test/
+    And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/
+
+  Scenario: Push code to a sandbox with a build number
+    Given I set the environment variables to:
+      | variable                  | value                |
+      | SFDT_VERSION_FILE         | version_file         |
+      | SFDT_BUILD_NUMBER_PATTERN | build_number_pattern |
+    When I watch "sfdt_git_dir/sfdt_src_dir/version_file" 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 "test_file" should contain "123456789"
+    And the file "sfdt_git_dir/sfdt_src_dir/version_file" should contain "build_number_pattern"
+    And the output should match:
+    """
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
+    ^INFO: Creating destructive changes xml$
+    ^INFO: Deploying code to env_a:.*OK$
+    """
+
+  Scenario: Push code to a sandbox with the commit hash stamped into a version file
+    Given I set the environment variables to:
+      | variable                  | value                |
+      | SFDT_VERSION_FILE         | version_file         |
+      | SFDT_COMMIT_HASH_PATTERN  | commit_hash_pattern  |
+    When I watch "sfdt_git_dir/sfdt_src_dir/version_file" for changes and copy to "test_file"
+    And I run `sf push`
+    Then the exit status should be 0
+    And the file "test_file" should not contain "commit_hash_pattern"
+    And the file "sfdt_git_dir/sfdt_src_dir/version_file" should contain "commit_hash_pattern"
+    And the output should match:
+    """
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com to temporary directory to generate destructiveChanges.xml.*OK$
+    ^INFO: Creating destructive changes xml$
+    ^INFO: Deploying code to env_a:.*OK$
+    """
+
+  Scenario: Push code to a sandbox with the repo not being cloned it should point the user to run sf config
+    When I delete the repository directory
+    And I run `sf push -d`
+    Then the exit status should be 1
+    And the output should match:
+    """
+    ^ERROR: The source directory .* is not a valid salesforce source directory
+    """
+
+  Scenario: Push code to a sandbox specifying a different URL
+    Given I set the environment variables to:
+      | variable             | value                                                   |
+      | SFDT_SALESFORCE_URL  | https://invalid_url.salesforce.com |
+    When I run `sf push -d`
+    Then the exit status should be 1
+    And the output should match:
+    """
+    .*Failed to login: Failed to send request to https://invalid_url.salesforce.com.*
+    """
+  @new
+  Scenario: Push code to a sandbox and trigger individual tests in debug mode
+    When I run `sf push -r individual_test -d`
+    Then the exit status should be 0
+    And a file named "sfdt_git_dir/sfdt_src_dir/destructiveChanges.xml" should exist
+    And the output should match:
+    """
+    ^INFO: Deploying and Testing code to env_a:  $
+    ^$
+    ^Buildfile: .*$
+    ^$
+    ^deployAndTestCode:$
+    """
+    And the output should match /Running Test: individual_test/
+    And the output should match /DEPLOYMENT SUCCEEDED.*BUILD SUCCESSFUL/

data/features/support/env.rb

@@ -3,7 +3,7 @@ require 'filewatcher'
 require 'git'
 
 # Load configuratiohn
-config = YAML::load(File.open('config.yaml'))
+config = YAML::load(File.open('cucumber-config.yaml'))
 
 # Cucumber / aruba configuration parameters
 Before do

data/features/support/hooks.rb

@@ -1,4 +1,4 @@
-config = YAML::load(File.open('config.yaml'))
+config = YAML::load(File.open('cucumber-config.yaml'))
 
 When /^I type my salesforce (.*)$/ do |input|
   raise "Please create credentials.yaml" if config[input.to_sym].nil? 

data/lib/salesforcedeploytool/app.rb

@@ -3,39 +3,49 @@ module SalesforceDeployTool
   class App
 
     attr_accessor :build_number
-    attr_accessor :test
+    attr_accessor :run_all_tests
 
     def initialize config
      
       # Config file validation:
       ( @git_repo = config[:git_repo] ).nil? and raise "Invalid Config: git_repo not found"
       ( @git_dir = config[:git_dir] ).nil? and raise "Invalid Config: git_dir not found"
+      ( @src_dir = config[:src_dir] ).nil? and raise "Invalid Config: src_dir not found"
       ( @sandbox = config[:sandbox] ).nil? and raise "Invalid Config: sandbox not found"
-      ( @password = config[:password] ).nil? and raise "Invalid Config: password not found, please run `sf config`"
       ( @username = config[:username] ).nil? and raise "Invalid Config: username not found, please run `sf config`"
       ( @password = config[:password] ).nil? and raise "Invalid Config: password not found, please run `sf config`"
 
       # Parameter Normalization
-      @git_dir = File.expand_path config[:git_dir]
-      @tmp_dir = File.expand_path config[:tmp_dir]
-      @version_file = File.join(@git_dir,config[:version_file]) if !config[:version_file].nil?
-      @deploy_ignore_files = config[:deploy_ignore_files].map {|f| File.expand_path File.join(config[:git_dir],f)} if ! config[:deploy_ignore_files].nil?
+      @git_dir = File.expand_path(@git_dir)
+      @full_src_dir = File.join(@git_dir,@src_dir)
+      @version_file = File.join(@full_src_dir,config[:version_file]) if !config[:version_file].nil?
+      @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]
-      @buildxml_dir = config[:buildxml_dir]
       @username = @sandbox == 'prod' ? @username : @username + '.' + @sandbox 
       @server_url = config[:salesforce_url]
 
       # Defaults
+      @run_tests = []
       @debug ||= config[:debug]
-      @test ||= config[:test]
       @build_number ||= 'N/A'
       @version_file ||= false
-      @buildxml_dir ||= ''
       @build_number_pattern ||= false
       @commit_hash_pattern ||= false
       @deploy_ignore_files ||= []
 
+      # Template dir
+      buildxml_path = File.join($:.select {|x| x.match(/salesforce-deploy-tool/) },'..','tpl','build.xml.erb')
+      @buildxml_erb = File.read(buildxml_path)
+
+
+    end
+
+    # @run_tests can't be nil
+    def run_tests= value
+      value ||= []
+      raise "ArgumentError" if value.class != Array
+      @run_tests = value 
     end
 
     def set_version
@@ -78,7 +88,7 @@ module SalesforceDeployTool
 
     def clean_git_dir
 
-      Dir[File.join(@git_dir,'src','*')].each do |dir|
+      Dir[File.join(@full_src_dir,'*')].each do |dir|
         FileUtils.rm_rf dir unless dir =~ /.*package.xml$/
       end
 
@@ -86,7 +96,14 @@ module SalesforceDeployTool
 
     def pull
 
+      # 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
@@ -94,8 +111,6 @@ module SalesforceDeployTool
 
       full_cmd = env_vars + cmd
 
-      Dir.chdir File.join(@git_dir,@buildxml_dir)
-
       exec_options = {
         :stderr => @debug,
         :stdout => @debug,
@@ -123,11 +138,15 @@ module SalesforceDeployTool
 
     def push
 
-      # Working dir
-      Dir.chdir File.join(@git_dir,@buildxml_dir)
+      # 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
@@ -146,7 +165,16 @@ module SalesforceDeployTool
         exec_options[:failmsg]  =   nil
       end
 
-      cmd = @test ? " ant deployAndTestCode" : " ant deployCode"
+      if @run_all_tests  
+        cmd = " ant deployAndTestAllCode" 
+      else
+        if @run_tests
+          cmd = " ant deployAndTestCode"
+        else
+          cmd = " ant deployCode"
+        end
+      end
+        
       full_cmd = env_vars + cmd
 
       # Delete files to be ignored:

data/lib/salesforcedeploytool/cli.rb

@@ -0,0 +1,242 @@
+
+module SalesforceDeployTool
+
+  class CLI
+
+    include Commander::Methods
+
+    def run config
+
+      # Normalize file paths:
+      config[:git_dir] = File.expand_path config[:git_dir]
+      full_src_dir = File.join(config[:git_dir],config[:src_dir])
+
+      # If the repository is not cloned then fail:
+      if !File.exists?(full_src_dir) && ['pull','push'].include?(ARGV[0]) && !File.exists?(File.join(full_src_dir,"package.xml"))
+        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'
+
+      # Commands:
+      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.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|
+
+          # short flag mapping
+          options.sandbox = options.s if options.s
+
+          # Parameter validation:
+          if options.sandbox.nil? and config[:sandbox].nil?
+            puts "error: please specify sandbox using --sandbox or sf sandbox"
+            exit 1
+          end
+          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
+
+          # Initialize
+          sfdt = SalesforceDeployTool::App.new config
+
+          # Clean all files from repo
+          sfdt.clean_git_dir unless options.append
+
+          # Pull the changes
+          print "INFO: Pulling changes from #{config[:sandbox]} using url #{config[:salesforce_url]}  "
+          print "\n\n" if options.debug
+          sfdt.pull
+          sfdt.clean_version
+
+        end
+
+      end
+
+      command :push do |c|
+        c.syntax = 'sf push [options]'
+        c.summary = 'Push code into a sandbox'
+        c.description = ''
+        c.example 'description', "Push the code that is located into #{config[:git_dir]} into the active sandbox"
+        c.option "--sandbox NAME", "-s NAME", "use 'prod' to deploy production or sandbox name"
+        c.option "--debug", "Verbose output"
+        c.option "--exclude CSV_LIST", "-x CSV_LIST", "a CSV list of metadata to exclude when creating destructiveChange.xml"
+        c.option "--append", "Disable destructive change and do an append deploy"
+        c.option "--build_number NUMBER","Record build number on version file"
+        c.option "--run-all-tests", "-T", "Deploy and test"
+        c.option "--run-tests CSV_LIST", "-r CSV_LIST", "a CSV list of individual classes to run tests"
+        c.action do |args, options|
+
+          # short flag mapping
+          options.run_all_tests = true if options.T
+          options.run_tests = options.r if options.r
+          options.exclude = options.x if options.x
+          options.sandbox = options.s if options.s
+
+          # Parameter validation:
+
+          if options.run_all_tests and options.run_tests
+            puts "warning: --run-tests is ignored as --test has been declared "
+          end
+
+          if options.sandbox.nil? and config[:sandbox].nil?
+            puts "error: please specify the sandbox to pull from using --sandbox"
+            exit 1
+          end
+          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
+
+          # Initialize
+          sfdt = SalesforceDeployTool::App.new config
+
+          # Remove destructive change if there is one
+          destructive_change_file = File.join(full_src_dir,'destructiveChanges.xml')
+          FileUtils.rm destructive_change_file if File.exists? destructive_change_file
+
+          if ! options.append
+            # Pull changes from sandbox to temporary directory:
+            config_tmp = config.clone
+            config_tmp[:git_dir] = File.join(config[:tmp_dir],'repo_copy')
+            FileUtils.cp_r config[:git_dir],config_tmp[:git_dir]
+            sfdt_tmp = SalesforceDeployTool::App.new config_tmp
+            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" )
+            sfdt_tmp.pull
+
+            # Create destructiveChanges.xml
+            puts "INFO: Creating destructive changes xml"
+            dc_gen = Dcgen::App.new
+            dc_gen.master = full_src_dir
+            dc_gen.destination = File.join(config_tmp[:git_dir],config_tmp[:src_dir])
+            dc_gen.output = destructive_change_file
+            dc_gen.exclude = options.exclude.split(',') unless options.exclude.nil?
+            dc_gen.verbose = false if not options.debug
+            dc_gen.generate_destructive_changes
+
+          end
+
+          # Push code to sandbox
+          begin
+            # Set version
+            sfdt.build_number = options.build_number if not options.build_number.nil?
+            sfdt.set_version
+
+            # Enable test if option enabled
+            sfdt.run_all_tests = options.run_all_tests.nil? ? false : true
+            sfdt.run_tests = options.run_tests.split(',') unless options.run_tests.nil?
+
+            # Push
+            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" )
+            sfdt.push
+          ensure
+            sfdt.clean_version
+          end
+
+        end
+      end
+
+      command :sandbox do |c|
+        c.syntax = 'sf sandbox SANDBOX_NAME'
+        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"
+          end
+
+          if args.size == 0
+            if ! config[:sandbox].nil?
+              puts "sandbox: " + config[:sandbox]
+              exit 0
+            else
+              puts "WARN: Sandbox has not been set yet"
+              exit 1
+            end
+          end
+          File.open(File.expand_path(SANDBOX_CONFIG_FILE),'w').write args.first
+
+        end
+      end
+
+      command :config do |c|
+        c.syntax = 'sf config'
+        c.summary = 'Go through the configuration wizard to config your environment'
+        c.action do |args, options|
+
+          if args.size != 0
+            puts "error: Wrong number of arguments"
+          end
+
+          config_new = {}
+
+          config_new[:username] = ask "Please enter your SalesForce production login user name" do |q|
+            q.validate = /^\S+@\S+$/ 
+          end.to_s
+
+          config_new[:password] = ask "Please enter your Salesforce production password" do |q|
+            q.echo = "x"
+          end.to_s
+
+          git_name = ask "Please enter your Full name to be used as commit owner on GIT" do |q|
+            q.validate = /^[a-zA-Z\s]+$/ 
+          end
+
+          git_email = ask "Please enter your email to be used as commit email on GIT" do |q|
+            q.validate = /^\S+@\S+$/ 
+          end
+
+          config[:sandbox] = ask "Please enter your sandbox so to be used as default when push and pull" do |q|
+            q.validate = /^[a-zA-Z]+$/ 
+          end
+
+          %x[git config --global user.email "#{git_email}"]
+          %x[git config --global user.name "#{git_name}"]
+
+          config[:username] = config_new[:username]
+          config[:password] = config_new[:password]
+
+          File.open(File.expand_path(SANDBOX_CONFIG_FILE),'w').write config[:sandbox]
+          File.open(File.expand_path(CONFIG_FILE),'w').write config_new.to_yaml
+
+          # Initialize
+          sfdt = SalesforceDeployTool::App.new config
+
+          # Clone
+          sfdt.clone
+
+        end
+      end
+
+      default_command :help
+
+      run!
+
+    end
+
+  end
+
+end
+
+

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

data/lib/salesforcedeploytool.rb

@@ -1,6 +1,10 @@
 require "rubygems"
+require "commander"
+require 'pp'
+require 'yaml'
+require 'fileutils'
+require 'tmpdir'
 require "pathname"
-require "commander/import"
 require "git"
 require "pp"
 require "colorize"
@@ -13,4 +17,5 @@ require "stringio"
 require "salesforcedeploytool/version"
 require "salesforcedeploytool/functions"
 require "salesforcedeploytool/app"
-
+require "salesforcedeploytool/cli"
+require "erb"

data/tpl/build.xml.erb

@@ -0,0 +1,59 @@
+<project name="Sample usage of Salesforce Ant tasks" default="test" basedir="." xmlns:sf="antlib:com.salesforce">
+
+    <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}" 
+        password="${env.SF_PASSWORD}" 
+        serverurl="${env.SF_SERVERURL}" 
+        deployRoot="${env.SF_SRC_DIR}" 
+        maxPoll="200" 
+        rollbackOnError="true" >
+      </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" 
+        rollbackOnError="true" >
+<% @run_tests.each do |test| -%>
+      <runTest><%= test %></runTest>
+<% end -%>
+      </sf:deploy>
+    </target>
+
+    <target name="deployAndTestAllCode">
+      <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"
+      />
+    </target>
+
+</project>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,7 @@ files:
 - README.md
 - Rakefile
 - bin/sf
+- cucumber-config.yaml-tpl
 - features/config.feature
 - features/misc.feature
 - features/pull.feature
@@ -158,9 +159,11 @@ files:
 - features/support/hooks.rb
 - lib/salesforcedeploytool.rb
 - lib/salesforcedeploytool/app.rb
+- lib/salesforcedeploytool/cli.rb
 - lib/salesforcedeploytool/functions.rb
 - lib/salesforcedeploytool/version.rb
 - salesforce-deploy-tool.gemspec
+- tpl/build.xml.erb
 homepage: ''
 licenses:
 - MIT