salesforce-deploy-tool 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebac6689830eab2da274c6389bb65580fba92876
-  data.tar.gz: 9a949b5e006ced376b50aff46bf5a2af155c1d4f
+  metadata.gz: 43f650e68a92b0066ae663ec5d6057821912527a
+  data.tar.gz: 1a77815ff97ee041e48d58e9b8124797553dd0f2
 SHA512:
-  metadata.gz: a9aeb58de065efad092a41df237bd25419e3e37541faa7814213e2f077e04f3d11263f2fbafac86e1722233cdfa494054f767ff2470bce59690ac7c40fba8f4a
-  data.tar.gz: 266b7539af2136799f8bda73a4ef6a69f4114cec359a1a1343bceec87cb4dd386c50a7b586e68659a16bb210dc9f3930de1e72777a8b0bf349abf7c6dacc4cda
+  metadata.gz: 891d10f43d639f2f16fbded39c1a5de7a529b90490fbcae678a89ad415317c7df1c812e68753ef88d9e2fe1402337fbeb3e87d2f76a88f6a4c6413393ece75bd
+  data.tar.gz: 6f1a2a89ec8fc250f319a90869476c7fd164c19e1b1e66f4bfe399f58615cbce8473591712532d00ec7bccc9ad9eb28e08503e6ddeb7683bcd4ca8181001adee

data/bin/sf

@@ -38,19 +38,28 @@ config[:username]              =  ENV["SFDT_USERNAME"]              ||  config[:
 config[:password]              =  ENV["SFDT_PASSWORD"]              ||  config[:password]
 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] || ''
 
 # Minimal config validation
 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: username not found in #{GLOBAL_CONFIG_FILE} or through SFDT_USERNAME" if config[:username].nil?
+abort "Config error: password not found in #{GLOBAL_CONFIG_FILE} or through SFDT_PASSWORD" if config[:password].nil?
+
+# If the repository is not cloned then fail:
+if !File.exists?(config[:git_dir]) && ARGV[0] != 'config'
+  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]
 
 # Read sandbox environment
-
 begin
   sandbox = File.open(File.expand_path(SANDBOX_CONFIG_FILE)).read
 rescue

data/features/push.feature

@@ -122,18 +122,37 @@ Feature: Push code to salesforce
     ^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 environment is not properly configured, please run sf config to clone the repo and setup the credentials$
+    """
+
   @new
-  Scenario: Push code to a sandbox excluding files
+  Scenario: Push code to a sandbox specifying a different URL
     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
+      | 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:
     """
-    ^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$
+    .*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$
+#    """

data/features/support/hooks.rb

@@ -5,6 +5,10 @@ When /^I type my salesforce (.*)$/ do |input|
   type(config[input.to_sym])
 end
 
+When /^I delete the repository directory/ do
+  FileUtils.rm_rf File.join 'tmp', 'aruba', ENV['SFDT_GIT_DIR']
+end
+
 When /^I watch "(.+)" for changes and copy to "(.+)"$/ do |file,dest|
   file = File.join('tmp','aruba',file)
   dest = File.join('tmp','aruba',dest)

data/lib/salesforcedeploytool/app.rb

@@ -24,7 +24,7 @@ module SalesforceDeployTool
       @commit_hash_pattern = config[:commit_hash_pattern]
       @buildxml_dir = config[:buildxml_dir]
       @username = @sandbox == 'prod' ? @username : @username + '.' + @sandbox 
-      @server_url = @sandbox == 'prod' ? 'https://login.salesforce.com' : 'https://test.salesforce.com'
+      @server_url = config[:salesforce_url]
 
       # Defaults
       @debug ||= config[:debug]

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler