capistrano_multiconfig_parallel 0.23.4 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c51a46e3d5c4f6634dc50f06d6ceafbc3efdc7e
-  data.tar.gz: b2e3c1c0f6194e27d7df99932ec4c0429413487e
+  metadata.gz: 10e0f45b56213ac92e9ca67846cfd2de1c7df368
+  data.tar.gz: c90e83e1cef6d093af08cb6294c3f8f2066f90a7
 SHA512:
-  metadata.gz: 4fe12cdd323d3531c5407bdb7c15ee7f22b17b0357f7e3afb2cc8b5f84327d3bcddf0d1b018b44c254f797e02dedc6aee2673e7edb0365751d7ba1c98a95f862
-  data.tar.gz: cb96330f7889e54e94dd38820e5c82ba83ee8db2e80568d07b05ab5798e86c0c7a55e0dd0ce0b61ac4263e15558a565e32c8b9cd53eee8f0b6a2cc391aa6da7e
+  metadata.gz: 9591eeed7ec5e34a4e48d84220a2a8f9d385ef565436e3d95ac4d19708bca5682e728938df816f5d1d2ff0dc6f418a69adced59026acfaa63f1a95e6120b913d
+  data.tar.gz: 0650d360299158eafd25a6127c2c30c873c2c5502c35123fd538e7885e990c91d848797462d7cffe6cc8093cdcc0d3b59e80bf0c69cc40132c7e1c5a3e41cd0f

data/.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
     - vendor/**/*
     - Rakefile
 
+ClassLength:
+  Max: 500
+
 Documentation:
   Enabled: true
 

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -1,7 +1,6 @@
 require 'capistrano/multiconfig/dsl'
 module CapistranoMulticonfigParallel
   # finds app dependencies, shows menu and delegates jobs to celluloid manager
-  # rubocop:disable ClassLength
   class Application
     include Celluloid
     include Celluloid::Logger
@@ -9,12 +8,14 @@ module CapistranoMulticonfigParallel
     include Capistrano::DSL
     include Capistrano::Multiconfig::DSL
 
-    attr_reader :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
+    attr_reader :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage, :job_count
+    attr_writer :job_count
 
     def initialize
       Celluloid.boot
       @stage_apps = multi_apps? ? stages.map { |stage| stage.split(':').reverse[1] }.uniq : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
+      @job_count = 0
       @jobs = []
     end
 
@@ -191,11 +192,13 @@ module CapistranoMulticonfigParallel
       @jobs.pmap do |job|
         @manager.async.delegate(job)
       end
-      until @manager.registration_complete
-        sleep(0.1) # keep current thread alive
+      unless can_tag_staging?
+        until @manager.registration_complete
+          sleep(0.1) # keep current thread alive
+        end
+        return unless @manager.registration_complete
+        @manager.async.process_jobs
       end
-      return unless @manager.registration_complete
-      @manager.async.process_jobs
       wait_jobs_termination
     end
 
@@ -220,10 +223,11 @@ module CapistranoMulticonfigParallel
 
       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_count += 1
       job = CapistranoMulticonfigParallel::Job.new(Actor.current, options.merge(
                                                                     action: custom_command? && env_options['ACTION'].present? ? env_options['ACTION'] : options['action'],
-                                                                    env_options: job_env_options
+                                                                    env_options: job_env_options,
+                                                                    count: @job_count
       ))
       @jobs << job
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -3,7 +3,7 @@ require_relative './terminal_table'
 require_relative './web_server'
 require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
-  # rubocop:disable ClassLength
+  # manager class that handles workers
   class CelluloidManager
     include Celluloid
     include Celluloid::Notifications
@@ -44,23 +44,23 @@ module CapistranoMulticonfigParallel
       @jobs[job.id] = job
       # debug(@jobs)
       # start work and send it to the background
-      @workers.async.work(job, Actor.current)
+      @workers.work(job, Actor.current)
     end
 
     # call back from actor once it has received it's job
     # actor should do this asap
     def register_worker_for_job(job, worker)
-      worker.job_id = job.id if worker.job_id.blank?
       @job_to_worker[job.id] = worker
       @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 if !syncronized_confirmation? || job.failed? || job.rolling_back?
-      @registration_complete = true if @job_manager.jobs.size == @job_to_worker.size
+      return unless syncronized_confirmation?
+      @registration_complete = true if @job_manager.jobs.size == @jobs.size
     end
 
     def all_workers_finished?
