forcer 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6804c9fe68862c98350f9701974f02cd3590eef
-  data.tar.gz: 58a9b0122341b63e0e1ad5367dc968b40d1797e7
+  metadata.gz: a6101468b6bfe4249a1f178acc2ad0ac8a41a86b
+  data.tar.gz: d16e4e974373d621a39bc3ebdf4e072b2676f046
 SHA512:
-  metadata.gz: 9c987be478f97c95416cac231f256b5d20c31ff10547c7a591205146c179ae1778a40dc2a683abbc053b683c3f62190b7624650dec1bdfcf9f96881c4ae93631
-  data.tar.gz: 412fac6b70a39ab2af75b019e05f5a30ba65b6204b6b1a5ba881ed3e27a803abbd1e6d359e99377f5d4e0d7cb0452605f04fe5adc22dd8998e22723522d327d1
+  metadata.gz: 5e1a2c5b9464d586d06715cc496347dd76da334bd74a72242713c7f11b88e943786b39935de483e23988d734a913ed9e268441e3f3d4ba7382e8a79c3aa03f14
+  data.tar.gz: b39ba5f19cc9c3c0b1adbf463dae0d80b06a8f19973f60c5fe732b29ac871a90db7ac76c4a39cb11eecb712134225a59a92be0813e32fb057473f9bf46ff7058

data/.idea/.rakeTasks

@@ -4,4 +4,4 @@ You are allowed to:
 1. Remove rake task
 2. Add existing rake tasks
 To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build forcer-0.4.13.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Build and install forcer-0.4.13.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install forcer-0.4.13.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.4.13 and build and push forcer-0.4.13.gem to Rubygems" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build forcer-0.4.15.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Build and install forcer-0.4.15.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install forcer-0.4.15.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.4.15 and build and push forcer-0.4.15.gem to Rubygems" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/codeStyleSettings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>

data/.idea/dictionaries/gaziz.xml

@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="gaziz" />
+</component>

data/.idea/forcer.iml

@@ -11,28 +11,32 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="RVM: ruby-2.2.0" jdkType="RUBY_SDK" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.2-head" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="akami (v1.3.0, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.4, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gyoku (v1.3.1, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="httpi (v2.4.0, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="macaddr (v1.7.1, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.6.2, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.6.2, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.4.2, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.2.0, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.2.3, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.2.1, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.2.1, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.2.2, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.7, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="savon (v2.11.0, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="systemu (v2.6.5, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="uuid (v2.3.7, RVM: ruby-2.2.0) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="wasabi (v3.5.0, RVM: ruby-2.2.0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="akami (v1.3.1, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.10.6, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.4.7, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="docile (v1.1.5, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gyoku (v1.3.1, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpi (v2.4.1, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.2, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.6.2, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.6.2, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nori (v2.6.0, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack (v1.6.4, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.4.2, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.2.0, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.2.3, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.2.1, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.2.1, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.2.2, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.7, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="savon (v2.11.1, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.10.0, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.10.0, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, RVM: ruby-2.2-head) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="wasabi (v3.5.0, RVM: ruby-2.2-head) [gem]" level="application" />
   </component>
 </module>

data/README.md

@@ -4,24 +4,29 @@
 [![Code Climate](https://codeclimate.com/github/gazazello/forcer/badges/gpa.svg)](https://codeclimate.com/github/gazazello/forcer)
 [![Test Coverage](https://codeclimate.com/github/gazazello/forcer/badges/coverage.svg)](https://codeclimate.com/github/gazazello/forcer/coverage)
 
-Forcer is a ruby command line application and gem designed to help force.com developers who utilize git and proper development process that includes:
+Forcer is a ruby command line app and gem for interaction with Salesforce Metadata (Metadata API).
+Calling deploy and other available metadata commands should be quicker than using traditional ANT tool
+provided by Salesforce. So in some sense Forcer is an open source replacement for ANT migration tool.
+Forcer is designed to help Force.com developers who use "proper" development process that includes:
 
-1. every developer should have a separate dev_org\dev_sandbox
-2. code reviews
-3. parallel development of multiple features by a single developer
+1. Git (Every deployment and every change to any _tracked_ project component is committed to a git repo)
+1. A separate dev_org\dev_sandbox for every developer
+2. Parallel development of multiple features by a single developer (can use single Dev Org)
+3. Code reviews
 
-advantages over traditional ant scripts:
+
+Advantages over traditional ANT tool scripts:
 
 1. Configurability
 2. Commands for specific tasks (i.e. delete components or rename components)
-3. Easily add REST Api functionality (i.e. load initial data after new org created)
+3. Easily adding REST Api functionality (i.e. load initial data after new org created)
 
 
-This project is inspired by metaforce. It turned out to be easier to start my own project after trying to understand how metaforce
-is written and attempting to contribute into it. So after days of reading metaforces code and trying to understand, how
-SOAP api calls are done to salesforce and how 'thor' is used to create command line app, I was ready to write my own tool.
-The idea is to make structure of Forcer simpler than metaforce and let contributors understand code by reading smaller amount
-of files. I admit that my code is not perfect and far from professional ruby styles, so I will be glad if you help me.
+This project is written in Ruby and inspired by Metaforce. It turned out to be easier to start my own project after trying to understand how Metaforce
+is written and attempting to contribute into it. So after days of reading Metaforce's code and trying to understand, how
+SOAP api calls are done to Salesforce and how 'thor' is used to create command line app, I was ready to write my own tool.
+The idea is to make structure of Forcer simpler than Metaforce and let contributors understand code by reading smaller amount
+of files. I admit that my code is not perfect and far from professional ruby styles, so help is appreciated.
 But please lets keep this tool simple with only necessary commands and functionality.
 
 ## System Requirements
@@ -31,7 +36,7 @@ Ruby version: 2.1.2 or later
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to application's Gemfile:
 
 ```ruby
 gem 'forcer'
@@ -41,13 +46,13 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Alternatively install it as:
 
     $ gem install forcer
 
-## Usage
+## How to use?
 Currently the app is tested and being used only on Mac OS and Linux (I used Ubuntu). I have NOT tested on Windows yet, but
-if you try and report results on Windows, other developers would be thankful.
+if help in testing and reporting results for Windows is appreciated by the rest.
 
 Call help to list all available operations for Forcer:
 
@@ -63,7 +68,7 @@ To list options and flags available for each command call help for each operatio
     --checkOnly ...
     ...
 
-To deploy your project (stored in local filesystem) to destination org first from terminal you need to change directory
+To deploy project (stored in local filesystem) to destination org first from terminal users need to change directory
 to project folder that somewhere inside contains folder "src" with all metadata to deploy:
 
     $(master): cd ~/my_workspace/TestProject/
@@ -77,7 +82,8 @@ Here is a very simple deploy command:
     $(master): forcer deploy
     
 This command will start deployment recursively searching for sfdc project source folder "src" and using the first found for deployment.
-Please note that "src" folder must contain a valid package.xml file that you intend to use for deployment.
+
+*NOTE: "src" folder must contain a valid package.xml file intended to be used for deployment.*
 
 
 ## Configuration
@@ -107,29 +113,42 @@ a template content:
       security_token: sample_token2
       
 #### Where should I place "configuration.yml"?
-It should be in the same directory where you call Forcer or inside "forcer_config" folder. First "forcer_config" folder
+It should be in the same directory where users call Forcer or inside "forcer_config" folder. First "forcer_config" folder
 is scanned for configuration.yml file, then current directory (if not found in "forcer_config" folder). More about folder
 "forcer_config" at the end of Configuration section.
 
-    $(master): ls
+    $(master): ls -R
+    forcer_config
+    forcer_config/configuration.yml
+    project
+    project/src
+    ...
+
+Alternatively users can rely on default (same for all projects) exclude_... configuration files. And 
+use only "configuration.yml" for a project without folder "forcer_config":
+
+    $(master): ls -R
     ./configuration.yml
+    project
+    project/src
     ...
     
-    $(master): forcer deploy ...
-    
-This allows having separate "configuration.yml" file for each project. If you are calling Forcer from git repo directory
-with project files and keeping the file outside "forcer_config", please add "configuration.yml" to gitignore. This
-should help you avoiding committing sensitive data. For more information on setup and usage of configuration.yml please
-visit wiki pages of this project. 
+Each of two methods above allows having separate "configuration.yml" file for each project.
+
+*NOTE: If users run Forcer from git repo directory with project files and keep the "configuration.yml"
+outside of "forcer_config", then users should add "configuration.yml" to gitignore. This will help to avoid committing
+sensitive data. For more information on setup and usage of configuration.yml please visit wiki pages of this project.*
 
-### Excluding certain metadata from deployment
+## Excluding certain metadata from deployment
 Forcer is a flexible tool that allows developers:
     
-- Exclude certain components (metadata files) and even whole folders from deployment. For example object Idea.object (excluded by default) usually fails deployments.
+### Exclude components (metadata files) and even whole folders from deployment. For example object Idea.object (excluded by default) usually fails deployments.
+
+    #### How to exclude components and whole directories from deployment?
+    It is possible to make Forcer exclude components and directories by adding name of a "to-be-excluded"
+    component/directory into "exclude_components.yml" configuration file. _This will make Forcer skip the entire
+    component/directory from deployment._
 
-    #### How to exclude components and and whole directories from deployment?
-    Name of the file is "exclude_components.yml".
-    
     #### "exclude_components.yml" contains:
     
         - objects/Idea.object
@@ -147,11 +166,20 @@ Forcer is a flexible tool that allows developers:
         [your_ruby_version_location (like ".../rvm/gems/ruby-[version]")]/gems/forcer-[version]/lib/metadata_services/exclude_components.yml
     
 
-- Exclude certain XML elements from deployment. For example all references to "Social..." layouts (excluded by default) in profiles fail deployments.
+### Exclude XML elements from deployment. For example all references to "Social..." layouts (excluded by default) in profiles fail deployments.
+
+    #### IMPORTANT NOTE! By default XML exclusion works only when deploy to sandboxes. You can force XML exclusion
+    when deploying to production using *--forceExclude* flag. Run _forcer help deploy_ to see all options.
+    *Excluding XML snippets for production deployment can cause loss of data*. Also be aware if you exclude
+    the whole node like field or weblink (assuming that node exists in target org), that node will be preserved
+    intact in the target org. But if you skip a sub-node of that parent node (like removing lookupFilter)
+    then it considered as modifying existing node and that node will be overwritten in target org. So
+    if you cannot deploy part of node it might be a good idea to skip deployment of whole node or file.
 
     #### How to exclude XML elements (snippets) from deployment?
-    Name of the file is "exclude_xml_nodes.yml". Goal is to deploy the file/component but filter certain known XML elements
-    from teh file.
+    It is possible to make Forcer exclude XML elements/snippets from deployment by adding nokogiri
+    search pattern of a "to-be-excluded" XML element/snippet into "exclude_xml_nodes.yml" configuration file.
+    _This will make Forcer deploy components but filter our certain undesired XML elements_.
     
     #### Sample "exclude_xml_nodes.yml":
     
@@ -210,16 +238,24 @@ apparent what "forcer_config" belongs to what project:
     project/src
     ...
     
-Forcer is designed to be used with git. So considering a project directory is git, folder "forcer_config" should be added
-to gitignore. Then it can be reused for any branch or salesforce project. The idea is to switch to any branch and be able
-to deploy it using "forcer_config" in current project git directory.
+Forcer is designed to be used with Git. So considering a project directory is in git repo, folder "forcer_config" should be added
+to gitignore. Alternatively if users want to share exclude_... configuration files with other team members,
+then at least every team member should add "/forcer_config/configuration.yml" to gitignore in order to prevent committing sensitive
+authorization information. But in any scenario "forcer_config" can be reused for any branch or Salesforce project on current computer.
+*The idea is to switch to any branch and be able to deploy it using "forcer_config" in current project git directory.*
+
+    $(master): forcer deploy --dest my_dev_org1
+    ...
+    $(master): git checkout feature_branch1
+    $(feature_branch1): forcer deploy --dest my_dev_org2
+    ...
 
 ### Command line examples
-If you already filled configuration.yml correctly then deployments are much faster. Here is a sample command to start deployment of a project in current folder:
+If users already filled configuration.yml correctly then deployments are much faster. Here is a sample command to start deployment of a project in current folder:
 
     $(master): forcer deploy --dest dest_alias_in_configuration_yml
 
-If you want to call validation-only request then, since it is part of "deploy" soap call, you need to just add flag --checkOnly :
+In case users want to call validation-only request then, since it is part of "deploy" soap call, they need to simply dd flag --checkOnly :
 
     $(master): forcer deploy --dest dest_alias_in_configuration_yml --checkOnly
 
@@ -242,11 +278,11 @@ Please note that messages and language can and will change because the app devel
 
 ## Possible problems
 
-1. When my friend tried to run Forcer on ruby version 2.1.5 on Ubuntu, the app threw exception about missing library
-"em-http-request". If you have ruby version 2.1.5 installed and cannot resolve dependencies, probably the simplest
-solution is switching to ruby version to 2.1.2 or 2.2.0 or later.
+1. When test run Forcer on ruby version 2.1.5 on Ubuntu, the app threw exception about missing library
+"em-http-request". If installed ruby version is 2.1.5 and dependencies cannot be resolved, probably the simplest
+solution is to switch ruby version to 2.1.2 or 2.2.0 or later.
 2. openssl library version 1.0.2 on Mac OS (maybe other platforms too) has problems with ruby 2.2.0 when deploy larger
-zip-files. In order to fix please follow steps:
+zip-files. These are steps to fix the issue on Mac OS:
 
         $(master): brew update
         $(master): brew uninstall openssl
@@ -255,8 +291,9 @@ zip-files. In order to fix please follow steps:
         $(master): rvm remove 2.2.0
         $(master): rvm install 2.2.0 --with-openssl-dir=`brew --prefix openssl`
         
-3. Most probably users will make multiple attempts before the very first deployment succeeds. The reason is Salesforce has
-numerous specific features in metadata deployment. And users of Forcer gem will have to:
+3. Most probably users will have to make multiple attempts before the very first deployment succeeds.
+The reason is Salesforce has numerous specific features in metadata deployment. And users of Forcer
+gem will have to:
 
     * skip/remove certain components from deployment (manually or using exclude_components.xml)
     * filter out certain XML elements from deployment (manually or using exclude_xml_nodes.xml)
@@ -265,16 +302,14 @@ numerous specific features in metadata deployment. And users of Forcer gem will
         find . -type f -name '*.profile' -exec sed -i '' s/username_org1/username_org2/ {} +
         
     * API version differences between orgs can create issues
-    * Salesforce updates can make your current project folder undeployable sometimes
+    * Salesforce updates can make current project folder undeployable sometimes
     * other problems requiring modification of XML files
         
 4. Contributors may encounter problems with bundler and code-climate if run rspec. The easiest solution is to comment out
 these lines in file spec_helper.rb :
 
-        if Gem.available?("codeclimate-test-reporter")
           require "codeclimate-test-reporter"
           CodeClimate::TestReporter.start
-        end
 
 
 ## Contributing

data/lib/forcer/version.rb

@@ -1,3 +1,3 @@
 module Forcer
-  VERSION = "0.4.14"
+  VERSION = "0.4.15"
 end

data/lib/forcer_main.rb

@@ -15,6 +15,8 @@ module Forcer
       "current project directory. Please read project documentation on github for more information."
 
     option :source, :aliases => :s, :desc => "Path to folder that contains 'src' directory somewhere. No restriction on exact 'src' location, except it should be somewhere in :source."
+    option :forceExclude, :type => :boolean, :desc => "To turn ON all xml exclusion for Production, set --forcerExclude to TRUE"
+    option :skipExclude, :type => :boolean, :desc => "To turn OFF absolutely all exclusions (package.mxl too), set --skipExclude to TRUE"
     option :checkOnly, :type => :boolean, :aliases => :c, :desc => "Only validates without actual deployment. Default is FALSE."
     option :rollbackOnError, :type => :boolean, :aliases => :b, :desc => "Rolls back whole deployment if error occurs. Default is TRUE."
     option :runAllTests, :type => :boolean, :aliases => :t, :desc => "Make all unit tests run. Default if FALSE. For production deployment it is always true."

data/lib/metadata_services/metadata_service.rb

@@ -85,6 +85,7 @@ module Metadata
 
         deploy_request_xml = File.read(File.dirname(__FILE__) + "/deploy_request.xml");
         xml_param = deploy_request_xml % [debug_options_snippet, @current_session_id, blob_zip, deploy_options_snippet]
+        p "Uploading project zip file. This may take a while."
         response = @metadata_client.call(:deploy, :xml => xml_param)
         # todo catch exceptions
 

data/lib/metadata_services/sfdc_directory_service.rb

@@ -13,11 +13,7 @@ module Metadata
     def initialize(args = {})
       @args = args
       @output_file_name = tempfile_name("zip")
-      @files_to_exclude = Set.new()
-      @snippets_to_exclude = {}
       find_source_dir
-      prepare_files_to_exclude
-      prepare_xml_nodes_to_exclude
     end
 
     # copy files from original directory to be xml_filtered when creating zip
@@ -35,7 +31,6 @@ module Metadata
 
         entries = dir_content(@input_dir_name)
         p "excluding specified components from deployment"
-        p "filtering deployment files removing specified XML elements"
         write_entries(entries, "")
       ensure
         @zip_io.close # close before deleting tmpdir, or NOT_FOUND exception
@@ -94,6 +89,7 @@ module Metadata
 
     # Opens file. Removes all bad xml snippets. Rewrites results back into original file
     def filter_xml(filename)
+      prepare_xml_nodes_to_exclude if @snippets_to_exclude.nil?
       doc = Nokogiri::XML(File.read(filename))
       file_modified = false
       @snippets_to_exclude.each do |suffix, expressions|
@@ -119,7 +115,7 @@ module Metadata
       entries.each do |entry|
         # need relative local file path to use in new zip file too
         zip_file_path = (path == "" ? entry : File.join(path, entry)) # maybe without if/else
-        next if @files_to_exclude.include?(zip_file_path.downcase) # avoid if directory/file excluded
+        next if exclude_file?(zip_file_path.downcase)
 
         # need full file path to use in copy/paste
         disk_file_path = File.join(@input_dir_name, zip_file_path)
@@ -129,12 +125,22 @@ module Metadata
           sub_dir = dir_content(disk_file_path)
           write_entries(sub_dir, zip_file_path)
         else
-          filter_xml(disk_file_path)
+          filter_xml(disk_file_path) unless xml_exclusion_skipped_for?(disk_file_path)
           @zip_io.add(zip_file_path, disk_file_path)
         end
       end
     end
 
+    def exclude_file?(filename)
+      raise Exception if (filename.nil? or filename.empty?)
+      if (@files_to_exclude.nil? or @files_to_exclude.empty?)
+        @files_to_exclude = Set.new()
+        prepare_files_to_exclude
+      end
+
+      return @files_to_exclude.include?(filename)
+    end
+
     # Returns array of files for the specified directory (full_path) without current_dir "." and
     # prev directory ".."
     def dir_content(full_path)
@@ -173,5 +179,28 @@ module Metadata
         return false
       end
     end
+
+    # check if destination server is Production
+    def is_production
+      return (@args[:host].start_with?("https://login") or @args[:host].start_with?("login"))
+    end
+
+    # By default for Production it only processes package.xml and other files
+    # (objects, profiles, ...) are ignored (xml exclusions are OFF except package.xml). By default
+    # for Sandbox all xml exclusion are turned ON. Package.xml exclusions are OK because they allow
+    # skip deployment of certain objects/files.
+    # To turn ON all xml exclusion for Production, set --forcerExclude to TRUE
+    # To turn OFF absolutely all exclusions (package.mxl too), set --skipExclude to TRUE
+    def xml_exclusion_skipped_for?(full_filename)
+      raise Exception if (full_filename.nil? or full_filename.empty?)
+      return true if @args[:skipExclude]
+
+      if full_filename.end_with?("package.xml")
+        return false
+      else
+        return (is_production unless @args[:forceExclude])
+      end
+    end
   end # class SfdcDirectoryService
+
 end # module Metadata

data/lib/utilities/action_options_service.rb

@@ -7,19 +7,9 @@ module Forcer
     # directory can include 'configuration.yml', 'exclude_components.yml', 'exclude_xml_nodes.yml'
     # if directory not found tries to load only configuration.yml from local directory
     def self.load_config(old_options = {})
-      options = {}
-      old_options.each do |k, v|
-        options.store(k.to_sym, v)
-      end
+      options = clone_options(old_options)
 
-      if options[:configs].nil? || !(Dir.exists?(File.expand_path(options[:configs], __FILE__)))
-        p "config folder not specified or not found"
-        options[:configs] = Dir.pwd + "/forcer_config"
-        p "config folder in CURRENT DIRECTORY ? => #{Dir.exists?(options[:configs])}"
-      else
-        p "specified config folder FOUND"
-        options[:configs] = File.expand_path(options[:configs], __FILE__)
-      end
+      verify_config_folder(options)
 
       load_login_info(options)
 
@@ -32,43 +22,74 @@ module Forcer
 
     class << self
 
+      # Thor restricts options modification. Therefore have to clone hash "options"
+      def clone_options(old_options = {})
+        options = {}
+        old_options.each do |k, v|
+          options.store(k.to_sym, v)
+        end
+
+        return options
+      end
+
+      def verify_config_folder(options = {})
+        if options[:configs].nil? || !(Dir.exists?(File.expand_path(options[:configs], __FILE__)))
+          p "config folder not specified or not found"
+          options[:configs] = Dir.pwd + "/forcer_config"
+          p "config folder in CURRENT DIRECTORY ? => #{Dir.exists?(options[:configs])}"
+        else
+          p "specified config folder FOUND"
+          options[:configs] = File.expand_path(options[:configs], __FILE__)
+        end
+      end
+
       # attempts to read salesforce org information from forcer_config/configuration.yml
       # if forcer_config/configuration.yml not found, then try configuration.yml in current directory
       def load_login_info(options = {})
 
-        if !(options[:configs].nil?) && File.exists?(File.join(options[:configs], "/configuration.yml"))
-          p "CONFIGURATION.YML with org details FOUND in CONFIG FOLDER"
-          config_file_path = File.join(options[:configs], "/configuration.yml")
-          options[:login_info_path] = config_file_path
-        else
-          p "loading CONFIGURATION.YML from CURRENT DIRECTORY"
-          config_file_path = File.join(Dir.pwd, "/configuration.yml")
-        end
+        config_file_path = get_config_file_path(options)
 
+        # don't raise exception and let user enter all necessary information
         return options unless File.exists?(config_file_path)
 
-        dest = options[:dest]
+        destination_org = options[:dest]
         configuration = YAML.load_file(config_file_path).to_hash
 
-        return options if configuration[dest].nil?
+        return options if configuration[destination_org].nil?
 
-        configuration[dest].each do |key, value|
+        configuration[destination_org].each do |key, value|
           options.store(key.to_sym, value.to_s)  unless value.to_s.empty?
         end
+
         options[:host] = "https://#{options[:host]}" unless options[:host].include?("http")
-      end # load_login_info
+      end
+
+      # defines which configuration.yml to use for authentication. Preference is to save configuration.yml
+      # in folder 'forcer_config' which itself should be placed in project git repo directory
+      def get_config_file_path(options = {})
+        config_file_path = File.join(options[:configs], "/configuration.yml")
+
+        if File.exists?(config_file_path)
+          p "CONFIGURATION.YML with org details FOUND in CONFIG FOLDER"
+          options[:login_info_path] = config_file_path
+        else
+          p "loading CONFIGURATION.YML from CURRENT DIRECTORY"
+          config_file_path = File.join(Dir.pwd, "/configuration.yml")
+        end
+
+        return config_file_path
+      end
 
 
       # add absolute paths to exclude_... files from focer_config directory
       def add_exclude_paths(options = {})
+        return if (options[:configs].nil?)
 
-        if !(options[:configs].nil?) && File.exists?(File.join(options[:configs], "/exclude_components.yml"))
-          options[:exclude_components] = File.join(options[:configs], "/exclude_components.yml")
-        end
+        exclude_components_path = File.join(options[:configs], "/exclude_components.yml")
+        options[:exclude_components] = exclude_components_path if File.exists?(exclude_components_path)
 
-        if !(options[:configs].nil?) && File.exists?(File.join(options[:configs], "/exclude_xml_nodes.yml"))
-          options[:exclude_xml] = File.join(options[:configs], "/exclude_xml_nodes.yml")
-        end
+        exclude_xml_path = File.join(options[:configs], "/exclude_xml_nodes.yml")
+        options[:exclude_xml] = exclude_xml_path if File.exists?(exclude_xml_path)
       end
 
     end # class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forcer
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - gaziz tazhenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -134,6 +134,8 @@ files:
 - ".gitignore"
 - ".idea/.name"
 - ".idea/.rakeTasks"
+- ".idea/codeStyleSettings.xml"
+- ".idea/dictionaries/gaziz.xml"
 - ".idea/encodings.xml"
 - ".idea/forcer.iml"
 - ".idea/misc.xml"
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: '"facilitates change management for dev teams who use force.com and git"'