salesforce-deploy-tool 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9312bcf7bdcde9cf1de413cf832eea3b994bb528
-  data.tar.gz: 37aa56ed035fb246e3746805b0155c2fecea5401
+  metadata.gz: d679e29b245a57fd3d2b37e4457df5a6336122aa
+  data.tar.gz: 6eb175a4de7cf17a15e5bb4cdb45a47d77f158de
 SHA512:
-  metadata.gz: 9a967b03aa7e93240372f8251212b264336d3082015df4aa1ecd0c14dd6fb5760ce6072ee0dc696dafbb84d6cd1011e64ce73182d7671039bc4f432a654ea9bf
-  data.tar.gz: 4129b5575a9ddbc19863712777b98c5c69f34069a4c5329a83cc5bee5359ac208d7af38b8b67ce4738c5a4dfe393d9d34701c361c02f8cd9ea0b043eb7850b7f
+  metadata.gz: 00b450d8069c69f3cf53d9c962dc062cafe64006fb0780f4e81aa0299fcd63c6d247c63a9b36a19d34541fc543ab5ffd086ff2d5df91ec2d41e34040f7159759
+  data.tar.gz: c53191a04faad0833c4adb2b45595d9b170f3e4db7fa45beb6fea83f4586c95b83d0c415b4cb5bc3b51bac77cb9ef11099d44ede8ff1ca42ba1c3c98bc0743e7

data/bin/sf

@@ -40,8 +40,10 @@ command :init do |c|
   c.option "--sandbox NAME", "-s NAME", "use 'prod' to deploy production or sandbox name"
   c.action do |args, options|
 
-    # Parameter validation:
+    # 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
@@ -67,9 +69,12 @@ command :pull do |c|
   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 the sandbox to pull from using --sandbox"
+      puts "error: please specify sandbox using --sandbox or sf sandbox"
       exit 1
     end
     config[:sandbox] = options.sandbox || sandbox
@@ -98,9 +103,10 @@ command :push do |c|
   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 for test, so that not conflicts with trace
+    # short flag mapping
     options.test = true if options.T
     options.exclude = options.x if options.x
     options.sandbox = options.s if options.s
@@ -144,6 +150,7 @@ command :push do |c|
     end
 
     # Finally push:
+    sfdt.build_number = options.build_number if not options.build_number.nil?
     sfdt.push
 
   end

data/lib/salesforcedeploytool/app.rb

@@ -2,23 +2,55 @@ module SalesforceDeployTool
 
   class App
 
-    def initialize config
+    attr_accessor :build_number
 
-      @git_repo = config[:git_repo]
-      @git_dir = config[:git_dir]
-      @sandbox = config[:sandbox]
-      @username = @sandbox == 'prod' ? config[:username] : config[:username] + '.' + @sandbox 
-      @password = config[:password]
+    def initialize config
+      
       @debug = config[:debug]
       @test = config[:test]
-      @deploy_ignore_files = config[:deploy_ignore_files]
 
+      @build_number = 'N/A'
+      ( @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"
+      ( @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`"
+      ( @deploy_ignore_files = config[:deploy_ignore_files] ).nil? and raise "Invalid Config: deploy_ignore_files not found"
+      ( @build_number_pattern = config[:build_number_pattern] ).nil? and raise "Invalid Config: build_number_pattern not found"
+      ( @commit_hash_pattern = config[:commit_hash_pattern] ).nil? and raise "Invalid Config: commit_hash_pattern not found"
+
+      config[:version_file].nil? and raise "Invalid Config: version_file not found"
+      config[:username].nil? and raise "Invalid Config: username not found, please run `sf config`"
+
+      @version_file = File.join(@git_dir,config[:version_file])
+      @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
+
+      g = Git.open(@git_dir)
+
+      File.open(@version_file,'r+') do |file|
+        content = file.read
+        content.gsub!(/#{@build_number_pattern}/,@build_number)
+        content.gsub!(/#{@commit_hash_pattern}/,g.log.last.sha)
+        file.seek(0,IO::SEEK_SET)
+        file.truncate 0
+        file.write content
+      end if File.exists? @version_file
+
+    end
+
+    def clean_version
+
+      g = Git.open(@git_dir)
+      g.checkout @version_file
+
+    end
+
     def clone
 
       if Dir.exists? File.join(@git_dir,'.git')
@@ -74,12 +106,20 @@ module SalesforceDeployTool
 
       exit_code = myexec full_cmd, exec_options
 
+      clean_version
+
       exit exit_code if exit_code != 0
 
     end
 
     def push
 
+      # Working dir
+      Dir.chdir @git_dir
+
+      # Add the commit hash to the version file
+      commit_hash
+
       # Set env variables to run ant
       env_vars = ""
       env_vars += " SF_USERNAME=" + @username
@@ -107,15 +147,18 @@ module SalesforceDeployTool
       cmd = @test ? " ant deployAndTestCode" : " ant deployCode"
       full_cmd = env_vars + cmd
 
-      Dir.chdir @git_dir
-
       # Delete files to be ignored:
       @deploy_ignore_files.each do |file|
         FileUtils.rm file if File.exists? file
       end
 
+      # Push the code
       exit_code = myexec full_cmd, exec_options
 
+      # Clean changes on version file
+      clean_version
+
+      # exit with exit_code
       exit exit_code if exit_code != 0
 
     end

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

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