salesforce-deploy-tool 2.1.1 → 3.1.0

data/features/resources/repo/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/features/resources/repo/logs/HEAD

@@ -0,0 +1,10 @@
+0000000000000000000000000000000000000000 8709c1bfb261dedf83ab5793054940782c48b54f Juan Breinlinger <juan.brein@breins.net> 1421673202 +0000	commit (initial): initial commit
+8709c1bfb261dedf83ab5793054940782c48b54f d37b8a2c894dbe1839d9428a336806ee151c2e4d Juan Breinlinger <juan.brein@breins.net> 1421683182 +0000	push
+d37b8a2c894dbe1839d9428a336806ee151c2e4d ff8c6fa78f879d98393ca470a4ea07cae7221d38 Juan Breinlinger <juan.brein@breins.net> 1421830431 +0000	push
+ff8c6fa78f879d98393ca470a4ea07cae7221d38 41341113250717ca1d4e280cac7413074e110ceb Juan Breinlinger <juan.brein@breins.net> 1427455933 +0000	push
+41341113250717ca1d4e280cac7413074e110ceb 1db81d6385e52f1ac897d8c119a01537b1624c05 Juan Breinlinger <juan.brein@breins.net> 1427701644 +0100	push
+1db81d6385e52f1ac897d8c119a01537b1624c05 9350c5598f6bafd3aa1a6a6ceecec7f02a0b0203 Juan Breinlinger <juan.brein@breins.net> 1427701742 +0100	push
+9350c5598f6bafd3aa1a6a6ceecec7f02a0b0203 51f1b7da07050f62cd00f24774856a9d06d4fc47 Juan Breinlinger <juan.brein@breins.net> 1427701839 +0100	push
+51f1b7da07050f62cd00f24774856a9d06d4fc47 9154141b78af68bdeb8e9b79629012a720b6e8e5 Juan Breinlinger <juan.brein@breins.net> 1427702375 +0100	push
+9154141b78af68bdeb8e9b79629012a720b6e8e5 1d300e3c8d30b80bb88cfce2b16c3070488f0440 Juan Breinlinger <juan.brein@breins.net> 1433250117 +0100	push
+1d300e3c8d30b80bb88cfce2b16c3070488f0440 aac66ee0d404c124fbcafd32a054664de4fdd3da Juan Breinlinger <juan.brein@breins.net> 1433313758 +0100	push

data/features/resources/repo/logs/refs/heads/master

@@ -0,0 +1,10 @@
+0000000000000000000000000000000000000000 8709c1bfb261dedf83ab5793054940782c48b54f Juan Breinlinger <juan.brein@breins.net> 1421673202 +0000	commit (initial): initial commit
+8709c1bfb261dedf83ab5793054940782c48b54f d37b8a2c894dbe1839d9428a336806ee151c2e4d Juan Breinlinger <juan.brein@breins.net> 1421683182 +0000	push
+d37b8a2c894dbe1839d9428a336806ee151c2e4d ff8c6fa78f879d98393ca470a4ea07cae7221d38 Juan Breinlinger <juan.brein@breins.net> 1421830431 +0000	push
+ff8c6fa78f879d98393ca470a4ea07cae7221d38 41341113250717ca1d4e280cac7413074e110ceb Juan Breinlinger <juan.brein@breins.net> 1427455933 +0000	push
+41341113250717ca1d4e280cac7413074e110ceb 1db81d6385e52f1ac897d8c119a01537b1624c05 Juan Breinlinger <juan.brein@breins.net> 1427701644 +0100	push
+1db81d6385e52f1ac897d8c119a01537b1624c05 9350c5598f6bafd3aa1a6a6ceecec7f02a0b0203 Juan Breinlinger <juan.brein@breins.net> 1427701742 +0100	push
+9350c5598f6bafd3aa1a6a6ceecec7f02a0b0203 51f1b7da07050f62cd00f24774856a9d06d4fc47 Juan Breinlinger <juan.brein@breins.net> 1427701839 +0100	push
+51f1b7da07050f62cd00f24774856a9d06d4fc47 9154141b78af68bdeb8e9b79629012a720b6e8e5 Juan Breinlinger <juan.brein@breins.net> 1427702375 +0100	push
+9154141b78af68bdeb8e9b79629012a720b6e8e5 1d300e3c8d30b80bb88cfce2b16c3070488f0440 Juan Breinlinger <juan.brein@breins.net> 1433250117 +0100	push
+1d300e3c8d30b80bb88cfce2b16c3070488f0440 aac66ee0d404c124fbcafd32a054664de4fdd3da Juan Breinlinger <juan.brein@breins.net> 1433313758 +0100	push

data/features/resources/repo/objects/08/d159fb570535461d73a45322c66495b5025c20

@@ -0,0 +1,3 @@
+x
M��
+�0]�+B�榵�H�R�@ݧi�@�7�~���xvs�n�-�F6��dGt1Ԭ��QL�]x��v�l��QD����A#��X�W���Q'��8�M�P
+�Q��Y�:k�]&ur�5�v%������Uk����/	��"��:V

data/features/resources/repo/objects/1d/300e3c8d30b80bb88cfce2b16c3070488f0440

@@ -0,0 +1,2 @@
+x
���
+�0E]�+f/��1m"�ҿ�c��JL�ߴ���.�ÍK�se��*3$m���GrYCƎ�y4;9(�I���\��Vz7L�1HNd�t�*��VD4��i~mϥ�}�n���˃+�_���F��~O����]G)8�Dqں�Cn[!��ϙ��tN'

data/features/resources/repo/objects/1d/b81d6385e52f1ac897d8c119a01537b1624c05

@@ -0,0 +1,2 @@
+x
��A
+1=�sd&��"��_d'���FI"~��'x�C5մ<�y�`ٯzU�H�1�(�Y��yw쇘��

data/features/resources/repo/objects/24/f97074eaba38f18c29b4d89781a20bacd65bed

@@ -0,0 +1,2 @@
+x
u�QO� �}� �[pg��hL|3���J�-����evKy<~���]k\K���Fl��!{Q;[ѻ�S�V�Nۡ�������B���0 ɸ�S�Ƣ_����r[q����0A	�,H~��-3�j]r��
+gb�@k��6nV���D�����+g{&H9v��~���v�`i�aTA��/_���$�<BJHm�!�%��6����yw����M��F�ų���,���B���d�$��

data/features/resources/repo/objects/2c/0414f10c4cb61f2ae352d54f36e84b877d49b8

@@ -0,0 +1,3 @@
+x
u�MK�0�=�W��m���"i�E��R�O�iL�����|��B���<3�Lc\C���bw
+=���X�!%��Xt��ع��Tnd���a#&h!
��%���y��lK.ت�G��/�v�d&b��g\9��0Bʱk������؞���y@�Q�|��L&��
R�@�6~�䀽�)�.!>_/�Z���h�.�Zl&
+��O��7�̓�

data/features/resources/repo/objects/41/341113250717ca1d4e280cac7413074e110ceb

@@ -0,0 +1 @@
+x
��A� E]s�ٛ���c�Ko1�Ak,5����#�����<McCthU��)�KZ�(���:O^dHV3��Շ��9��gv>{R�(�u�V]dq��D^�ڞs���nU���C*�_9

data/features/resources/repo/objects/48/587cabf050866f63b8743da1dbe0ebae23b348

@@ -0,0 +1,2 @@
+x
=��j�@E�����s�P����B}��uԅu'�M��cc�}��8�s�����P>f�髩��M�^�s@���!؞�����r.adρ�{���8N��
��F�y�Vf;N
+/�a�F���u�9˪]Ig�-�42�$�����~ y��n��ޫ֔��i;o�lv�䅓�z��l��e~�TWw�S�

data/features/resources/repo/objects/51/394a26665e0ad7708091db12aff4510384fb2f

@@ -0,0 +1,2 @@
+x
=��j�0D{�WLr�k(9�`RC
+9�����Ȓ��I��q�9���t�wx?_�}�}_��mpm��_�_�o������H�"kFvH�ǩm_逓&�]�s�P~�g$a2�8/��x�>C`%6�eY�+i�b������z��l�⺡�g�vXSv�O��W�f�M^h�3�4��2j�*S�

data/features/resources/repo/objects/51/f1b7da07050f62cd00f24774856a9d06d4fc47

@@ -0,0 +1,4 @@
+x
��M
+�0F]���Lb~
+"��[L��Vl*i����ͷx�=^��il�fתzs�sheG:Z�}N6SΔ&��*�Ao,&k�0��C6�Ď]I����1�F����s��\���9��T8>V��9o�tE�	蠽G
+&�	Q������jm�I�#u碾OE

