capistrano_multiconfig_parallel 0.20.9 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb9d81743bb7797aad849b28341801909a634659
-  data.tar.gz: fdc6ba3368a3cfdede894bb150ac831a17b240c9
+  metadata.gz: ba9973965ea61da495ec59d3cd50c8465267532a
+  data.tar.gz: ac92a48585d8b7491120f898a38b8a5fc9439316
 SHA512:
-  metadata.gz: feebf247d9aa8bccb9d2108e956808aacdbc18190eae4bd27436619339b2aa10a304ecbc3651a0a285980e8ec5ee66f746df25ed32aea9123d59e980c8e3415e
-  data.tar.gz: 0213a80c1f4b394c508247c0e426d4dd1941352c688bc087fad15de27d29142341d3d7e677b3108d489c95ba7acd5f286aa69846d8ec92003e17c38984e59e36
+  metadata.gz: ee5a2f3d237b7eeca37eb51b9358f3cce6b47fec61dcfa1923fa5bf014299b65a238c0a72f03ee3a7eca1b16afb0c6c3747ccd6e00d1f885e9d14fa827f4bf77
+  data.tar.gz: 5c70b0cdb8b7a347babfba5fdeaad76c99128d4f66f2b22f5473d628e1c66796148ec17881b9626d21874b7c5bcd1a0cbefa21eb15361bf68eb74dee73b35423

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -17,14 +17,14 @@ module CapistranoMulticonfigParallel
     end
 
     def start
-      verify_app_dependencies if multi_apps? && app_configuration.application_dependencies.present?
+      verify_app_dependencies if multi_apps? && configuration.application_dependencies.present?
       check_before_starting
       initialize_data
       run
     end
 
     def verify_app_dependencies
-      wrong = app_configuration.application_dependencies.find do |hash|
+      wrong = configuration.application_dependencies.find do |hash|
         !@stage_apps.include?(hash[:app]) || (hash[:dependencies].present? && hash[:dependencies].find { |val| !@stage_apps.include?(val) })
       end
       raise ArgumentError, "Invalid configuration for #{wrong.inspect}".red if wrong.present?
@@ -93,7 +93,7 @@ module CapistranoMulticonfigParallel
     def check_before_starting
       CapistranoMulticonfigParallel.enable_logging
       @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(Actor.current)
-      @default_stage = app_configuration.development_stages.present? ? app_configuration.development_stages.first : 'development'
+      @default_stage = configuration.development_stages.present? ? configuration.development_stages.first : 'development'
       @condition = Celluloid::Condition.new
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
     end
@@ -110,7 +110,7 @@ module CapistranoMulticonfigParallel
     def process_jobs
       return unless @jobs.present?
       FileUtils.rm Dir["#{log_directory}/worker_*.log"]
-      if app_configuration.multi_secvential.to_s.downcase == 'true'
+      if configuration.multi_secvential.to_s.downcase == 'true'
         @jobs.each(&:execute_standard_deploy)
       else
         run_async_jobs
@@ -177,7 +177,7 @@ module CapistranoMulticonfigParallel
       options = options.stringify_keys
       main_box_name = @argv['BOX'].blank? ? '' : @argv['BOX']
       stage = options.fetch('stage', @default_stage)
-      if app_configuration.development_stages.include?(stage) && main_box_name.present? && /^[a-z0-9,]+/.match(main_box_name)
+      if configuration.development_stages.include?(stage) && main_box_name.present? && /^[a-z0-9,]+/.match(main_box_name)
         execute_on_multiple_boxes(main_box_name, options)
       else
         prepare_job(options)
@@ -198,7 +198,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_jobs_termination
-      return if app_configuration.multi_secvential.to_s.downcase == 'true'
+      return if configuration.multi_secvential.to_s.downcase == 'true'
       result = @condition.wait
       return unless result.present?
       @manager.terminate

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -21,8 +21,7 @@ module CapistranoMulticonfigParallel
       Celluloid.task_class = Celluloid::TaskThread
       Celluloid.exception_handler do |ex|
         unless ex.is_a?(Interrupt)
-          puts format_error(ex)
-          log_error(ex)
+          log_error(ex, 'stderr')
         end
       end
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -55,12 +55,12 @@ module CapistranoMulticonfigParallel
       @worker_to_job[worker.mailbox.address] = job
       log_to_file("worker #{worker.job_id} registed into manager")
       Actor.current.link worker
-      worker.async.start_task unless syncronized_confirmation?
+      worker.async.start_task if !syncronized_confirmation? || job.failed? || job.rolling_back?
       @registration_complete = true if @job_manager.jobs.size == @job_to_worker.size
     end
 
     def all_workers_finished?
-      @job_to_worker.all? { |job_id, _worker| @jobs[job_id].finished? }
+      @jobs.all? { |_job_id, job| job.finished? || job.crashed? || job.rolling_back? }
     end
 
     def process_jobs
@@ -80,7 +80,7 @@ module CapistranoMulticonfigParallel
     end
 
     def apply_confirmations?
-      confirmations = app_configuration.task_confirmations
+      confirmations = configuration.task_confirmations
       confirmations.is_a?(Array) && confirmations.present?
     end
 
@@ -89,13 +89,13 @@ module CapistranoMulticonfigParallel
     end
 
     def apply_confirmation_for_job(job)
-      app_configuration.apply_stage_confirmation.include?(job.stage) && apply_confirmations?
+      configuration.apply_stage_confirmation.include?(job.stage) && apply_confirmations?
     end
 
     def setup_worker_conditions(job)
       return unless apply_confirmation_for_job(job)
       hash_conditions = {}
-      app_configuration.task_confirmations.each do |task|
+      configuration.task_confirmations.each do |task|
         hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
       end
       @job_to_condition[job.id] = hash_conditions
@@ -103,22 +103,21 @@ module CapistranoMulticonfigParallel
 
     def mark_completed_remaining_tasks(job)
       return unless apply_confirmation_for_job(job)
-      app_configuration.task_confirmations.each_with_index do |task, _index|
+      configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
         task_confirmation = @job_to_condition[job.id][task]
-        if task_confirmation[:status] != 'confirmed'
-          task_confirmation[:status] = 'confirmed'
-          task_confirmation[:condition].signal(fake_result)
-        end
+        next unless task_confirmation[:status] != 'confirmed'
+        log_to_file("worker #{job.id} with action #{job.action} status #{job.status} and exit status #{job.exit_status} tries to mark fake the task #{task} with status #{task_confirmation[:status]}")
+        task_confirmation[:status] = 'confirmed'
+        task_confirmation[:condition].signal(fake_result)
       end
     end
 
     def wait_task_confirmations_worker(job)
-      return unless job.finished? || job.exit_status.present?
       return if !apply_confirmation_for_job(job) || !syncronized_confirmation?
-      app_configuration.task_confirmations.each_with_index do |task, _index|
+      configuration.task_confirmations.each_with_index do |task, _index|
         result = wait_condition_for_task(job.id, task)
-        confirm_task_approval(result, task, job) if result.present?
+        confirm_task_approval(result, task, job)
       end
     end
 
@@ -127,9 +126,9 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations
-      stage_apply = app_configuration.apply_stage_confirmation.include?(@job_manager.stage)
+      stage_apply = configuration.apply_stage_confirmation.include?(@job_manager.stage)
       return if !stage_apply || !syncronized_confirmation?
-      app_configuration.task_confirmations.each_with_index do |task, _index|
+      configuration.task_confirmations.each_with_index do |task, _index|
         results = []
         @jobs.pmap do |job_id, _job|
           result = wait_condition_for_task(job_id, task)
@@ -146,11 +145,15 @@ module CapistranoMulticonfigParallel
       message = "Do you want  to continue the deployment and execute #{task.upcase}"
       message += " for JOB #{job.id}" if job.present?
       message += '?'
-      apps_symlink_confirmation = Celluloid::Actor[:terminal_server].show_confirmation(message, 'Y/N')
-      until apps_symlink_confirmation.present?
-        sleep(0.1) # keep current thread alive
+      if Celluloid::Actor[:terminal_server].present? && Celluloid::Actor[:terminal_server].alive?
+        apps_symlink_confirmation = Celluloid::Actor[:terminal_server].show_confirmation(message, 'Y/N')
+        until apps_symlink_confirmation.present?
+          sleep(0.1) # keep current thread alive
+        end
+        apps_symlink_confirmation
+      else
+        'y'
       end
-      apps_symlink_confirmation
     end
 
     def confirm_task_approval(result, task, processed_job = nil)
@@ -159,11 +162,13 @@ module CapistranoMulticonfigParallel
       return unless action_confirmed?(result)
       @jobs.pmap do |job_id, job|
         worker = get_worker_for_job(job_id)
-        worker.publish_rake_event('approved' => 'yes',
-                                  'action' => 'invoke',
-                                  'job_id' => job.id,
-                                  'task' => task
-                                 )
+        if worker.alive?
+          worker.publish_rake_event('approved' => 'yes',
+                                    'action' => 'invoke',
+                                    'job_id' => job.id,
+                                    'task' => task
+                                   )
+        end
       end
     end
 
@@ -185,10 +190,13 @@ module CapistranoMulticonfigParallel
     end
 
     def dispatch_new_job(job, options = {})
-      env_opts = @job_manager.get_app_additional_env_options(job.app, job.stage)
-      job.env_options = options.merge(env_opts)
-      new_job = CapistranoMulticonfigParallel::Job.new(job.to_json)
-      async.delegate(new_job)
+      return unless job.is_a?(CapistranoMulticonfigParallel::Job)
+      options.stringify_keys! if options.present?
+      env_opts = options['skip_env_options'].present? ? {} : @job_manager.get_app_additional_env_options(job.app, job.stage)
+      new_job_options = job.options.merge('env_options' => job.env_options.merge(env_opts))
+      new_job = CapistranoMulticonfigParallel::Job.new(new_job_options.merge(options.except(job.job_writer_attributes)))
+      new_job.setup_writer_attributes(options)
+      async.delegate(new_job) unless job.worker_died?
     end
 
     # lookup status of job by asking actor running it
@@ -208,14 +216,11 @@ module CapistranoMulticonfigParallel
 
     def worker_died(worker, reason)
       job = @worker_to_job[worker.mailbox.address]
-      log_to_file("worker job #{job} with mailbox #{worker.mailbox.inspect} died  for reason:  #{reason}")
-      @worker_to_job.delete(worker.mailbox.address)
-      return if job.blank? || job.crashed?
-      return unless job.action == 'deploy'
-      log_to_file "restarting #{job} on new worker"
-      job.status = 'worker_died'
-      job.action = 'deploy:rollback'
-      dispatch_new_job(job)
+      return true if job.blank? || job.worker_died? || job.action != 'deploy'
+      mailbox = worker.mailbox
+      @worker_to_job.delete(mailbox.address)
+      log_to_file("RESTARTING: worker job #{job.inspect} with mailbox #{mailbox.inspect} and #{mailbox.address.inspect} died  for reason:  #{reason}")
+      dispatch_new_job(job, skip_env_options: true, action: 'deploy:rollback', status: 'worker_died')
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -43,9 +43,9 @@ module CapistranoMulticonfigParallel
 
     def worker_state
       if Actor.current.alive?
-        status = @machine.state.to_s
-        job.crashed? ? status.red : status.green
+        @machine.state.to_s.green
       else
+        job.status = 'dead'
         'dead'.upcase.red
       end
     end
@@ -76,6 +76,7 @@ module CapistranoMulticonfigParallel
 
     def execute_after_succesfull_subscription
       async.execute_deploy
+      @manager.async.wait_task_confirmations_worker(@job)
     end
 
     def rake_tasks
@@ -91,7 +92,6 @@ module CapistranoMulticonfigParallel
       check_child_proces
       log_to_file("worker #{@job_id} executes: #{@job.build_capistrano_task}")
       @child_process.async.work(@job, @job.build_capistrano_task, actor: Actor.current, silent: true)
-      @manager.wait_task_confirmations_worker(@job)
     end
 
     def check_child_proces
@@ -110,8 +110,7 @@ module CapistranoMulticonfigParallel
 
     def check_gitflow
       return if @job.stage != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
-      @job.stage = 'production'
-      @manager.dispatch_new_job(@job)
+      @manager.dispatch_new_job(@job, stage: 'production')
     end
 
     def handle_subscription(message)
@@ -143,7 +142,7 @@ module CapistranoMulticonfigParallel
 
     def task_approval(message)
       job_conditions = @manager.job_to_condition[@job_id]
-      if job_conditions.present? && app_configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
+      if job_conditions.present? && 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'])
@@ -161,28 +160,26 @@ module CapistranoMulticonfigParallel
     def update_machine_state(name)
       log_to_file("worker #{@job_id} triest to transition from #{@machine.state} to  #{name}")
       @machine.go_to_transition(name.to_s)
-      abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new("task #{@action} failed ")) if name == 'deploy:failed' # force worker to rollback
+      error_message = "worker #{@job_id} task #{name} failed "
+      raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new(error_message), error_message) if job.failed? # force worker to rollback
     end
 
     def send_msg(channel, message = nil)
       publish channel, message.present? && message.is_a?(Hash) ? { job_id: @job_id }.merge(message) : { job_id: @job_id, time: Time.now }
     end
 
-    def finish_worker
+    def finish_worker(exit_status)
+      log_to_file("worker #{job_id} tries to terminate with exit_status #{exit_status}")
       @manager.mark_completed_remaining_tasks(@job)
-      @job.status = 'finished'
+      update_machine_state('FINISHED')
       @manager.workers_terminated.signal('completed') if @manager.alive? && @manager.all_workers_finished?
     end
 
     def notify_finished(exit_status)
-      if exit_status != 0
-        log_to_file("worker #{job_id} tries to terminate")
-        abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new("task  failed with exit status #{exit_status.inspect} ")) # force worker to rollback
-      else
-        async.update_machine_state('FINISHED')
-        log_to_file("worker #{job_id} notifies manager has finished")
-        async.finish_worker
-      end
+      finish_worker(exit_status)
+      return if exit_status == 0
+      error_message = "worker #{@job_id} task  failed with exit status #{exit_status.inspect}  "
+      raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new(error_message), error_message)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -7,7 +7,7 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_accessor :options, :actor, :job_id, :exit_status, :pid, :process, :job
+    attr_accessor :options, :job, :actor, :job_id, :exit_status, :pid, :process
 
     finalizer :process_finalizer
 
@@ -23,6 +23,7 @@ module CapistranoMulticonfigParallel
         end
         @timer = EM::PeriodicTimer.new(0.1) do
           check_exit_status
+          @timer.cancel if @exit_status.present?
         end
       end
       EM.error_handler do|e|
@@ -37,12 +38,11 @@ module CapistranoMulticonfigParallel
     end
 
     def check_exit_status
-      log_to_file("worker #{@job_id} checking exit status #{@exit_status.inspect}") if @exit_status.present?
       return if @exit_status.blank?
+      @timer.cancel
       @job.exit_status = @exit_status
-      log_to_file("worker #{@job_id} startsnotify finished")
+      log_to_file("worker #{@job_id} startsnotify finished with exit status #{@exit_status.inspect}")
       @actor.async.notify_finished(@exit_status)
-      @timer.cancel
     end
 
     def start_async_deploy(cmd, options)
@@ -76,9 +76,8 @@ module CapistranoMulticonfigParallel
     end
 
     def on_exit(status)
+      log_to_file "Child process for worker #{@job_id} on_exit  disconnected due to error #{status.inspect}"
       @exit_status = status.exitstatus
-      log_to_file "Child process for worker #{@job_id} on_exit  disconnected due to error #{status.inspect} and #{@exit_status.inspect}"
-      check_exit_status
     end
 
     def async_exception_handler(*data)
@@ -90,6 +89,7 @@ module CapistranoMulticonfigParallel
 
     def watch_handler(process)
       @process ||= process
+      check_exit_status
     end
 
     def io_callback(io, data)

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -25,19 +25,18 @@ module CapistranoMulticonfigParallel
       #   default_headings << 'Total'
       #   default_headings << 'Progress'
       table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_headings)
-      jobs = @manager.alive? ? @manager.jobs : []
+      jobs = @manager.alive? ? @manager.jobs.dup : []
       if jobs.present?
         count = 0
-        last_job_id = jobs.keys.last.to_i
-        jobs.each do |_job_id, job|
+        jobs.pmap do |job_id, job|
           count += 1
-          add_job_to_table(table, job, count, last_job_id)
+          add_job_to_table(table, job_id, job, count)
         end
       end
       show_terminal_screen(table)
     rescue => ex
       log_to_file("Terminal Table  client disconnected due to error #{ex.inspect}")
-      log_to_file(ex.backtrace)
+      log_error(ex, 'stderr')
       terminate
     end
 
@@ -56,7 +55,9 @@ module CapistranoMulticonfigParallel
       @job_manager.condition.signal('completed') if @manager.all_workers_finished?
     end
 
-    def worker_state(worker)
+    def worker_state(job_id)
+      return unless @manager.alive?
+      worker = @manager.get_worker_for_job(job_id)
       worker.alive? ? worker.worker_state : 'dead'.upcase.red
     end
 
@@ -64,27 +65,24 @@ module CapistranoMulticonfigParallel
       %w(STAGES ACTION)
     end
 
-    def add_job_to_table(table, job, count, last_job_id)
-      return unless @manager.alive?
-      worker = @manager.get_worker_for_job(job.id)
-
-      row = [{ value: count.to_s },
-             { value: job.id.to_s },
+    def add_job_to_table(table, job_id, job, index)
+      row = [{ value: index.to_s },
+             { value: job_id.to_s },
              { value: job.job_stage },
              { value: job.capistrano_action },
              { value: job.setup_command_line_standard(filtered_keys: [CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]).join("\n") },
-             { value: worker_state(worker) }
+             { value: worker_state(job_id) }
             ]
 
       #   if  worker.alive?
-      #     row << { value: worker.rake_tasks.size }
-      #     row << { value: worker_progress(details['processed_job'], worker) }
+      #     row << { value: job.rake_tasks.size }
+      #     row << { value: worker_progress(job_id, job) }
       #   else
       #     row << { value: 0 }
-      #     row << { value:  worker_state(worker) }
+      #     row << { value:  worker_state(job_id) }
       #   end
       table.add_row(row)
-      table.add_separator if last_job_id.to_i != job.id.to_i
+      table.add_separator
       table
     end
 
@@ -92,23 +90,17 @@ module CapistranoMulticonfigParallel
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end
 
-    # def worker_progress(processed_job, worker)
-    #   return worker_state(worker) unless worker.alive?
-    #   tasks = worker.alive? ? worker.invocation_chain : []
-    #   current_task = worker.alive? ? worker.machine.state.to_s : ''
-    #   show_worker_percent(worker, tasks, current_task, processed_job)
+    # def worker_progress(job)
+    #   tasks = job.rake_tasks.size
+    #   current_task = job.status
+    #   show_worker_percent(tasks, current_task, job)
     # end
     #
-    # def show_worker_percent(worker, tasks, current_task, processed_job)
-    #   total_tasks = worker.alive? ? tasks.size : nil
-    #   task_index = worker.alive? ? tasks.index(current_task.to_s).to_i + 1 : 0
+    # def show_worker_percent(tasks, current_task, job)
+    #   task_index = tasks.index(current_task.to_s).to_i + 1
     #   percent = percent_of(task_index, total_tasks)
     #   result  = "Progress [#{format('%.2f', percent)}%]  (executed #{task_index} of #{total_tasks})"
-    #   if worker.alive?
-    #     processed_job.crashed? ? result.red : result.green
-    #   else
-    #     worker_state(worker)
-    #   end
+    #   job.crashed? ? result.red : result.green
     # end
     #
     # def percent_of(index, total)

data/lib/capistrano_multiconfig_parallel/celluloid/web_server.rb

@@ -6,7 +6,7 @@ module CapistranoMulticonfigParallel
     def initialize(*args)
       super(*args)
     rescue => exc
-      log_error(exc)
+      log_error(exc, 'stderr')
       # fails silently
     end
   end

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -22,7 +22,7 @@ module CapistranoMulticonfigParallel
   private
 
     def fetch_application_dependencies(application, action)
-      return [] if app_configuration.application_dependencies.blank? || application.blank?
+      return [] if configuration.application_dependencies.blank? || application.blank?
       applications = get_applications_to_deploy(action, [application.camelcase])
       applications.delete_if { |hash| hash['app'] == application }
     end
@@ -33,7 +33,7 @@ module CapistranoMulticonfigParallel
     end
 
     def application_dependencies
-      deps = app_configuration.application_dependencies
+      deps = configuration.application_dependencies
       value_is_array?(deps) ? deps.map(&:stringify_keys) : []
     end
 

data/lib/capistrano_multiconfig_parallel/classes/interactive_menu.rb

@@ -43,7 +43,7 @@ module CapistranoMulticonfigParallel
     end
 
     def confirm_option_selected
-      print "Enter a comma-separated list of option numbers or one single option number (again to uncheck, ENTER when done): "
+      print 'Enter a comma-separated list of option numbers or one single option number (again to uncheck, ENTER when done): '
       $stdin.gets.squeeze(' ').strip
     end
 

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -17,7 +17,20 @@ module CapistranoMulticonfigParallel
 
     def initialize(options)
       @options = options
-      @command = CapistranoMulticonfigParallel::JobCommand.new(self)
+    end
+
+    def command
+      @command ||= CapistranoMulticonfigParallel::JobCommand.new(self)
+    end
+
+    def job_writer_attributes
+      %w(status exit_status)
+    end
+
+    def setup_writer_attributes(options)
+      job_writer_attributes.each do |attribute|
+        send("#{attribute}=", options.fetch("#{attribute}", send(attribute)))
+      end
     end
 
     def id
@@ -44,19 +57,33 @@ module CapistranoMulticonfigParallel
         value["#{CapistranoMulticonfigParallel::ENV_KEY_JOB_ID}"] = id if hash[:name] == 'env_options'
         verify_empty_options(value)
       end
+      # define_method "#{hash[:name]}=" do |value|
+      #   self.send("#{hash[:name]}=", value)
+      # end
     end
 
     def finished?
-      @status == 'finished'
+      status == 'finished'
+    end
+
+    def failed?
+      ['deploy:failed'].include?(status)
+    end
+
+    def rolling_back?
+      ['deploy:rollback'].include?(action)
     end
 
     def crashed?
-      crashing_actions = ['deploy:rollback', 'deploy:failed']
-      crashing_actions.include?(action) || crashing_actions.include?(status) || failed?
+      failed? || dead? || worker_died? || exit_status.to_i != 0
     end
 
-    def failed?
-      status.present? && status == 'worker_died'
+    def dead?
+      status.present? && status.to_s.downcase == 'dead'
+    end
+
+    def worker_died?
+      status.present? && status.to_s.downcase == 'worker_died'
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -55,7 +55,7 @@ module CapistranoMulticonfigParallel
       command = build_capistrano_task(action)
       run_shell_command(command)
     rescue => ex
-      log_error(ex)
+      log_error(ex, 'stderr')
       execute_standard_deploy('deploy:rollback') if action.blank? && @name == 'deploy'
     end
 

data/lib/capistrano_multiconfig_parallel/classes/{rake_hook_actor.rb → rake_task_hooks.rb}

@@ -3,14 +3,14 @@ require_relative './input_stream'
 require_relative './output_stream'
 module CapistranoMulticonfigParallel
   # class used to handle the rake worker and sets all the hooks before and after running the worker
-  class RakeHookActor
+  class RakeTaskHooks
     attr_accessor :task, :env
     def initialize(env, task)
       @env = env
       @task = task
     end
 
-    def work(&block)
+    def automatic_hooks(&block)
       if job_id.present?
         actor_start_working
         actor.wait_execution until actor.task_approved

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -9,7 +9,8 @@ module CapistranoMulticonfigParallel
       # method used to start
       def start
         check_terminal_tty
-        arguments = multi_fetch_argv(ARGV.dup)
+        CapistranoMulticonfigParallel.original_args = ARGV.dup
+        arguments = multi_fetch_argv(original_args)
         if arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
           run_the_application
         else
@@ -19,7 +20,7 @@ module CapistranoMulticonfigParallel
 
       def run_the_application
         execute_with_rescue('stderr') do
-          verify_validation
+          configuration_valid?
           CapistranoMulticonfigParallel::Application.new.start
         end
       end

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -8,6 +8,12 @@ module CapistranoMulticonfigParallel
     include CapistranoMulticonfigParallel::CoreHelper
     include CapistranoMulticonfigParallel::StagesHelper
 
+    delegate :logger,
+             :configuration,
+             :configuration_valid?,
+             :original_args,
+             to: :CapistranoMulticonfigParallel
+
   module_function
 
     def multi_fetch_argv(args)
@@ -75,7 +81,7 @@ module CapistranoMulticonfigParallel
       return string, [] unless name
       return name,   [] if     remaining_args.empty?
 
-      args = find_remaaining_args(remaining_args)
+      args = find_remaining_args(remaining_args)
       [name, args]
     end
 

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -3,9 +3,9 @@ module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module Configuration
     extend ActiveSupport::Concern
-    include CapistranoMulticonfigParallel::ApplicationHelper
 
     included do
+      include CapistranoMulticonfigParallel::ApplicationHelper
       attr_reader :configuration
 
       def configuration

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -4,26 +4,13 @@ module CapistranoMulticonfigParallel
   module_function
 
     def app_debug_enabled?
-      app_configuration.multi_debug.to_s.downcase == 'true'
+      configuration.multi_debug.to_s.downcase == 'true'
     end
 
     def show_warning(message)
       warn message if app_debug_enabled?
     end
 
-    def app_configuration
-      CapistranoMulticonfigParallel.configuration
-    end
-
-    def app_logger
-      CapistranoMulticonfigParallel.logger
-    end
-
-    def verify_validation
-      CapistranoMulticonfigParallel.original_args = ARGV.dup
-      CapistranoMulticonfigParallel.configuration_valid?
-    end
-
     def check_terminal_tty
       $stdin.sync = true if $stdin.isatty
       $stdout.sync = true if $stdout.isatty
@@ -55,8 +42,19 @@ module CapistranoMulticonfigParallel
       result
     end
 
-    def log_error(error)
-      log_to_file(format_error(error))
+    def filtered_errors
+      [CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, Celluloid::DeadActorError, Celluloid::Task::TerminatedError]
+    end
+
+    def error_filtered?(error)
+      filtered_errors.find { |class_name| error.is_a?(class_name) }.present?
+    end
+
+    def log_error(error, output = nil)
+      return if error_filtered?(error)
+      message = format_error(error)
+      puts(message) if output.present?
+      log_to_file(message)
     end
 
     def format_error(error)
@@ -66,7 +64,7 @@ module CapistranoMulticonfigParallel
     end
 
     def log_to_file(message, job_id = nil)
-      worker_log = job_id.present? ? find_worker_log(job_id) : app_logger
+      worker_log = job_id.present? ? find_worker_log(job_id) : logger
       worker_log.debug(message) if worker_log.present? && app_debug_enabled?
     end
 
@@ -96,7 +94,7 @@ module CapistranoMulticonfigParallel
     end
 
     def websocket_server_config
-      app_configuration.fetch(:websocket_server, {}).stringify_keys
+      configuration.fetch(:websocket_server, {}).stringify_keys
     end
 
     def websocket_config
@@ -112,8 +110,7 @@ module CapistranoMulticonfigParallel
     end
 
     def rescue_error(error, output = nil)
-      puts(format_error(error)) if output.present?
-      log_error(error)
+      log_error(error, output)
       exit(1)
     end
 

data/lib/capistrano_multiconfig_parallel/initializers/rake.rb

@@ -1,10 +1,10 @@
-require_relative '../classes/rake_hook_actor'
+require_relative '../classes/rake_task_hooks'
 Rake::Task.class_eval do
   alias_method :original_execute, :execute
 
   def execute(*args)
-    rake = CapistranoMulticonfigParallel::RakeHookActor.new(ENV, self)
-    rake.work do
+    rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, self)
+    rake.automatic_hooks do
       original_execute(*args)
     end
   end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 20
-    TINY = 9
+    MINOR = 21
+    TINY = 0
     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.20.9
+  version: 0.21.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -634,7 +634,7 @@ files:
 - lib/capistrano_multiconfig_parallel/classes/job.rb
 - lib/capistrano_multiconfig_parallel/classes/job_command.rb
 - lib/capistrano_multiconfig_parallel/classes/output_stream.rb
-- lib/capistrano_multiconfig_parallel/classes/rake_hook_actor.rb
+- lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration/default.yml
 - lib/capistrano_multiconfig_parallel/helpers/application_helper.rb