capistrano_multiconfig_parallel 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0f0c74f784649cbdf4950e848e78676f34b1fd9
-  data.tar.gz: d35b2181b44c3003e8724ebd6c709ceeca5b3197
+  metadata.gz: af426cfa70110d128cbe87845419726e79c208a1
+  data.tar.gz: 8fc920d2c30a6dba86a4454072f8545178b5e0cf
 SHA512:
-  metadata.gz: 4898438e1a2f8b9fb5941952a7b12833f45df7404308234529b1f792dedf2c2e10d320727c24f80c97a1f41b683f825c340fac0fc4647302218f365d22905097
-  data.tar.gz: 14453f7bc72253e071cd6228c3e3f48a82600236f316330a72f2fab81ced31efaf7f8b6ebdbd2e55f3d81e9c6cf37533fdeccf6da066b85eefd05a9b568fed78
+  metadata.gz: d7d415e6280a296e2245caa1d969ee18e7875a31c52fb7a7dccf2c299647cc3a7dc3378ca2bacd9a3fc28ef52086004bae92b0d9a336b9e9aa5fba790860f0c9
+  data.tar.gz: 8c6d73cd137cc0b2ab546ffd2d76aa9a26ff866d90a0a7d746ed38ffd237d78ca574074885cb9f4983030656c0c661acea359a645c19112df5e0b1f8cc482e05

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
     end
 
     def top_level
-      job_manager = multi_manager_class.new(self, top_level_tasks, stages)
+      job_manager = CapistranoMulticonfigParallel::BaseManager.new(self, top_level_tasks, stages)
       if job_manager.can_start? && !options.show_prereqs && !options.show_tasks
         job_manager.start
       else
@@ -22,8 +22,5 @@ module CapistranoMulticonfigParallel
       stages.find { |stage| stage.include?(':') }.present?
     end
 
-    def multi_manager_class
-      multi_apps? ? CapistranoMulticonfigParallel::MultiAppManager : CapistranoMulticonfigParallel::SingleAppManager
-    end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -121,16 +121,15 @@ module CapistranoMulticonfigParallel
     end
 
     def syncronized_confirmation?
-      (!@job_manager.executes_deploy_stages?) ||
-        (@job_manager.executes_deploy_stages? && !@job_manager.can_tag_staging? && @job_manager.confirmation_applies_to_all_workers?)
+       !@job_manager.can_tag_staging?
     end
 
     def apply_confirmation_for_worker(worker)
-      worker.alive? && CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(worker.env_name)
+      worker.alive? && CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(worker.env_name) && apply_confirmations?
     end
 
     def setup_worker_conditions(worker)
-      return if !apply_confirmation_for_worker(worker) || !apply_confirmations?
+      return if !apply_confirmation_for_worker(worker)
       hash_conditions = {}
       CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
         hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
@@ -139,7 +138,7 @@ module CapistranoMulticonfigParallel
     end
 
     def mark_completed_remaining_tasks(worker)
-      return if !apply_confirmation_for_worker(worker) || !apply_confirmations?
+      return if !apply_confirmation_for_worker(worker)
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
         task_confirmation = @job_to_condition[worker.job_id][task]
@@ -151,7 +150,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations_worker(worker)
-      return if !apply_confirmations? || !apply_confirmation_for_worker(worker) || syncronized_confirmation?
+      return if  !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?
@@ -164,7 +163,7 @@ module CapistranoMulticonfigParallel
 
     def wait_task_confirmations
       stage_apply = CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(@job_manager.stage)
-      return if !apply_confirmations? || !stage_apply || !syncronized_confirmation?
+      return if !stage_apply || !syncronized_confirmation?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         results = []
         @jobs.pmap do |job_id, _job|

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -149,8 +149,9 @@ module CapistranoMulticonfigParallel
     end
 
     def task_approval(message)
-      if @manager.apply_confirmations? && CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
-        task_confirmation = @manager.job_to_condition[@job_id][message['task']]
+        job_conditions = @manager.job_to_condition[@job_id]
+      if job_conditions.present? && CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
+        task_confirmation = job_conditions[message['task']]
         task_confirmation[:status] = 'confirmed'
         task_confirmation[:condition].signal(message['task'])
       else

data/lib/capistrano_multiconfig_parallel/managers/base_manager.rb

@@ -1,5 +1,6 @@
 require_relative './standard_deploy'
 require_relative '../celluloid/celluloid_manager'
+require_relative '../multi_app_helpers/dependency_tracker'
 module CapistranoMulticonfigParallel
   # finds app dependencies, shows menu and delegates jobs to celluloid manager
   # rubocop:disable ClassLength
@@ -19,14 +20,38 @@ module CapistranoMulticonfigParallel
     def run
       options = {}
       if custom_command?
+        options = verify_options_custom_command(options)
         run_custom_command(options)
       else
-        options = verify_options_custom_command(options)
-        run_normal_command(options)
+        collect_jobs(options)
       end
       process_jobs
     end
 
+
+    def run_custom_command(options)
+      stages = fetch_multi_stages
+      return if stages.blank?
+      stages = check_multi_stages(stages)
+      stages.each do |stage|
+        collect_jobs(options.merge('stage' => stage))
+      end
+    end
+
+    def deploy_multiple_apps(applications, options)
+      options = options.stringify_keys
+      return unless applications.present?
+      applications.each do |app|
+        deploy_app(options.merge('app' => app))
+      end
+    end
+
+
+    def backup_the_branch
+      return if custom_command? || @argv['BRANCH'].blank?
+      @branch_backup = @argv['BRANCH'].to_s
+      @argv['BRANCH'] = nil
+    end
     def can_start?
       @top_level_tasks.size > 1 && (stages.include?(@top_level_tasks.first) || custom_command?) && ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
     end
@@ -108,7 +133,10 @@ module CapistranoMulticonfigParallel
     def collect_jobs(options = {}, &block)
       options = prepare_options(options)
       options = options.stringify_keys
-      block.call(options) if block_given?
+      apps = @dependency_tracker.fetch_apps_needed_for_deployment(options['app'], options['action'])
+      backup_the_branch if multi_apps?
+      deploy_multiple_apps(apps, options)
+      deploy_app(options)
     rescue => e
       raise [e, e.backtrace].inspect
     end
@@ -124,9 +152,9 @@ module CapistranoMulticonfigParallel
 
     def tag_staging_exists? # check exists task from capistrano-gitflow
       check_giflow_tasks(
-        CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK,
-        CapistranoMulticonfigParallel::GITFLOW_CALCULATE_TAG_TASK,
-        CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK
+      CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK,
+      CapistranoMulticonfigParallel::GITFLOW_CALCULATE_TAG_TASK,
+      CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK
       )
     rescue
       return false
@@ -178,11 +206,8 @@ module CapistranoMulticonfigParallel
       @jobs.map { |job| job['env'] }
     end
 
-    def confirmation_applies_to_all_workers?
-      CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.all? { |e| worker_environments.include?(e) }
-    end
 
-  private
+    private
 
     def call_task_deploy_app(options = {})
       options = options.stringify_keys

data/lib/capistrano_multiconfig_parallel/managers/standard_deploy.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
     attr_accessor :app, :stage, :action, :task_arguments, :env_options
     def initialize(options)
       @app = options.fetch('app', '')
-      @stage = options.fetch('env', 'development')
-      @action = options.fetch('action', 'deploy')
+      @stage = options.fetch('env', '')
+      @action = options.fetch('action', '')
       @task_arguments = options.fetch('task_arguments:', [])
       @env_options = options.fetch('env_options', {})
       execute_standard_deploy

data/lib/capistrano_multiconfig_parallel/multi_app_helpers/dependency_tracker.rb

@@ -11,7 +11,8 @@ module CapistranoMulticonfigParallel
 
     def fetch_apps_needed_for_deployment(application, action)
       applications = []
-      if @job_manager.custom_command? && @job_manager.multi_apps?
+      return applications unless @job_manager.multi_apps?
+      if @job_manager.custom_command?
         apps_selected = all_websites_return_applications_selected
         applications = get_applications_to_deploy(action, apps_selected)
       elsif CapistranoMulticonfigParallel.configuration.application_dependencies.present?
@@ -27,7 +28,7 @@ module CapistranoMulticonfigParallel
       applications
     end
 
-  private
+    private
 
     def application_dependencies
       deps = CapistranoMulticonfigParallel.configuration.application_dependencies

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 13
-    TINY = 2
+    MINOR = 14
+    TINY = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - bogdanRada
@@ -634,8 +634,6 @@ files:
 - lib/capistrano_multiconfig_parallel/initializers/conf.rb
 - lib/capistrano_multiconfig_parallel/initializers/default.yml
 - lib/capistrano_multiconfig_parallel/managers/base_manager.rb
-- lib/capistrano_multiconfig_parallel/managers/multi_app_manager.rb
-- lib/capistrano_multiconfig_parallel/managers/single_app_manager.rb
 - lib/capistrano_multiconfig_parallel/managers/standard_deploy.rb
 - lib/capistrano_multiconfig_parallel/multi_app_helpers/dependency_tracker.rb
 - lib/capistrano_multiconfig_parallel/multi_app_helpers/interactive_menu.rb

data/lib/capistrano_multiconfig_parallel/managers/multi_app_manager.rb

@@ -1,53 +0,0 @@
-require_relative './base_manager'
-require_relative '../multi_app_helpers/dependency_tracker'
-module CapistranoMulticonfigParallel
-  # class used to find application dependencies
-  class MultiAppManager < CapistranoMulticonfigParallel::BaseManager
-    include Celluloid
-    include Celluloid::Logger
-
-    def run_normal_command(options)
-      multi_collect_and_run_jobs(options) do |apps, new_options|
-        deploy_multiple_apps(apps, new_options)
-        deploy_app(new_options) if !custom_command? && new_options['app'].present?
-      end
-    end
-
-    def run_custom_command(options)
-      stages = fetch_multi_stages
-      return if stages.blank?
-      stages = check_multi_stages(stages)
-      multi_collect_and_run_jobs(options) do |apps, new_options|
-        apps.each do |app|
-          stages.each do |stage|
-            deploy_app(new_options.merge('app' => app, 'stage' => stage))
-          end
-        end if apps.present?
-      end
-    end
-
-  private
-
-    def multi_collect_and_run_jobs(options = {}, &block)
-      collect_jobs(options) do |new_options|
-        applications = @dependency_tracker.fetch_apps_needed_for_deployment(new_options['app'], new_options['action'])
-        backup_the_branch
-        block.call(applications, new_options) if block_given?
-      end
-    end
-
-    def backup_the_branch
-      return if custom_command? || @argv['BRANCH'].blank?
-      @branch_backup = @argv['BRANCH'].to_s
-      @argv['BRANCH'] = nil
-    end
-
-    def deploy_multiple_apps(applications, options)
-      options = options.stringify_keys
-      return unless applications.present?
-      applications.each do |app|
-        deploy_app(options.merge('app' => app))
-      end
-    end
-  end
-end

data/lib/capistrano_multiconfig_parallel/managers/single_app_manager.rb

@@ -1,25 +0,0 @@
-require_relative './base_manager'
-module CapistranoMulticonfigParallel
-  # class used to find application dependencies
-  class SingleAppManager < CapistranoMulticonfigParallel::BaseManager
-    include Celluloid
-    include Celluloid::Logger
-
-    def run_normal_command(options)
-      collect_jobs(options) do |new_options|
-        deploy_app(new_options)
-      end
-    end
-
-    def run_custom_command(options)
-      stages = fetch_multi_stages
-      return if stages.blank?
-      stages = check_multi_stages(stages)
-      collect_jobs(options) do |new_options|
-        stages.each do |stage|
-          deploy_app(new_options.merge('stage' => stage))
-        end
-      end
-    end
-  end
-end