-      @jobs.all? { |_job_id, job| job.finished? || job.crashed? || job.rolling_back? }
+      @jobs.all? { |_job_id, job| job.finished? || job.crashed? }
     end
 
     def process_jobs
@@ -193,9 +193,9 @@ module CapistranoMulticonfigParallel
       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(@job_manager, new_job_options.merge(options.except(job.job_writer_attributes)))
-      new_job.setup_writer_attributes(options)
+      @job_manager.job_count += 1
+      new_job_options = job.options.merge('env_options' => job.env_options.merge(env_opts), 'count' => @job_manager.job_count)
+      new_job = CapistranoMulticonfigParallel::Job.new(@job_manager, new_job_options.merge(options))
       async.delegate(new_job) unless job.worker_died?
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -2,7 +2,6 @@ require_relative './child_process'
 require_relative './state_machine'
 require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
-  # rubocop:disable ClassLength
   # worker that will spawn a child process in order to execute a capistrano job and monitor that process
   #
   # @!attribute job
@@ -32,12 +31,13 @@ module CapistranoMulticonfigParallel
     def work(job, manager)
       @job = job
       @job_id = job.id
-      @worker_state = 'started'
+      @worker_state = job.status
       @manager = manager
       @job_confirmation_conditions = []
       log_to_file("worker #{@job_id} received #{job.inspect}")
       @subscription_channel = "worker_#{@job_id}"
-      @machine = CapistranoMulticonfigParallel::StateMachine.new(job, Actor.current)
+      @machine = CapistranoMulticonfigParallel::StateMachine.new(@job, Actor.current)
+      @manager.setup_worker_conditions(@job)
       manager.register_worker_for_job(job, Actor.current)
     end
 
@@ -51,8 +51,7 @@ module CapistranoMulticonfigParallel
     end
 
     def start_task
-      @manager.setup_worker_conditions(@job)
-      log_to_file("exec worker #{@job_id} starts task with #{@job.inspect}")
+      log_to_file("exec worker #{@job_id} starts task")
       @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: debug_websocket?, channel: subscription_channel)
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -14,27 +14,48 @@ module CapistranoMulticonfigParallel
     def work(job, cmd, options = {})
       @options = options
       @job = job
+      @cmd = cmd
+      start_running
+    end
+
+    def start_running
+      setup_attributes
+      run_event_machine
+      setup_em_error_handler
+    end
+
+    def setup_attributes
       @actor = @options.fetch(:actor, nil)
       @job_id = @job.id
       @exit_status = nil
+    end
+
+    def setup_em_error_handler
+      EM.error_handler do|exception|
+        log_to_file("Error during event loop for worker #{@job_id}: #{format_error(exception)}", job_id: @job_id)
+        EM.stop
+      end
+    end
+
+    def run_event_machine
       EM.run do
         EM.next_tick do
-          start_async_deploy(cmd, options)
-        end
-        @timer = EM::PeriodicTimer.new(0.1) do
-          check_exit_status
-          @timer.cancel if @exit_status.present?
+          start_async_deploy
         end
+        setup_periodic_timer
       end
-      EM.error_handler do|e|
-        log_to_file("Error during event loop for worker #{@job_id}: #{e.inspect}", job_id: @job_id)
-        log_to_file(e.backtrace, job_id: @job_id)
-        EM.stop
+    end
+
+    def setup_periodic_timer
+      @timer = EM::PeriodicTimer.new(0.1) do
+        check_exit_status
+        @timer.cancel if @exit_status.present?
       end
     end
 
     def process_finalizer
       EM.stop if EM.reactor_running?
+      terminate
     end
 
     def check_exit_status
@@ -45,11 +66,11 @@ module CapistranoMulticonfigParallel
       @actor.async.notify_finished(@exit_status)
     end
 
-    def start_async_deploy(cmd, options)
+    def start_async_deploy
       RightScale::RightPopen.popen3_async(
-        cmd,
+        @cmd,
         target: self,
-        environment: options[:environment].present? ? options[:environment] : nil,
+        environment: @options.fetch(:environment, nil),
         pid_handler: :on_pid,
         input: :on_input_stdin,
         stdout_handler: :on_read_stdout,
@@ -78,6 +99,7 @@ module CapistranoMulticonfigParallel
     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
+      check_exit_status
     end
 
     def async_exception_handler(*data)

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -1,15 +1,14 @@
 require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class that handles the rake task and waits for approval from the celluloid worker
-  # rubocop:disable ClassLength
   class RakeWorker
     include Celluloid
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_accessor :env, :client, :job_id, :action, :task,
-                  :task_approved, :successfull_subscription,
-                  :subscription_channel, :publisher_channel, :stdin_result
+    attr_reader :env, :client, :job_id, :action, :task,
+                :task_approved, :successfull_subscription,
+                :subscription_channel, :publisher_channel, :stdin_result
 
     def work(env, options = {})
       @options = options.stringify_keys
@@ -73,32 +72,21 @@ module CapistranoMulticonfigParallel
 
     def on_message(message)
       return unless message.present?
-      log_debug('on_message', message)
+      log_to_file("Rake worker #{@job_id} received after on message:", message)
       if @client.succesfull_subscription?(message)
         publish_subscription_successfull(message)
-      elsif msg_for_task?(message) || msg_for_stdin?(message)
+      elsif msg_for_task?(message)
         task_approval(message)
+      elsif msg_for_stdin?(message)
         stdin_approval(message)
       else
         show_warning "unknown action: #{message.inspect}"
       end
     end
 
-    def log_debug(action, message)
-      log_to_file("Rake worker #{@job_id} received after #{action}: #{message}")
-    end
-
-    def msg_for_stdin?(message)
-      message['action'] == 'stdin'
-    end
-
-    def msg_for_task?(message)
-      message['task'].present?
-    end
-
     def publish_subscription_successfull(message)
       return unless @client.succesfull_subscription?(message)
-      log_debug('publish_subscription_successfull', message)
+      log_to_file("Rake worker #{@job_id} received after publish_subscription_successfull:", message)
       @successfull_subscription = true
       publish_to_worker(task_data)
     end
@@ -106,14 +94,14 @@ module CapistranoMulticonfigParallel
     def wait_for_stdin_input
       wait_execution until @stdin_result.present?
       output = @stdin_result.clone
-      Actor.current.stdin_result = nil
+      @stdin_result = nil
       output
     end
 
     def stdin_approval(message)
       return unless msg_for_stdin?(message)
-      if @job_id.to_i == message['job_id'].to_i && message['result'].present?
-        @stdin_result = message['result']
+      if @job_id == message['job_id']
+        @stdin_result = message.fetch('result', '')
       else
         show_warning "unknown invocation #{message.inspect}"
       end
@@ -121,7 +109,7 @@ module CapistranoMulticonfigParallel
 
     def task_approval(message)
       return unless msg_for_task?(message)
-      if @job_id.to_i == message['job_id'].to_i && message['task'] == task_name && message['approved'] == 'yes'
+      if @job_id == message['job_id'] && message['task'] == task_name && message['approved'] == 'yes'
         @task_approved = true
       else
         show_warning "unknown invocation #{message.inspect}"
@@ -133,27 +121,11 @@ module CapistranoMulticonfigParallel
       terminate
     end
 
-    def get_question_details(data)
-      question = ''
-      default = nil
-      if data =~ /(.*)\?*\s*\:*\s*(\([^)]*\))*/m
-        question = Regexp.last_match(1)
-        default = Regexp.last_match(2)
-      end
-      question.present? ? [question, default] : nil
-    end
-
-    def printing_question?(data)
-      get_question_details(data).present?
-    end
-
     def user_prompt_needed?(data)
-      return if !printing_question?(data) || @action != 'invoke'
-
-      details = get_question_details(data)
-      default = details.second.present? ? details.second : nil
+      question, default = get_question_details(data)
+      return if question.blank? || @action != 'invoke'
       publish_to_worker(action: 'stdout',
-                        question: details.first,
+                        question: question,
                         default: default.delete('()'),
                         job_id: @job_id)
       wait_for_stdin_input

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -28,10 +28,9 @@ module CapistranoMulticonfigParallel
     end
 
     def notify_time_change(_channel, _message)
-      @table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_heaadings)
-      jobs = @manager.alive? ? @manager.jobs.dup : []
-      setup_table_jobs(jobs)
-      display_table_on_terminal
+      table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_heaadings)
+      setup_table_jobs(table)
+      display_table_on_terminal(table)
     end
 
     def rescue_exception(ex)
@@ -40,16 +39,17 @@ module CapistranoMulticonfigParallel
       terminate
     end
 
-    def display_table_on_terminal
+    def display_table_on_terminal(table)
       terminal_clear
-      puts "\n#{@table}\n"
+      puts "\n#{table}\n"
       signal_complete
     end
 
-    def setup_table_jobs(jobs)
-      jobs.each_with_index do |(_job_id, job), count|
-        @table.add_row(job.terminal_row(count))
-        @table.add_separator
+    def setup_table_jobs(table)
+      jobs = @manager.alive? ? @manager.jobs.dup : []
+      jobs.each do |_job_id, job|
+        table.add_row(job.terminal_row)
+        table.add_separator
       end
     end
 
@@ -59,9 +59,16 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def managers_alive?
+      @job_manager.alive? && @manager.alive?
+    end
+
     def signal_complete
-      return if !@job_manager.alive? || @manager.alive?
-      @job_manager.condition.signal('completed') if @manager.all_workers_finished?
+      if managers_alive? && @manager.all_workers_finished?
+        @job_manager.condition.signal('completed')
+      elsif !managers_alive?
+        terminate
+      end
     end
 
     def terminal_clear

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -5,7 +5,7 @@ module CapistranoMulticonfigParallel
   class Job
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :options, :command
+    attr_reader :options
     attr_writer :status, :exit_status
 
     delegate :job_stage,
@@ -16,7 +16,7 @@ module CapistranoMulticonfigParallel
              to: :command
 
     def initialize(application, options)
-      @options = options
+      @options = options.stringify_keys
       @application = application
       @manager = @application.manager
     end
@@ -33,9 +33,9 @@ module CapistranoMulticonfigParallel
       setup_command_line(filtered_keys: [env_variable])
     end
 
-    def terminal_row(index)
+    def terminal_row
       [
-        { value: (index + 1).to_s },
+        { value: count.to_s },
         { value: id.to_s },
         { value: wrap_string(job_stage) },
         { value: wrap_string(capistrano_action) },
@@ -51,43 +51,26 @@ module CapistranoMulticonfigParallel
       worker.alive? ? worker.worker_state : default
     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
       @id ||= @options.fetch('id', SecureRandom.uuid)
     end
 
-    def status
-      @status ||= @options.fetch('status', :unstarted)
-    end
-
-    def exit_status
-      @exit_status ||= @options.fetch('exit_status', nil)
-    end
-
     [
       { name: 'app', default: '' },
       { name: 'stage', default: '' },
       { name: 'action', default: '' },
       { name: 'task_arguments', default: [] },
-      { name: 'env_options', default: {} }
+      { name: 'env_options', default: {} },
+      { name: 'status', default: :unstarted },
+      { name: 'exit_status', default: nil },
+      { name: 'count', default: nil }
     ].each do |hash|
       define_method hash[:name] do
         value = @options.fetch(hash[:name], hash[:default])
         value["#{env_variable}"] = id if hash[:name] == 'env_options'
-        verify_empty_options(value)
+        value = verify_empty_options(value)
+        instance_variable_set("@#{hash[:name]}", instance_variable_get("@#{hash[:name]}") || value)
       end
-      # define_method "#{hash[:name]}=" do |value|
-      #   self.send("#{hash[:name]}=", value)
-      # end
     end
 
     def finished?

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -14,6 +14,19 @@ module CapistranoMulticonfigParallel
 
   module_function
 
+    def msg_for_stdin?(message)
+      message['action'] == 'stdin'
+    end
+
+    def msg_for_task?(message)
+      message['task'].present?
+    end
+
+    def get_question_details(data)
+      /(.*)\?*\s*\:*\s*(\([^)]*\))*/m =~ data
+      [regex_last_match(1), regex_last_match(2)]
+    end
+
     def setup_command_line_standard(*args)
       options = args.extract_options!
       args.select(&:present?)

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -38,12 +38,8 @@ module CapistranoMulticonfigParallel
       result
     end
 
-    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?
+      [CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed].find { |class_name| error.is_a?(class_name) }.present?
     end
 
     def log_error(error, output = nil)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 23
-    TINY = 4
+    MINOR = 24
+    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.23.4
+  version: 0.24.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap