salesforce-deploy-tool 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba29983f91588b0c40f5822c403c81b303d68b06
-  data.tar.gz: 83dcecf2534b368e47fecd87ecd2621963fe044e
+  metadata.gz: cbe3021d67e55804a0f2815e685d08c2ba4cc6e4
+  data.tar.gz: 9d80f486d15a382c4956992ec4c86cce4085133f
 SHA512:
-  metadata.gz: 7a7af88b26b18ff95d8ef3e426aefd8a5945364bc00a33d8f378ba906a15ddd20060b8e9bd409e7d16332d1c1e9ab831ffa0f5d3887cbb44c799d96f214b6272
-  data.tar.gz: 75045aad5e03022740490c82c2317cb31715072fd7eb7ed216e98c28013080cc7e86683fe50aba9eae53f87e6c65b4816b88a55490c8d04cd8e2190814a1e018
+  metadata.gz: 608e4a229fcdb828cc15c8b16320a85b3c0f1fc4202f3c2961863cb09a8a9859311b77c90f5a90d181d270957dfbe06c3a2cdc4fe89e259a7beed93f26565777
+  data.tar.gz: 81ac889d4979f9e81eddb4216770b65d0921e40a6225f41def605bd28e264b79ce74278521fb3f4c89849efd81dd2dd5c4d7471a0a80184e1e6b9b3f27036830

data/bin/sf

@@ -27,6 +27,13 @@ config = {}
   end
 end
 
+# Read sandbox environment
+begin
+  sandbox = File.open(File.expand_path(SANDBOX_CONFIG_FILE)).read
+rescue
+  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]
@@ -36,11 +43,9 @@ config[:commit_hash_pattern]   =  ENV["SFDT_COMMIT_HASH_PATTERN"]   ||  config[:
 config[:git_repo]              =  ENV["SFDT_GIT_REPO"]              ||  config[:git_repo]
 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(',')
 
-# The salesforce URL, first from environment varialbes, second from config file , thierd defaults:
-config[:salesforce_url] = ENV["SFDT_SALESFORCE_URL"] || config[:salesforce_url] ||(  @sandbox == 'prod' ? 'https://login.salesforce.com' : 'https://test.salesforce.com' )
-
 # Default values
 config[:buildxml_dir] = ENV["SFDT_BUILDXML_DIR"] || config[:buildxml_dir] || ''
 
@@ -51,7 +56,7 @@ 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? && ARGV[0] != 'config'
 
 # If the repository is not cloned then fail:
-if !File.exists?(config[:git_dir]) && ARGV[0] != 'config'
+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
 
@@ -59,13 +64,6 @@ end
 config[:git_dir] = File.expand_path config[:git_dir]
 config[:tmp_dir] = File.expand_path config[:tmp_dir]
 
-# Read sandbox environment
-begin
-  sandbox = File.open(File.expand_path(SANDBOX_CONFIG_FILE)).read
-rescue
-  sandbox = nil
-end
-
 require 'salesforcedeploytool'
 
 program :version, SalesforceDeployTool::VERSION
@@ -92,6 +90,12 @@ command :pull do |c|
     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
 
@@ -99,7 +103,9 @@ command :pull do |c|
     sfdt.clean_git_dir unless options.append
 
     # Pull the changes
-    sfdt.pull "INFO: Pulling changes from #{config[:sandbox]}  "
+    print "INFO: Pulling changes from #{config[:sandbox]} using url #{config[:salesforce_url]} "
+    print "\n\n" if options.debug
+    sfdt.pull
     sfdt.clean_version
 
   end
@@ -133,6 +139,12 @@ command :push do |c|
     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
 
@@ -147,7 +159,8 @@ command :push do |c|
       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
-      sfdt_tmp.pull "INFO: Pulling changes from #{config[:sandbox]} to temporary directory #{config[:tmp_dir]} to generate destructiveChanges.xml  "
+      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"
@@ -171,6 +184,7 @@ command :push do |c|
       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

data/features/misc.feature

@@ -0,0 +1,11 @@
+@misc
+Feature: Misc features related to sf
+
+  In order to use sf
+  As a user using 
+  I want to be able to run sf misc functionality
+
+  Scenario: I should be able to see the version of sf
+    When I run `sf -v` interactively
+    Then the exit status should be 0
+    And the output should match /sf \d+\.\d+.\d+/

data/features/pull.feature

@@ -3,26 +3,57 @@ Feature: Pull code from salesforce
 
   As a developer
   I want to be able to retrieve code from a sandbox
-  
+
   Scenario: Retrieve code from the default sandbox
     When I run `sf pull`
     Then the exit status should be 0
-    And the output should match /INFO: Pulling changes from env_a.*OK/
+    And the output should match:
+    """
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com.*OK
+    """
 
   Scenario: Retrieve code from a specific sandbox
     When I run `sf pull -s env_b`
     Then the exit status should be 0
-    And the output should match /INFO: Pulling changes from env_b.*OK/
+    And the output should match:
+    """
+    ^INFO: Pulling changes from env_b using url https://test.salesforce.com.*OK
+    """
+
+  Scenario: Retrieve code from a sandbox using a specific URL
+    Given I set the environment variables to:
+      | variable             | value                                                   |
+      | SFDT_SALESFORCE_URL  | https://invalid_url.salesforce.com |
+    When I run `sf pull`
+    Then the exit status should be 1
+    And the output should match:
+    """
+    ^INFO: Pulling changes from env_a using url https://invalid_url.*
+    """
+
+  Scenario: Retrieve code from a production
+    When I run `sf pull -s prod`
+    Then the exit status should be 0
+    And the output should match:
+    """
+    ^INFO: Pulling changes from prod using url https://login.salesforce.com.*OK$
+    """
 
   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 output should contain "INFO: Pulling changes from env_a"
     And the output should contain "BUILD SUCCESSFUL"
+    And the output should match:
+    """
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com.*
+    """
 
   Scenario: Retrieve code from a specific sandbox with debug output
     When I run `sf pull -s env_a -d`
     Then the exit status should be 0
-    And the output should contain "INFO: Pulling changes from env_a"
     And the output should contain "BUILD SUCCESSFUL"
+    And the output should match:
+    """
+    ^INFO: Pulling changes from env_a using url https://test.salesforce.com.*$
+    """
 

data/features/push.feature

@@ -10,7 +10,7 @@ Feature: Push code to salesforce
     And a file named "dcxml_location/destructiveChanges.xml" should exist
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a 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 .*tmp_repo.* to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_a:.*OK$
     """
@@ -21,11 +21,23 @@ Feature: Push code to salesforce
     And a file named "dcxml_location/destructiveChanges.xml" should exist
     And the output should match:
     """
-    ^INFO: Pulling changes from env_b 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 .*tmp_repo.* to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_b:.*OK$
     """
 
+  Scenario: Push code to production should use the url login.salesorce.com
+    Given I set the environment variables to:
+      | variable      | value                |
+      | SFDT_USERNAME | invalid_user         |
+      | SFDT_PASSWORD | invalid_pass         |
+    When I run `sf push -s prod`
+    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.*$
+    """
+
   Scenario: Push code to a sandbox with debug information
     When I run `sf push -d`
     Then the exit status should be 0
@@ -44,7 +56,7 @@ Feature: Push code to salesforce
     And a file named "dcxml_location/destructiveChanges.xml" should exist
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a 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 .*tmp_repo.* to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying and Testing code to env_a:.*OK$
     """
@@ -73,6 +85,7 @@ Feature: Push code to salesforce
     ^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
@@ -100,7 +113,7 @@ Feature: Push code to salesforce
     And the file "sfdt_git_dir/version_file" should contain "build_number_pattern"
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a 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 .*tmp_repo.* to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_a:.*OK$
     """
@@ -117,7 +130,7 @@ Feature: Push code to salesforce
     And the file "sfdt_git_dir/version_file" should contain "commit_hash_pattern"
     And the output should match:
     """
-    ^INFO: Pulling changes from env_a 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 .*tmp_repo.* to generate destructiveChanges.xml.*OK$
     ^INFO: Creating destructive changes xml$
     ^INFO: Deploying code to env_a:.*OK$
     """
@@ -131,7 +144,6 @@ Feature: Push code to salesforce
     ^ERROR: The environment is not properly configured, please run sf config to clone the repo and setup the credentials$
     """
 
-  @new
   Scenario: Push code to a sandbox specifying a different URL
     Given I set the environment variables to:
       | variable             | value                                                   |
@@ -143,16 +155,4 @@ Feature: Push code to salesforce
     .*Failed to login: Failed to send request to https://invalid_url.salesforce.com.*
     """
 
-#  Scenario: Push code to a sandbox excluding files
-#    Given I set the environment variables to:
-#      | variable                  | value                                                   |
-#      | SFDT_DEPLOY_IGNORE_FILES  | src/layouts/test.layout,src/layouts/another_test.layout |
-#    When I run `sf push`
-#    #TODO: Then the files listed in SFDT_DEPLOY_IGNORE_FILES should be ignored by sf when deploying 
-#    Then the exit status should be 0
-#    And the output should match:
-#    """
-#    ^INFO: Pulling changes from env_a to temporary directory .*tmp_repo.* to generate destructiveChanges.xml.*OK$
-#    ^INFO: Creating destructive changes xml$
-#    ^INFO: Deploying code to env_a:.*OK$
-#    """
+    # TODO: Scenario: Push code to a sandbox excluding files

data/lib/salesforcedeploytool/app.rb

@@ -76,17 +76,15 @@ module SalesforceDeployTool
 
     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
@@ -102,13 +100,11 @@ module SalesforceDeployTool
         :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
@@ -150,10 +146,6 @@ module SalesforceDeployTool
         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
 

data/lib/salesforcedeploytool/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - Rakefile
 - bin/sf
 - features/config.feature
+- features/misc.feature
 - features/pull.feature
 - features/push.feature
 - features/support/env.rb
@@ -186,6 +187,7 @@ specification_version: 4
 summary: A tool to help you at deploying and pulling code and metadata from salesforce
 test_files:
 - features/config.feature
+- features/misc.feature
 - features/pull.feature
 - features/push.feature
 - features/support/env.rb