salesforce-deploy-tool 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 999b8948c7bec86caa12cc3b4094ce127a2c845c
-  data.tar.gz: 3aad5f771f486b1b804a30a7c8ef983af3e4df24
+  metadata.gz: d5db1eaa074135fc75a02de5c4f8361f397d6ee1
+  data.tar.gz: 5e55c7cec8d432a42fe6558296085cd8d021540f
 SHA512:
-  metadata.gz: b9c4d24562d7a55054f8b6f6a46e476883e03ba997aeeeeb67edf689d589db8816f0dad61053cfee435f6b6c723b90f90c6dd0651ae3c09faa2b88ac1961ba1f
-  data.tar.gz: 02f4229e6a3666e9068dd58143e507a27bd55c7bab4d817a18c9e588cfd3294faa1703b0458761199f3dccb0675978b8441baabdcf448f0ea5c749dceae3c90c
+  metadata.gz: 22819aa51eda3ad39e934e263ff9848ed6155ae689ea3228964e8c29f0f43b53738bde9fd77bc31a7d2aaca075e86a48fb09a9f26fc9615613e1d26fccd9867d
+  data.tar.gz: 6014ad593f7d21a88a80af8a7ed25fcd9f8d9223b41eae1b139b72c112d984cef95d2ca3888f64e73992abe20a128d03603c681b558a502348ebe81bd7948989

data/bin/sf

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
-require 'yaml'
-require 'fileutils'
 require 'pp'
+require 'yaml'
 
 CONFIG_DIR = '~/.sf'
 CONFIG_FILE = '~/.sf/credentials.yaml'
 GLOBAL_CONFIG_FILE = '~/.sf/salesforce.yaml'
 SANDBOX_CONFIG_FILE = '~/.sf/salesforce.sbox'
 
+# Load configurations, if directories and files don't 
+# exists, create them empty
+
 FileUtils.mkdir File.expand_path CONFIG_DIR if not Dir.exists? File.expand_path CONFIG_DIR
 
 config = {}
@@ -21,6 +23,19 @@ config = {}
   end
 end
 
+# Grab variables from env if not in the config files
+config[:git_dir] = ENV["GIT_DIR"] || config[:git_dir]
+config[:tmp_dir] = ENV["TMP_DIR"] || config[:tmp_dir]
+config[:version_file] = ENV["VERSION_FILE"] || config[:version_file]
+config[:build_number_pattern] = ENV["BUILD_NUMBER_PATTERN"] || config[:build_number_pattern]
+config[:commit_hash_pattern] = ENV["COMMIT_HASH_PATTERN"] || config[:commit_hash_pattern]
+config[:git_repo] = ENV["GIT_REPO"] || config[:git_repo]
+config[:deploy_ignore_files] = ENV["DEPLOY_IGNORE_FILES"].split(',') || config[:deploy_ignore_files]
+config[:username] = ENV["USERNAME"] || config[:username]
+config[:password] = ENV["PASSWORD"] || config[:password]
+
+# Read sandbox environment
+
 begin
   sandbox = File.open(File.expand_path(SANDBOX_CONFIG_FILE)).read
 rescue
@@ -120,9 +135,19 @@ command :push do |c|
     config[:debug] = options.debug.nil? ? false : true
     config[:test] = options.test.nil? ? false : true
 
+    # Parameter Normalization
+    config[:git_dir] = File.expand_path config[:git_dir]
+    config[:tmp_dir] = File.expand_path config[:tmp_dir]
+    config[:version_file] = File.expand_path config[:version_file]
+    config[:deploy_ignore_files].map! {|f| File.expand_path File.join(config[:git_dir],f)}
+
     # Initialize
     sfdt = SalesforceDeployTool::App.new config
 
+    # Remove destructive change if there is one
+    DESTRUCTIVE_CHANGE_FILE = File.join(config[:git_dir],'src','destructiveChanges.xml')
+    FileUtils.rm DESTRUCTIVE_CHANGE_FILE if File.exists? DESTRUCTIVE_CHANGE_FILE
+
     # Push the code without destructiveChanges.xml. This step is allways necessary
     # even when it is a destructive change. This is because if a class is referencing
     # a field to be deleted, then we first need to push the class to remove that 
@@ -146,7 +171,7 @@ command :push do |c|
       dc_gen = Dcgen::App.new
       dc_gen.master = File.join(config[:git_dir],'src')
       dc_gen.destination = File.join(config[:tmp_dir],'src')
-      dc_gen.output = File.join(config[:git_dir],'src','destructiveChanges.xml')
+      dc_gen.output = DESTRUCTIVE_CHANGE_FILE
       dc_gen.exclude = options.exclude.split(',') unless options.exclude.nil?
 
       # Capture stdout when running generate_destructive_Changes, TODO: fix dcgen

data/lib/salesforcedeploytool.rb

@@ -3,6 +3,7 @@ require "commander/import"
 require "git"
 require "pp"
 require "colorize"
+require "fileutils"
 require "logger"
 require "open3"
 require "yaml"

data/lib/salesforcedeploytool/app.rb

@@ -25,8 +25,6 @@ module SalesforceDeployTool
       @username = @sandbox == 'prod' ? config[:username] : config[:username] + '.' + @sandbox 
       @server_url = @sandbox == 'prod' ? 'https://login.salesforce.com' : 'https://test.salesforce.com'
 
-      self.clone if ! Dir.exists? File.join(@git_dir,'.git')
-
     end
 
     def commit_hash

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler