capistrano_multiconfig_parallel 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b470f4de93b37af27d50688a0727461af844e4e
-  data.tar.gz: c270b935db211232b3150c225db50eff605c0b03
+  metadata.gz: 8b780bcf8adad1a2bf148a693c85c6f20d3447ca
+  data.tar.gz: 202318a839cbfdbaa4465cbe2c0f1889f8cbc531
 SHA512:
-  metadata.gz: 4bba067afc7d3e6728ae82eb23a0b2f0b5701ca81f5a9ed876d821b9ec41d7cbd620f5afddf953faaacbc156b632d9305e0865ca336b73d221c5a2aeec8bf445
-  data.tar.gz: 5dcab7ebf63b73e79b89e8f4301ac126860a4b369178e99eba7af512cb7bdc492b68e022ce8726840d85834255c1c6863a0fd764cf5ce58c444a346dc9f8e99d
+  metadata.gz: d5881082a7933b6acc37ee0b01c4c1b6fb3a595c85c6b90dcaf32c200ebd2f5bd1a37295220c7a0d566a576562738c791cda799d8a7417363d38fc3afe097c2a
+  data.tar.gz: b9327016b1d9bb84cdebc51f58f0f458b51bb42f7d0529c981b73b9fd1d65e4b7808b8cd3379b13620178d041a9c4d80b1cadf0d20117c6a3a7ee8fbbb5bf61d

data/README.md

@@ -40,6 +40,7 @@ Requirements
 12. [capistrano >= 3.0] [capistrano]
 13. [configliere >= 0.4] [configliere]
 14.  [inquirer >= 0.2] [inquirer]
+14.  [devnull >= 0.1] [inquirer]
 
 [ruby]: http://www.ruby-lang.org
 [activesupport]:https://rubygems.org/gems/activesupport
@@ -55,6 +56,7 @@ Requirements
 [capistrano]: https://github.com/capistrano/capistrano/
 [configliere]: https://github.com/infochimps-platform/configliere
 [inquirer]: https://github.com/arlimus/inquirer.rb
+[devnull]: https://github.com/maraigue/devnull
 
 Compatibility
 --------
@@ -193,11 +195,15 @@ Also the script will ask if there are any other environment variables that user
 
 bundle exec multi_cap deploy_multi_stages  STAGES=development, staging, production
 ```
+NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=<task_name>** either when you specify the STAGES, or can be done 
+individually for each task when prompted about additional ENV options
 
 If a branch is specified using "BRANCH=name" it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
 
 Also the script will ask if there are any other environment variables that user might want to pass to each of the stages separately.
 
+If you use **capistrano-gitflow**, the workers will first deploy to all the other stages 
+and only after staging is tagged , will trigger a new worker to start deploying to production
 
 
 ## 2.)  Multiple Apps ( like [Caphub][caphub]  ) 
@@ -250,9 +256,16 @@ Will ask user if he wants to deploy the apps "foo" and "bar" , since they appear
 bundle exec multi_cap deploy_multi_stages  STAGES=development, staging, production
 ```
 
+NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=<task_name>** either when you specify the STAGES, or can be done 
+individually for each task when prompted about additional ENV options
+
 If a branch is specified using **BRANCH=<name>** it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
 If you want different branches , capistrano will ask for additional ENV options for each stage, and can be specified then for each stage
 
+If you use **capistrano-gitflow**, the workers will first deploy to all the other stages 
+and only after staging is tagged , will trigger a new worker to start deploying to production
+
+
  Testing
 --------
 

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -1,4 +1,3 @@
-Gem.find_files('capistrano_multiconfig_parallel/extensions/**/*.rb').each { |path| require path }
 module CapistranoMulticonfigParallel
   # class used as a wrapper around capistrano
   class Application < Capistrano::Application

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -5,8 +5,10 @@ module CapistranoMulticonfigParallel
   ENV_KEY_JOB_ID = 'multi_cap_job_id'
   MULTI_KEY = 'multi'
   SINGLE_KEY = 'single'