data/features/resources/repo/objects/54/5a9377aeb6a9d4e143c95e398c8968b35944cb

@@ -0,0 +1 @@
+x
=��j�@Dsޯ��9F�E� !9,�ڙV�i�i��߯�a�TEU�������C��e���n�n��=$^�H�Y	pQ�P�A�HP�©m�~��UI�q%�`x���4��Q!�B������Q����:�8ӵ�q �#������أ�t������Wخ�ئ]�Y��q�=��:c�+�����2����W�

data/features/resources/repo/objects/59/c81a96f4e0b1ed588190e2c097c325556ab0df

@@ -0,0 +1,2 @@
+x
��K
+1]���;�IDĥ�H�=:b23��s7oQ���R�ևMo����4FFa���)0���)�H��37���'OS��$��,��H6G�2h�`��oK��+����1׫6��?d'_r��kW���s6 &[$D3�J���È���27��5o��M>

data/features/resources/repo/objects/6a/eb5e2a8bda5b4f04cbd2d942ae7940bf796c25

@@ -0,0 +1,4 @@
+x
�TMo�0�9��v���%�[v���n���t�F�JN��⏸E���|���G>�q��޾[\�J��Xx0��T�n4B���V�K���T ��/��	(������輀�tX*JE$���-]�
+i�V�ea�ȍQ�j6�m�䏀�Ț
+Y4�]�� �Z
+~�{o���K���[���Xlk����l��;C~ק����E���YS	D��~���;'������g��n

data/features/resources/repo/objects/7f/ee222d7d4008f9d6a6c6e5f10ef4923299c93d

@@ -0,0 +1,2 @@
+x
=�Qk�@���_1�s��XAR!�>���sՃ�.�M���Ԓy�aw��s�����T>g��GS�
+�7�؞��

data/features/resources/repo/objects/87/09c1bfb261dedf83ab5793054940782c48b54f

@@ -0,0 +1,2 @@
+x
��K
+�0Ego.����@q�.�y�H�BL�o�;����=7l��էV�@F��N���h��6��m�q�*�lj0h�����U����R.K.�0�:��\�~��P	4�\����p<�>���r�-�~2�
)F@�

data/features/resources/repo/objects/91/54141b78af68bdeb8e9b79629012a720b6e8e5

@@ -0,0 +1,4 @@
+x
��K
+�@D]�)z/��o' ".���|b�Ld���7�nj�zTX�yj��;��(���,�v9�6���|v��lً���4�[�)z$���
+1+Cdz���E�IH��ݗ
+����4��T�T���H�?r��ݕ�� �"B���%��ӶM�w^G��G|
#�K&

data/features/resources/repo/objects/93/50c5598f6bafd3aa1a6a6ceecec7f02a0b0203

@@ -0,0 +1,2 @@
+x
��A� D]s��7i�
+$����C?Zm�P�_�n&�������L�1�Z��q�"&5Z��J�l�^�B�)�Fj4�A�s��q�a�Rtގ

data/features/resources/repo/objects/99/9db58eef630156ab2fc4aa4a9451fb77c0137f

@@ -0,0 +1,2 @@
+x
u�]K�0������c�H�1&�T����6�&1I��|#m��˗�<��lܙl9���`�C��V��䔠U�Ѷ��G}��;Y����	:$���}J�������uAa���6�?2�e&h 
��%���i��<�\�U0���l�F��L���'\9��0@�k���;~�:`���L��
+����Wla4�zH	��x�ے��K�1^]h�a5���

data/features/resources/repo/objects/a3/9d3fe0c289c12308749b73da61076bb4e1689d

@@ -0,0 +1,2 @@
+x
��AK�@�=�WLs�Ŵ	I��
+����I���-����ݴ+V�:����jj�{����i�{ڬ�xެ3�60�
��8K�4t�Π�#��$�d���o�j�ꀪ$������n`�#t�=(pPh6�OO2��e�������%�٢�*�J�H*�))g0]T�A���Ƀ[�E�>7�pĵ��(`�iq�t�:YRtVe^�*F\�&���%����R��T�X�^�k���d2���K�o�������_迦��k�
����

data/features/resources/repo/objects/aa/c66ee0d404c124fbcafd32a054664de4fdd3da

@@ -0,0 +1,3 @@
+x
��M
+�0�]��d��d
+"��[$��VlZb�o�ܼ|���4�

data/features/resources/repo/objects/bf/ae3371a43e95ebfbb1dd0643810a52cd958f14

@@ -0,0 +1 @@
+x
=��N�@D=�W�{�<$!+�&�|A3��$3Ӥ���E1ۧ�TU^�x|z��o���k�>����7�W�/q#���*Tg��ET���w�m�ˌ�$�ƴ�$0��fn�"+�5u�P���|_ͩƅ��'�4��J8�<�-�DgH�^}s����|�?k:�ʲL�������u��ߖǸ.���67Z�

data/features/resources/repo/objects/fb/4f268988e268cbf3bcc50ff338f98054e803cb

@@ -0,0 +1,2 @@
+x
��A�@�;�+���hFE�+!t���M%�;�.a��E
+�4�y�7��+*Y/'"�u���ٚL��0�ME��\R~(���d v���2O��s���jC{��°"

data/features/resources/repo/objects/ff/8c6fa78f879d98393ca470a4ea07cae7221d38

@@ -0,0 +1,4 @@
+x
��K
+�@D]�)z/��e> ".��tOG#f"�	^ߘ#X�Z<�G�<McmݡUf�=��8g�
Q�O�\d(��NF��T�4��cH�B�Ys�:$c\��Y��4�,��s�ۚ
+\+��5�;W8=7��\�^������&��p�[�O�6��!
+ ��VWjke��bO�

data/features/resources/repo/refs/heads/master

@@ -0,0 +1 @@
+aac66ee0d404c124fbcafd32a054664de4fdd3da

data/features/support/env.rb

@@ -2,19 +2,25 @@ require 'aruba/cucumber'
 require 'filewatcher'
 require 'git'
 
-# Load configuratiohn
-config = YAML::load(File.open('cucumber-config.yaml'))
+# Necesary environment variables:
+ENV["SFDT_GIT_REPO"] = File.join(Dir.pwd,'features/resources/repo')
+ENV["SFDT_GIT_DIR"] = 'repo'
+ENV["SFDT_SRC_DIR"] = 'salesforce/src'
+ENV["SFDT_USERNAME"] = 'john.doe@example.com'
+ENV["SFDT_PASSWORD"] = 'mysecurepass'
+ENV["SFDT_SANDBOX"] = 'testEnv'
+
+# Create a temprary home directory:
+new_home = File.join(Dir.pwd,'tmp','home') 
+ENV["HOME"] = new_home
+FileUtils.rm_rf new_home if Dir.exists? new_home
+FileUtils.mkdir new_home
 
 # Cucumber / aruba configuration parameters
 Before do
   @aruba_timeout_seconds = 300
-end
-
-# Set environment variables
-Before do
-  config[:environment_variables].keys.each do |key|
-    ENV[key.to_s.upcase] = config[:environment_variables][key]
-  end
+  # Use mock ant
+  FileUtils.cp "features/resources/mock/ant","bin/ant"
 end
 
 # Remove current configurations only once
@@ -28,3 +34,7 @@ Before '@push,@pull' do
   name = File.join 'tmp', 'aruba', ENV['SFDT_GIT_DIR']
   Git.clone(uri, name)
 end
+
+at_exit do
+  FileUtils.rm 'bin/ant'
+end

data/features/support/hooks.rb

@@ -1,17 +1,10 @@
-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? 
-  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)
+  file = File.join(Dir.pwd,'tmp','aruba',file)
+  dest = File.join(Dir.pwd,'tmp','aruba',dest)
   fork do
     FileWatcher.new(file).watch do |filename|
       FileUtils.cp file, dest
@@ -19,28 +12,3 @@ When /^I watch "(.+)" for changes and copy to "(.+)"$/ do |file,dest|
     end
   end
 end
-
-Transform /^.+$/ do |arg|
-  case arg
-  when String
-    config[:replacement_patterns].keys.each do |key|
-      arg = arg.gsub /#{key.to_s}/, config[:replacement_patterns][key]
-    end
-    config[:environment_variables].keys.each do |key|
-      arg = arg.gsub /#{key.to_s}/, config[:environment_variables][key]
-    end
-  when Cucumber::Ast::Table
-    arg.cell_matrix.each do |c| 
-      config[:replacement_patterns].keys.each do |key|
-        c[1].value = c[1].value.gsub /#{key.to_s}/, config[:replacement_patterns][key]
-      end
-      config[:environment_variables].keys.each do |key|
-        c[1].value = c[1].value.gsub /#{key.to_s}/, config[:environment_variables][key]
-      end
-    end
-  end
-
-  arg
-
-end
-

data/lib/salesforcedeploytool/app.rb

@@ -4,6 +4,7 @@ module SalesforceDeployTool
 
     attr_accessor :build_number
     attr_accessor :run_all_tests
+    attr_accessor :check_only
 
     def initialize config
      
@@ -26,6 +27,7 @@ module SalesforceDeployTool
       @server_url = config[:salesforce_url]
 
       # Defaults
+      @check_only = false
       @run_tests = []
       @debug ||= config[:debug]
       @build_number ||= 'N/A'
@@ -166,14 +168,18 @@ module SalesforceDeployTool
       end
 
       if @run_all_tests  
-        cmd = " ant deployAndTestAllCode" 
+        cmd = " ant deployAndTestCode" 
       else
-        if @run_tests
-          cmd = " ant deployAndTestCode"
+        if ! @run_tests.empty?
+          cmd = " ant deployAndRunSpecifiedTests"
         else
           cmd = " ant deployCode"
         end
       end
+
+      if @check_only
+        cmd = " ant checkOnlyCode"
+      end
         
       full_cmd = env_vars + cmd
 

data/lib/salesforcedeploytool/cli.rb

@@ -79,16 +79,19 @@ module SalesforceDeployTool
         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.option "--check-only", "-c", "Check only, don't deploy"
+        c.option "--include CSV_LIST", "-i CSV_LIST", "A CSV list of metadata type to include when creating destructiveChange.xml"
         c.action do |args, options|
 
           # short flag mapping
+          options.check_only = true if options.c
           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
+          options.include = options.i if options.i
 
           # Parameter validation:
-
           if options.run_all_tests and options.run_tests
             puts "warning: --run-tests is ignored as --test has been declared "
           end
@@ -119,6 +122,7 @@ module SalesforceDeployTool
             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
+            sfdt_tmp.clean_git_dir
             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
@@ -130,6 +134,7 @@ module SalesforceDeployTool
             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.include = options.include.split(',') unless options.include.nil?
             dc_gen.verbose = false if not options.debug
             dc_gen.generate_destructive_changes
 
@@ -145,6 +150,9 @@ module SalesforceDeployTool
             sfdt.run_all_tests = options.run_all_tests.nil? ? false : true
             sfdt.run_tests = options.run_tests.split(',') unless options.run_tests.nil?
 
+            # Check only option:
+            sfdt.check_only = options.check_only
+
             # 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" )

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "2.1.1"
+  VERSION = "3.1.0"
 end

data/salesforce-deploy-tool.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'git', "~> 1.2"
   spec.add_runtime_dependency 'colorize', "~> 0.7"
   spec.add_runtime_dependency 'commander', "~> 4.2"
-  spec.add_runtime_dependency 'salesforce-dcgen', "~> 0.7.0"
+  spec.add_runtime_dependency 'salesforce-dcgen', "~> 0.8.0"
 end

data/tpl/build.xml.erb

@@ -19,21 +19,34 @@
       </sf:deploy>
     </target>
 
-    <target name="deployAndTestCode">
+    <target name="checkOnlyCode">
       <sf:deploy 
         username="${env.SF_USERNAME}" 
         password="${env.SF_PASSWORD}" 
         serverurl="${env.SF_SERVERURL}" 
         deployRoot="${env.SF_SRC_DIR}" 
         maxPoll="200" 
+        checkOnly="true"
         rollbackOnError="true" >
+      </sf:deploy>
+    </target>
+
+    <target name="deployAndRunSpecifiedTests">
+      <sf:deploy 
+        username="${env.SF_USERNAME}" 
+        password="${env.SF_PASSWORD}" 
+        serverurl="${env.SF_SERVERURL}" 
+        deployRoot="${env.SF_SRC_DIR}" 
+        maxPoll="200" 
+        rollbackOnError="true"
+        testLevel="RunSpecifiedTests">
 <% @run_tests.each do |test| -%>
       <runTest><%= test %></runTest>
 <% end -%>
       </sf:deploy>
     </target>
 
-    <target name="deployAndTestAllCode">
+    <target name="deployAndTestCode">
       <sf:deploy 
         username="${env.SF_USERNAME}" 
         password="${env.SF_PASSWORD}"