salesforce-deploy-tool 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d1af109d666537da0e15589c205d835f605417a
-  data.tar.gz: 46795a2090f578485e0936efe6c3073df707b7f6
+  metadata.gz: 262d3cc878de138736ef7fda3f76a791609bac29
+  data.tar.gz: e28bb6c55dd1c956b504079fe68e59757df3f514
 SHA512:
-  metadata.gz: 561a905232f77340c2b484b2b58e27bf3c03885f6631722adacfd88c164cc405496d3a99cec31d520567a19033b9659e06d6de116b7c9a2cbfb7924ad0ba65f2
-  data.tar.gz: a5ec87474a1ed88ea09802993cc4f52f9f7abad0e5224eacdf5dbdcc10ef4e6a5f2ce2255e6c5da7b23e7c84f1dd78a3591627cb1cedcc8d1ae5362b46ae2558
+  metadata.gz: e622d1cea87188f8c9694f14f831920a4a266c3abf2feccecf4d8a319b8680ef1af209515fff2cc3d05ef7cd0449594f32bf38d1b39e0178536269c6034a4ee3
+  data.tar.gz: b0ddbd4ac59fde005395daba5dd1b4345302bee1379a8e28b661d8c286030cf59d479b20f076880e845500771063635ec16f85a4af4d37f0bfec90c1e8ba4b61

data/bin/{sfd → sf}

@@ -27,11 +27,11 @@ end
 require 'salesforcedeploytool'
 
 program :version, SalesforceDeployTool::VERSION
-program :description, 'A cli tool to help manage and deploy salesforce environments with git'
+program :description, 'A cli tool to help manage and deploy salesforce sandboxes with git'
 
 command :init do |c|
   c.syntax = 'sf init [options]'
-  c.summary = 'Initialize salesforce environment from git'
+  c.summary = 'Initialize salesforce sandbox from git'
   c.description = "Clone the #{config[:git_repo]} to #{config[:git_dir]}"
   c.example 'usage', 'sf init'
   c.action do |args, options|
@@ -47,21 +47,24 @@ end
 
 command :pull do |c|
   c.syntax = 'sf pull'
-  c.summary = 'Pull code from the environment'
-  c.description = "Pull code from environment and update #{config[:git_dir]}"
+  c.summary = 'Pull code from the sandbox'
+  c.description = "Pull code from sandbox and update #{config[:git_dir]}"
   c.example 'usage:', 'sf pull'
   c.example 'usage:', 'sf pull -c -d'
-  c.option "--no-clean", "Do not clean the currrent source code before pulling"
+  c.option "--no-clean", "-c", "Do not clean the currrent source code before pulling"
   c.option "--debug", "Verbose output"
-  c.option "--env NAME", "use 'prod' to deploy production or sandbox name"
+  c.option "--sandbox NAME", "-s NAME", "use 'prod' to deploy production or sandbox name"
   c.action do |args, options|
 
+    options.no_clean = true unless options.c
+    options.sandbox = options.s if options.s
+
     # Parameter validation:
-    if options.env.nil? and sandbox.nil?
-      puts "error: please specify the environment to pull from using --env"
+    if options.sandbox.nil? and sandbox.nil?
+      puts "error: please specify the sandbox to pull from using --sandbox"
       exit 1
     end
-    config[:env] = options.env || sandbox
+    config[:sandbox] = options.sandbox || sandbox
     config[:debug] = options.debug.nil? ? false : true
 
     # Initialize
@@ -71,31 +74,35 @@ command :pull do |c|
     sfdt.clean_git_dir unless options.no_clean
 
     # Pull the changes
-    sfdt.pull "INFO: Pulling changes from #{config[:env]}  "
+    sfdt.pull "INFO: Pulling changes from #{config[:sandbox]}  "
 
   end
 
 end
 
-
 command :push do |c|
   c.syntax = 'sf push [options]'
   c.summary = 'Push code into a sandbox'
   c.description = ''
   c.example 'description', "Push the code that is located into #{config[:git_dir]} into the active sandbox"
-  c.option "--env NAME", "use 'prod' to deploy production or sandbox name"
+  c.option "--sandbox NAME", "-s NAME", "use 'prod' to deploy production or sandbox name"
   c.option "--debug", "Verbose output"
-  c.option "--test", "Deploy and test"
-  c.option "--exclude LIST", "a CSV list of metadata to exclude when creating destructiveChange.xml"
+  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.action do |args, options|
 
+    # short flag for test, so that not conflicts with trace
+    options.test = true if options.T
+    options.exclude = options.x if options.x
+    options.sandbox = options.s if options.s
+
     # Parameter validation:
-    if options.env.nil? and sandbox.nil?
-      puts "error: please specify the environment to pull from using --env"
+    if options.sandbox.nil? and sandbox.nil?
+      puts "error: please specify the sandbox to pull from using --sandbox"
       exit 1
     end
-    config[:env] = options.env || sandbox
+    config[:sandbox] = options.sandbox || sandbox
     config[:debug] = options.debug.nil? ? false : true
     config[:test] = options.test.nil? ? false : true
 
@@ -110,7 +117,7 @@ command :push do |c|
       sfdt_tmp = SalesforceDeployTool::App.new config_tmp
       sfdt_tmp.clone
       sfdt_tmp.clean_git_dir
-      sfdt_tmp.pull "INFO: Pulling changes from #{config[:env]} to temporary directory #{config[:tmp_dir]} to generate destructiveChanges.xml  "
+      sfdt_tmp.pull "INFO: Pulling changes from #{config[:sandbox]} to temporary directory #{config[:tmp_dir]} to generate destructiveChanges.xml  "
 
       # Create destructiveChanges.xml
       puts "INFO: Creating destructive changes xml"
@@ -136,7 +143,7 @@ end
 
 command :sandbox do |c|
   c.syntax = 'sf sandbox SANDBOX_NAME'
-  c.summary = 'Set sandbox to work on, this will override --env '
+  c.summary = 'Set sandbox to work on, this will override --sandbox '
   c.description = 'Set the sandbox to work with pull and push. If no parameter defined, it will print the current sandbox selected.'
   c.action do |args, options|
 

data/lib/salesforcedeploytool/app.rb

@@ -6,13 +6,13 @@ module SalesforceDeployTool
 
       @git_repo = config[:git_repo]
       @git_dir = config[:git_dir]
-      @env = config[:env]
-      @username = @env == 'prod' ? config[:username] : config[:username] + '.' + @env 
+      @sandbox = config[:sandbox]
+      @username = @sandbox == 'prod' ? config[:username] : config[:username] + '.' + @sandbox 
       @password = config[:password]
       @debug = config[:debug]
       @test = config[:test]
 
-      @server_url = @env == 'prod' ? 'https://login.salesforce.com' : 'https://test.salesforce.com'
+      @server_url = @sandbox == 'prod' ? 'https://login.salesforce.com' : 'https://test.salesforce.com'
 
       self.clone if ! Dir.exists? File.join(@git_dir,'.git')
 
@@ -100,7 +100,7 @@ module SalesforceDeployTool
       end
 
       # Deploy code
-      exec_options[:message] = @test ?  "INFO: Deploying and Testing code to #{@env}:  " : "INFO: Deploying code to #{@env}:  "
+      exec_options[:message] = @test ?  "INFO: Deploying and Testing code to #{@sandbox}:  " : "INFO: Deploying code to #{@sandbox}:  "
       exec_options[:message]  +=  "\n\n" if @debug
 
       cmd = @test ? " ant deployAndTestCode" : " ant deployCode"

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Juan Breinlinger
@@ -98,7 +98,7 @@ description: ''
 email:
 - "<juan.brein@breins.net>"
 executables:
-- sfd
+- sf
 extensions: []
 extra_rdoc_files: []
 files:
@@ -107,7 +107,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/sfd
+- bin/sf
 - lib/salesforcedeploytool.rb
 - lib/salesforcedeploytool/app.rb
 - lib/salesforcedeploytool/functions.rb