- GITFLOW_TAG_STAGING_TASK = "gitflow:tag_staging"
- 
+  GITFLOW_TAG_STAGING_TASK = "gitflow:tag_staging"
+  GITFLOW_CALCULATE_TAG_TASK = 'gitflow:calculate_tag'
+  GITFLOW_VERIFY_UPTODATE_TASK = 'gitflow:verify_up_to_date'
+  
   CUSTOM_COMMANDS = {
     CapistranoMulticonfigParallel::MULTI_KEY => {
       stages: 'deploy_multi_stages'

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -107,17 +107,20 @@ module CapistranoMulticonfigParallel
     end
     
     def apply_confirmations?
-       CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true' &&
-        CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(@job_manager.stage)
+       CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
     end
     
     def syncronized_confirmation?
-        CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true' && 
-        !@job_manager.executes_deploy_stages? 
+        (CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true' &&  !@job_manager.executes_deploy_stages? ) || 
+      (@job_manager.executes_deploy_stages? &&  @job_manager.confirmation_applies_to_all_workers?)
+    end
+
+    def apply_confirmation_for_worker(worker)
+      worker.alive? &&  CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(worker.env_name)
     end
 
     def setup_worker_conditions(worker)
-      return unless  apply_confirmations?
+      return if !apply_confirmation_for_worker(worker) || !apply_confirmations?
       hash_conditions = {}
       CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
         hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
@@ -126,7 +129,7 @@ module CapistranoMulticonfigParallel
     end
 
     def mark_completed_remaining_tasks(worker)
-      return unless apply_confirmations?
+      return if !apply_confirmation_for_worker(worker)  || !apply_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
         task_confirmation = @job_to_condition[worker.job_id][task]
@@ -138,7 +141,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations_worker(worker)
-      return if !apply_confirmations?  || syncronized_confirmation?
+      return if !apply_confirmations? ||  !apply_confirmation_for_worker(worker) || syncronized_confirmation?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         result = wait_condition_for_task(worker.job_id, task)
         confirm_task_approval(result, task, worker) if result.present?
@@ -150,7 +153,8 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations
-      return  if !apply_confirmations? || !syncronized_confirmation?
+       stage_apply = CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(@job_manager.stage)
+      return  if  !apply_confirmations? || !stage_apply || !syncronized_confirmation?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         results = []
         @jobs.pmap do |job_id, _job|
@@ -199,7 +203,7 @@ module CapistranoMulticonfigParallel
     end
 
     def can_tag_staging?
-     @job_manager.is_able_to_tag_staging?  &&
+     @job_manager.can_tag_staging?  &&
        @jobs.detect{|job_id, job| job['env'] == 'production'}.blank? 
     end
     

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -126,7 +126,7 @@ module CapistranoMulticonfigParallel
 
     def handle_subscription(message)
       if message_is_about_a_task?(message)
-        if @env_name == 'staging' && @manager.can_tag_staging?  && has_executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
+        if @env_name == 'staging' && @manager.can_tag_staging?  && has_executed_task?(CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK)
          @manager.dispatch_new_job(@job.merge('env' =>  'production'))
        end
         save_tasks_to_be_executed(message)

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -1,4 +1,5 @@
 require_relative './all'
+Gem.find_files('capistrano_multiconfig_parallel/extensions/**/*.rb').each { |path| require path }
 module CapistranoMulticonfigParallel
   # this is the class that will be invoked from terminal , and willl use the invoke task as the primary function.
   class CLI

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -6,7 +6,7 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
   
-    attr_accessor :condition, :manager, :deps, :application, :stage, :name, :args, :argv, :jobs, :job_registered_condition, :default_stage
+    attr_accessor :condition, :manager, :deps, :application, :stage, :name, :args, :argv, :jobs, :job_registered_condition, :default_stage, :original_argv
 
     def initialize(cap_app, top_level_tasks, stages)
       @cap_app = cap_app
@@ -51,10 +51,17 @@ module CapistranoMulticonfigParallel
       @name, @args = @cap_app.parse_task_string(@top_level_tasks.second)
       @argv = @cap_app.handle_options.delete_if { |arg| arg == @stage || arg == @name || arg == @top_level_tasks.first }
       @argv = multi_fetch_argv(@argv)
+      @original_argv = @argv.clone
       block.call if block_given?
       run
     end
     
+    def verify_options_custom_command(options)
+      options[:action] = @argv['ACTION'].present? ? @argv['ACTION'] : 'deploy'
+      @argv = @argv['ACTION'].present? ? @argv.except('ACTION') : @argv
+      options
+    end
+    
     def check_before_starting
       @condition = Celluloid::Condition.new
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
@@ -78,7 +85,10 @@ module CapistranoMulticonfigParallel
     
     def tag_staging_exists? # check exists task from capistrano-gitflow
       begin
-        Rake::Task[CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK].present?
+        rake1 = Rake::Task[CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK]
+        rake2 = Rake::Task[GITFLOW_CALCULATE_TAG_TASK]
+        rake3 = Rake::Task[GITFLOW_VERIFY_UPTODATE_TASK]
+        rake1.present? && rake2.present? && rake3.present? && rake2.prerequisites.present? && rake2.actions.present? && rake3.prerequisites.present?
       rescue
         return false
       end
@@ -86,6 +96,7 @@ module CapistranoMulticonfigParallel
 
     def fetch_multi_stages
       stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
+      @argv = @argv['STAGES'].present? ? @argv.except('STAGES') : @argv
       stages = parse_inputted_value(value: stages).split(',').compact if stages.present?
       stages.present? ? stages :  [@default_stage]
     end
@@ -94,12 +105,12 @@ module CapistranoMulticonfigParallel
      (!custom_command? &&  @stage == 'production') || (custom_command? && fetch_multi_stages.include?("production"))
     end
     
-     def is_able_to_tag_staging?
+     def can_tag_staging?
         using_git? &&  wants_deploy_production? && tag_staging_exists? 
     end
     
      def check_multi_stages(stages)
-         is_able_to_tag_staging? ?  stages.reject{|u| u == 'production'} : stages
+         can_tag_staging? ?  stages.reject{|u| u == 'production'} : stages
      end
     
     def deploy_app(options = {})
@@ -121,6 +132,11 @@ module CapistranoMulticonfigParallel
       fetch_app_additional_env_options
     end
 
+    def confirmation_applies_to_all_workers?
+      environments = @jobs.map{|job| job['env']}
+      CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.all? { |e| environments.include?(e) }
+    end
+    
     private
 
     def call_task_deploy_app(options = {})
@@ -167,17 +183,21 @@ module CapistranoMulticonfigParallel
       options['env_options'] = options['env_options'].reverse_merge(env_opts.except('BOX'))
 
       env_options = branch_name.present? ? { 'BRANCH' => branch_name }.merge(options['env_options']) : options['env_options']
-
+      job_env_options =  custom_command? && env_options['ACTION'].present? ? env_options.except('ACTION') : env_options
+      
+      
       job = {
         app: app,
         env: options['stage'],
-        action: options['action'],
+        action: custom_command? ? env_options['ACTION'] : options['action'],
         task_arguments: options['task_arguments'],
-        env_options: env_options
+        env_options: job_env_options
       }
-
+      job = job.stringify_keys
       @jobs << job
     end
+    
+   
 
     def prepare_options(options)
       options = options.stringify_keys

data/lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb

@@ -37,7 +37,7 @@ module CapistranoMulticonfigParallel
     def run_custom_command(options)
       return unless custom_command?
       CapistranoMulticonfigParallel.interactive_menu = true
-      options[:action] = @argv['ACTION'].present? ? @argv['ACTION'].present? : 'deploy'
+      options = verify_options_custom_command(options)
       action_name = @name
       if  action_name == custom_commands[:stages]
         multi_stage_deploy(options)

data/lib/capistrano_multiconfig_parallel/helpers/single_app_manager.rb

@@ -17,6 +17,7 @@ module CapistranoMulticonfigParallel
 
     def run_custom_command(options)
       return unless custom_command?
+      options = verify_options_custom_command(options)
       action_name = @name
       if action_name == custom_commands[:stages]
         stage_deploy(options)
@@ -32,7 +33,7 @@ module CapistranoMulticonfigParallel
       stages = check_multi_stages(stages)
       collect_jobs(options) do |new_options|
         stages.each do |stage|
-          deploy_app(new_options.merge('stage' => stage, 'action' => 'deploy'))
+          deploy_app(new_options.merge('stage' => stage))
         end
       end
     end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 6
-    TINY = 2
+    TINY = 3
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap