capistrano_multiconfig_parallel 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636e8807495e7cc5082a737fddaf6de9eb132d50
-  data.tar.gz: 77409e0a2196ce97e32fc12f9d9feffd54972bda
+  metadata.gz: c16a337397b541e4bed172a5abda0ad5b625d81b
+  data.tar.gz: 2d452cdd7abcb3b9f7cbad1e134b6a6199cab0e9
 SHA512:
-  metadata.gz: 524ffa981d6cfc38698300d0334ec049a384002ed9b0b31eed239ca4d02047fce155a3211e53a720d533e2b911aa320fea0e789d934dd7728fb1c239c54d2f4c
-  data.tar.gz: d8b40b726fb03873c14d720604bbd99ee74e676d177b1778ab2cfa791d1645b86f473abd701d124f56779414ededec03c5dce0da0af7c81cb9cd61485752920f
+  metadata.gz: 5f6537946ef0fa1a9a70ad8aea9a255a5db0b85c4ed019f565f443b4079067d1650d353f53b13b62f5c157e7c2299462a5d2a9083f0c615f9ca4105826623300
+  data.tar.gz: 2c59e8ba2d189d3c757de7c4567629f16dba74933c0ddd1be57f3607f000420805e354cacaf7299926b6a2f89d785fd143abe30dc8b7b52ea65620cca1503bad

data/capistrano_multiconfig_parallel.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
   s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.2'
-  s.add_runtime_dependency 'celluloid_pubsub', '~> 0.0', '>= 0.0.21'
+  s.add_runtime_dependency 'celluloid_pubsub', '~> 0.0', '>= 0.0.22'
   s.add_runtime_dependency 'composable_state_machine', '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency 'terminal-table', '~> 1.5', '>= 1.5.2'
   s.add_runtime_dependency 'colorize', '~>  0.7', '>= 0.7'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -43,7 +43,7 @@ module CapistranoMulticonfigParallel
       options = options.stringify_keys
       return unless applications.present?
       applications.each do |app|
-        deploy_app(options.merge('app' => app))
+        deploy_app(options.merge('app' => app['app']))
       end
     end
 
@@ -111,7 +111,7 @@ module CapistranoMulticonfigParallel
       return unless @jobs.present?
       FileUtils.rm Dir["#{log_directory}/worker_*.log"]
       if app_configuration.multi_secvential.to_s.downcase == 'true'
-        @jobs.each { |job| CapistranoMulticonfigParallel::StandardDeploy.new(job) }
+        @jobs.each { |job| job.execute_standard_deploy }
       else
         run_async_jobs
       end
@@ -142,11 +142,10 @@ module CapistranoMulticonfigParallel
 
     def deploy_app(options = {})
       options = options.stringify_keys
-      app = options['app'].is_a?(Hash) ? options['app'] : { 'app' => options['app'] }
       branch = @branch_backup.present? ? @branch_backup : @argv['BRANCH'].to_s
       call_task_deploy_app({
         branch: branch,
-        app: app,
+        app: options['app'],
         action: options['action']
       }.reverse_merge(options))
     end
@@ -210,8 +209,7 @@ module CapistranoMulticonfigParallel
     def prepare_job(options)
       options = options.stringify_keys
       branch_name = options.fetch('branch', {})
-      app = options.fetch('app', {})
-      app = app.fetch('app', '')
+      app = options.fetch('app', '')
       box = options['env_options']['BOX']
       message = box.present? ? "BOX #{box}:" : "stage #{options['stage']}:"
       env_opts = get_app_additional_env_options(app, message)
@@ -221,15 +219,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 = {
-        id: SecureRandom.random_number(500),
-        app: app,
-        env: options['stage'],
+      job = CapistranoMulticonfigParallel::Job.new(options.merge(
         action: custom_command? && env_options['ACTION'].present? ? env_options['ACTION'] : options['action'],
-        task_arguments: options['task_arguments'],
         env_options: job_env_options
-      }
-      @jobs << job.stringify_keys
+      ))
+      @jobs << job
     end
 
     def prepare_options(options)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -25,6 +25,9 @@ module CapistranoMulticonfigParallel
       # http://rubydoc.info/gems/celluloid/Celluloid/SupervisionGroup/Member
       @workers = @worker_supervisor.pool(CapistranoMulticonfigParallel::CelluloidWorker, as: :workers, size: 10)
       Actor.current.link @workers
+      @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current, @job_manager)
+      @worker_supervisor.supervise_as(:web_server, CapistranoMulticonfigParallel::WebServer, websocket_config)
+
       # Get a handle on the PoolManager
       # http://rubydoc.info/gems/celluloid/Celluloid/PoolManager
       # @workers = workers_pool.actor
@@ -33,22 +36,12 @@ module CapistranoMulticonfigParallel
       @job_to_worker = {}
       @worker_to_job = {}
       @job_to_condition = {}
-      @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current, @job_manager)
-      @worker_supervisor.supervise_as(:web_server, CapistranoMulticonfigParallel::WebServer, websocket_config)
-    end
-
-    def generate_job_id(job)
-      @jobs[job['id']] = job
-      job['id']
     end
 
     # call to send an actor
     # a job
     def delegate(job)
-      job = job.stringify_keys
-      job['id'] = generate_job_id(job) unless job_failed?(job)
-      @jobs[job['id']] = job
-      job['env_options'][CapistranoMulticonfigParallel::ENV_KEY_JOB_ID] = job['id']
+      @jobs[job.id] = job
       # debug(@jobs)
       # start work and send it to the background
       @workers.async.work(job, Actor.current)
@@ -57,18 +50,8 @@ module CapistranoMulticonfigParallel
     # call back from actor once it has received it's job
     # actor should do this asap
     def register_worker_for_job(job, worker)
-      job = job.stringify_keys
-      if job['id'].blank?
-        log_to_file("job id not found. delegating again the job #{job.inspect}")
-        delegate(job)
-      else
-        start_worker(job, worker)
-      end
-    end
-
-    def start_worker(job, worker)
-      worker.job_id = job['id'] if worker.job_id.blank?
-      @job_to_worker[job['id']] = 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
@@ -77,7 +60,7 @@ module CapistranoMulticonfigParallel
     end
 
     def all_workers_finished?
-      @job_to_worker.all? { |job_id, _worker| @jobs[job_id]['worker_action'] == 'finished' }
+      @job_to_worker.all? { |job_id, _worker| @jobs[job_id].finished? }
     end
 
     def process_jobs
@@ -105,24 +88,24 @@ module CapistranoMulticonfigParallel
       !@job_manager.can_tag_staging?
     end
 
-    def apply_confirmation_for_worker(worker)
-      worker.alive? && app_configuration.apply_stage_confirmation.include?(worker.env_name) && apply_confirmations?
+    def apply_confirmation_for_job(job)
+       app_configuration.apply_stage_confirmation.include?(job.stage) && apply_confirmations?
     end
 
-    def setup_worker_conditions(worker)
-      return unless apply_confirmation_for_worker(worker)
+    def setup_worker_conditions(job)
+      return unless apply_confirmation_for_job(job)
       hash_conditions = {}
       app_configuration.task_confirmations.each do |task|
         hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
       end
-      @job_to_condition[worker.job_id] = hash_conditions
+      @job_to_condition[job.id] = hash_conditions
     end
 
-    def mark_completed_remaining_tasks(worker)
-      return unless apply_confirmation_for_worker(worker)
+    def mark_completed_remaining_tasks(job)
+      return unless apply_confirmation_for_job(job)
       app_configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
-        task_confirmation = @job_to_condition[worker.job_id][task]
+        task_confirmation = @job_to_condition[job.id][task]
         if task_confirmation[:status] != 'confirmed'
           task_confirmation[:status] = 'confirmed'
           task_confirmation[:condition].signal(fake_result)
@@ -130,11 +113,12 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def wait_task_confirmations_worker(worker)
-      return if !apply_confirmation_for_worker(worker) || !syncronized_confirmation?
+    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|
-        result = wait_condition_for_task(worker.job_id, task)
-        confirm_task_approval(result, task, worker) if result.present?
+        result = wait_condition_for_task(job.id, task)
+        confirm_task_approval(result, task, job) if result.present?
       end
     end
 
@@ -157,10 +141,10 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def print_confirm_task_approvall(result, task, worker = nil)
+    def print_confirm_task_approvall(result, task, job)
       return if result.is_a?(Proc)
       message = "Do you want  to continue the deployment and execute #{task.upcase}"
-      message += " for JOB #{worker.job_id}" if worker.present?
+      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?
@@ -169,17 +153,17 @@ module CapistranoMulticonfigParallel
       apps_symlink_confirmation
     end
 
-    def confirm_task_approval(result, task, worker = nil)
+    def confirm_task_approval(result, task, job = nil)
       return unless result.present?
-      result = print_confirm_task_approvall(result, task, worker = nil)
+      result = print_confirm_task_approvall(result, task, job)
       return if result.blank? || result.downcase != 'y'
       @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
-                                 )
+        'action' => 'invoke',
+        'job_id' => job.id,
+        'task' => task
+        )
       end
     end
 
@@ -187,50 +171,25 @@ module CapistranoMulticonfigParallel
       if job.present?
         if job.is_a?(Hash)
           job = job.stringify_keys
-          @job_to_worker[job['id']]
+          @job_to_worker[job.id]
         else
-          @job_to_worker[job.to_i]
+          @job_to_worker[job]
         end
       else
         return nil
-    end
       end
+    end
 
     def can_tag_staging?
       @job_manager.can_tag_staging? &&
-        @jobs.find { |_job_id, job| job['env'] == 'production' }.blank?
-    end
-
-    def dispatch_new_job(job)
-      original_env = job['env_options']
-      env_opts = @job_manager.get_app_additional_env_options(job['app_name'], job['env'])
-      job['env_options'] = original_env.merge(env_opts)
-      async.delegate(job)
+      @jobs.find { |_job_id, job| job['env'] == 'production' }.blank?
     end
 
-    def filtered_env_keys
-      %w(STAGES ACTION)
-    end
-
-    def process_job(job)
-      if job['processed']
-        @jobs[job['job_id']]
-      else
-        env_options = {}
-        job['env_options'].each do |key, value|
-          env_options[key] = value if value.present? && !filtered_env_keys.include?(key)
-        end
-        {
-          'job_id' => job['id'],
-          'app_name' => job['app'],
-          'env_name' => job['env'],
-          'action_name' => job['action'],
-          'env_options' => env_options,
-          'task_arguments' => job['task_arguments'],
-          'job_argv' => job.fetch('job_argv', []),
-          'processed' => true
-        }
-      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_s)
+      async.delegate(new_job)
     end
 
     # lookup status of job by asking actor running it
@@ -239,29 +198,33 @@ module CapistranoMulticonfigParallel
       if job.present?
         if job.is_a?(Hash)
           job = job.stringify_keys
-          actor = @registered_jobs[job['id']]
+          actor = @job_to_worker[job.id]
           status = actor.status
         else
-          actor = @registered_jobs[job.to_i]
+          actor = @job_to_worker[job]
           status = actor.status
         end
       end
       status
     end
 
+    def job_crashed?(job)
+      job.action == 'deploy:rollback' || job.action == 'deploy:failed' || job_failed?(job)
+    end
+
     def job_failed?(job)
-      job['worker_action'].present? && job['worker_action'] == 'worker_died'
+      job.status.present? && job.status == 'worker_died'
     end
 
     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_failed?(job)
-      return unless job['action_name'] == 'deploy'
+      return if job.blank? || job_crashed?(job)
+      return unless job.action == 'deploy'
       log_to_file "restarting #{job} on new worker"
-      job = job.merge(:action => 'deploy:rollback', 'worker_action' => 'worker_died')
-      delegate(job)
+      job.status = 'worker_died'
+      dispatch_new_job(job, :action => 'deploy:rollback')
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -27,14 +27,14 @@ module CapistranoMulticonfigParallel
     attr_accessor :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :client, :task_argv,
                   :rake_tasks, :current_task_number, # tracking tasks
                   :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
-                  :job_termination_condition, :worker_state, :invocation_chain, :filename, :worker_log
+                  :job_termination_condition, :worker_state, :invocation_chain, :filename, :worker_log, :exit_status
 
     def work(job, manager)
       @job = job
+      @job_id = job.id
       @worker_state = 'started'
       @manager = manager
       @job_confirmation_conditions = []
-      process_job(job) if job.present?
       log_to_file("worker #{@job_id} received #{job.inspect}")
       @subscription_channel = "worker_#{@job_id}"
       @machine = CapistranoMulticonfigParallel::StateMachine.new(job, Actor.current)
@@ -42,7 +42,7 @@ module CapistranoMulticonfigParallel
     end
 
     def start_task
-      @manager.setup_worker_conditions(Actor.current)
+      @manager.setup_worker_conditions(@job)
       log_to_file("exec worker #{@job_id} starts task with #{@job.inspect}")
       @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: debug_websocket?, channel: subscription_channel)
     end
@@ -52,7 +52,7 @@ module CapistranoMulticonfigParallel
     end
 
     def rake_actor_id(data)
-      data['action'].present? && data['action'] == 'count' ? "rake_worker_#{@job_id}_count" : "rake_worker_#{@job_id}"
+       "rake_worker_#{@job_id}"
     end
 
     def on_message(message)
@@ -77,29 +77,14 @@ module CapistranoMulticonfigParallel
       @invocation_chain ||= []
     end
 
-    def cd_working_directory
-      "cd #{detect_root}"
-    end
-
-    # def generate_command_new
-    #   <<-CMD
-    #     bundle exec ruby -e "require 'bundler' ;   Bundler.with_clean_env { %x[cd #{cd_working_directory} && bundle install && RAILS_ENV=#{@env_name} bundle exec cap #{@task_argv.join(' ')}] } "
-    #   CMD
-    # end
 
-    def generate_command
-      <<-CMD
-      #{cd_working_directory} && RAILS_ENV=#{@env_name} bundle exec multi_cap #{@task_argv.join(' ')}
-      CMD
-    end
 
     def execute_deploy
       log_to_file("invocation chain #{@job_id} is : #{@rake_tasks.inspect}")
       check_child_proces
-      setup_task_arguments
-      log_to_file("worker #{@job_id} executes: #{generate_command}")
-      @child_process.async.work(generate_command, actor: Actor.current, silent: true)
-      @manager.wait_task_confirmations_worker(Actor.current)
+      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
@@ -117,15 +102,15 @@ module CapistranoMulticonfigParallel
     end
 
     def check_gitflow
-      return if @env_name != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
-      @manager.dispatch_new_job(@job.merge('env' => 'production'))
+      return if @job.stage != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
+      @manager.dispatch_new_job(@job,'env' => 'production')
     end
 
     def handle_subscription(message)
       if message_is_about_a_task?(message)
         check_gitflow
         save_tasks_to_be_executed(message)
-        update_machine_state(message['task']) # if message['action'] == 'invoke'
+        async.update_machine_state(message['task']) # if message['action'] == 'invoke'
         log_to_file("worker #{@job_id} state is #{@machine.state}")
         task_approval(message)
       elsif message_is_for_stdout?(message)
@@ -169,77 +154,29 @@ module CapistranoMulticonfigParallel
       log_to_file("worker #{@job_id} triest to transition from #{@machine.state} to  #{name}")
       @machine.transitions.on(name.to_s, @machine.state => name.to_s)
       @machine.go_to_transition(name.to_s)
-      abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task #{@action} failed ") if name == 'deploy:failed' # force worker to rollback
-    end
-
-    def setup_command_line(*options)
-      @task_argv = []
-      options.each do |option|
-        @task_argv << option
-      end
-      @task_argv
-    end
-
-    def worker_stage
-      @app_name.present? ? "#{@app_name}:#{@env_name}" : "#{@env_name}"
-    end
-
-    def worker_action
-      "#{@action_name}[#{@task_arguments.join(',')}]"
+      abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new("task #{@action} failed ")) if name == 'deploy:failed' # force worker to rollback
     end
 
-    def setup_task_arguments(*args)
-      #   stage = "#{@app_name}:#{@env_name} #{@action_name}"
-      array_options = []
-      @env_options.each do |key, value|
-        array_options << "#{key}=#{value}" if value.present?
-      end
-      array_options << '--trace' if app_debug_enabled?
-      args.each do |arg|
-        array_options << arg
-      end
-      @manager.jobs[@job_id]['job_argv'] = array_options.clone
-      array_options.unshift("#{worker_action}")
-      array_options.unshift("#{worker_stage}")
-      setup_command_line(*array_options)
-    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 process_job(job)
-      processed_job = @manager.process_job(job)
-      @job_id = processed_job['job_id']
-      @app_name = processed_job['app_name']
-      @env_name = processed_job['env_name']
-      @action_name = processed_job['action_name']
-      @env_options = processed_job['env_options']
-      @task_arguments = processed_job['task_arguments']
-    end
-
-    def crashed?
-      @action_name == 'deploy:rollback' || @action_name == 'deploy:failed' || @manager.job_failed?(@job)
-    end
-
     def finish_worker
-      @manager.mark_completed_remaining_tasks(Actor.current)
-      @manager.jobs[@job_id]['worker_action'] = 'finished'
-      @manager.workers_terminated.signal('completed') if @manager.all_workers_finished?
+      @manager.mark_completed_remaining_tasks(@job)
+      @job.status = 'finished'
+      @manager.workers_terminated.signal('completed') if @manager.alive? && @manager.all_workers_finished?
     end
 
-    def worker_finshed?
-      @manager.jobs[@job_id]['worker_action'] == 'finished'
-    end
 
     def notify_finished(exit_status)
-      if exit_status.exitstatus != 0
+      if exit_status != 0
         log_to_file("worker #{job_id} tries to terminate")
-        abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task  failed with exit status #{exit_status.inspect} ") # force worker to rollback
+        abort(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new("task  failed with exit status #{exit_status.inspect} ")) # force worker to rollback
       else
-        update_machine_state('FINISHED')
+        async.update_machine_state('FINISHED')
         log_to_file("worker #{job_id} notifies manager has finished")
-        finish_worker
+        async.finish_worker
       end
     end
   end

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -7,14 +7,16 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_accessor :actor, :pid, :exit_status, :process, :job_id
+    attr_accessor :options, :actor, :job_id, :exit_status, :pid, :process, :job
 
-    finalizer :process_finalizer
+   finalizer :process_finalizer
 
-    def work(cmd, options = {})
+    def work(job, cmd, options = {})
       @options = options
+      @job = job
       @actor = @options.fetch(:actor, nil)
-      @job_id = @actor.job_id
+      @job_id = @job.id
+      @exit_status = nil
       EM.run do
         EM.next_tick do
           start_async_deploy(cmd, options)
@@ -31,14 +33,16 @@ module CapistranoMulticonfigParallel
     end
 
     def process_finalizer
-      @timer.cancel
       EM.stop if EM.reactor_running?
     end
 
     def check_exit_status
-      return if @exit_status.blank? || !@actor.worker_finshed?
-      debug("worker #{@actor.job_id} startsnotify finished") if @debug_enabled
-      @actor.notify_finished(@exit_status)
+      log_to_file("worker #{@job_id} checking exit status #{@exit_status.inspect}") if @exit_status.present?
+      return if @exit_status.blank?
+      @job.exit_status = @exit_status
+      log_to_file("worker #{@job_id} startsnotify finished")
+      @actor.async.notify_finished(@exit_status)
+      @timer.cancel
     end
 
     def start_async_deploy(cmd, options)
@@ -72,14 +76,16 @@ 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
+      @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)
       log_to_file "Child process for worker #{@job_id} async_exception_handler  disconnected due to error #{data.inspect}"
       io_callback('stderr', data)
       @exit_status = 1
+      check_exit_status
     end
 
     def watch_handler(process)

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -21,7 +21,7 @@ module CapistranoMulticonfigParallel
 
     def custom_attributes
       @publisher_channel = "worker_#{@job_id}"
-      @action = @options['actor_id'].include?('_count') ? 'count' : 'invoke'
+      @action =  'invoke'
       @task = @options['task']
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -27,17 +27,19 @@ module CapistranoMulticonfigParallel
       #   default_headings << 'Total'
       #   default_headings << 'Progress'
       table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_headings)
-      if @manager.jobs.present? && message_valid?(message)
+
+      if @manager.alive? && @manager.jobs.present? && message_valid?(message)
         count = 0
-        @manager.jobs.each do |job_id, _job|
+        last_job_id = @manager.jobs.keys.last.to_i
+        @manager.jobs.each do |job_id, job|
           count += 1
-          add_job_to_table(table, job_id, count)
+          add_job_to_table(table, job_id, job,  count, last_job_id)
         end
       end
       show_terminal_screen(table)
     rescue => ex
-      info "Terminal Table  client disconnected due to error #{ex.inspect}"
-      info ex.backtrace
+      log_to_file("Terminal Table  client disconnected due to error #{ex.inspect}")
+      log_to_file(ex.backtrace)
       terminate
     end
 
@@ -62,50 +64,35 @@ module CapistranoMulticonfigParallel
       @job_manager.condition.signal('completed') if @manager.all_workers_finished?
     end
 
-    def worker_state(worker)
+    def worker_state(worker, job)
       if worker.alive?
         state = worker.machine.state.to_s
-        worker.crashed? ? state.red : state.green
+        @manager.job_crashed?(job) ? state.red : state.green
       else
         'dead'.upcase.red
       end
     end
 
-    def worker_env_options(processed_job)
-      worker_optons = ''
-      processed_job['job_argv'].each do |elem|
-        worker_optons << "#{elem}\n"
-      end
-      worker_optons
-    end
-
-    def worker_action(processed_job)
-      processed_job['task_arguments'].present? ? "#{processed_job['action_name']}[#{processed_job['task_arguments'].join(',')}]" : processed_job['action_name']
-    end
-
-    def worker_stage(processed_job)
-      processed_job['app_name'].present? ? "#{processed_job['app_name']}\n#{processed_job['env_name']}" : "#{processed_job['env_name']}"
-    end
-
-    def get_worker_details(job_id, worker)
-      job = @manager.jobs[job_id]
-      processed_job = @manager.process_job(job)
 
+    def get_worker_details(job_id, job,  worker)
       {
         'job_id' => job_id,
-        'app_name' => processed_job['app_name'],
-        'env_name' => processed_job['env_name'],
-        'full_stage' => worker_stage(processed_job),
-        'action_name' => worker_action(processed_job),
-        'env_options' => worker_env_options(processed_job),
-        'task_arguments' => job['task_arguments'],
-        'state' => worker_state(worker)
+        'app_name' => job.app,
+        'env_name' => job.stage,
+        'full_stage' => job.job_stage,
+        'action_name' => job.capistrano_action,
+        'env_options' => job.setup_command_line_standard.join("\n"),
+        'task_arguments' => job.task_arguments,
+        'state' => worker_state(worker, job),
+        'processed_job' => job
       }
     end
 
-    def add_job_to_table(table, job_id, count)
+    def add_job_to_table(table, job_id, job, count, last_job_id)
+      return unless @manager.alive?
       worker = @manager.get_worker_for_job(job_id)
-      details = get_worker_details(job_id, worker)
+
+      details = get_worker_details(job_id, job, worker)
 
       row = [{ value: count.to_s },
              { value: job_id.to_s },
@@ -117,33 +104,33 @@ module CapistranoMulticonfigParallel
 
       #   if  worker.alive?
       #     row << { value: worker.rake_tasks.size }
-      #     row << { value: worker_progress(details, worker) }
+      #     row << { value: worker_progress(details['processed_job'], worker) }
       #   else
       #     row << { value: 0 }
       #     row << { value:  worker_state(worker) }
       #   end
       table.add_row(row)
-      table.add_separator if @manager.jobs.keys.last.to_i != job_id.to_i
+      table.add_separator if last_job_id != job_id.to_i
     end
 
     def terminal_clear
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end
 
-    def worker_progress(_details, worker)
+    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)
+      show_worker_percent(worker, tasks, current_task, processed_job)
     end
 
-    def show_worker_percent(worker, tasks, current_task)
+    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
       percent = percent_of(task_index, total_tasks)
       result  = "Progress [#{format('%.2f', percent)}%]  (executed #{task_index} of #{total_tasks})"
       if worker.alive?
-        worker.crashed? ? result.red : result.green
+          @manager.job_crashed?(processed_job) ? result.red : result.green
       else
         worker_state(worker)
       end

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -27,6 +27,7 @@ module CapistranoMulticonfigParallel
         applications = []
       end
       applications
+
     end
 
   private
@@ -36,15 +37,16 @@ module CapistranoMulticonfigParallel
       deps.present? && deps.is_a?(Array) ? deps.map(&:stringify_keys) : []
     end
 
-    def all_websites_return_applications_selected
+    def available_apps
       applications = application_dependencies.map { |hash| hash['app'].camelcase }
       applications << 'all_frameworks'
+      applications
+    end
+
+    def all_websites_return_applications_selected
       interactive_menu = CapistranoMulticonfigParallel::InteractiveMenu.new
-      applications_selected = interactive_menu.show_all_websites_interactive_menu(applications)
-      applications_selected = applications_selected.gsub("\r\n", '') if applications_selected.present?
-      applications_selected = applications_selected.delete("\n") if applications_selected.present?
-      applications_selected = applications_selected.split(',') if applications_selected.present?
-      applications_selected.present? ? applications_selected : []
+      applications_selected = interactive_menu.show_all_websites_interactive_menu(available_apps)
+      applications_selected.present? ?  applications_selected.split(',') : []
     end
 
     def add_dependency_app(app_to_deploy, apps_dependencies, applications_to_deploy)

data/lib/capistrano_multiconfig_parallel/classes/interactive_menu.rb

@@ -1,6 +1,9 @@
+require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # methods used for the interactive menu where are listed all aplications
   class InteractiveMenu
+    include CapistranoMulticonfigParallel::ApplicationHelper
+
     def show_all_websites_interactive_menu(applications)
       msg = ''
       choices = []
@@ -15,7 +18,7 @@ module CapistranoMulticonfigParallel
         result += "#{option_name},"
       end
       print "#{msg}\n"
-      result
+      strip_characters_from_string(result)
     end
 
     def confirm_option_selected

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -0,0 +1,73 @@
+require 'fileutils'
+require_relative '../helpers/application_helper'
+module CapistranoMulticonfigParallel
+  # class used to find application dependencies
+  class Job
+    include FileUtils
+    include CapistranoMulticonfigParallel::ApplicationHelper
+
+    attr_accessor :id, :app, :stage, :action, :task_arguments, :env_options, :status, :exit_status
+    def initialize(options)
+      @id = SecureRandom.uuid
+      @app = options.fetch('app', '')
+      @stage = options.fetch('stage', '')
+      @action = options.fetch('action', '')
+      @task_arguments = options.fetch('task_arguments', [])
+      @env_options = {}
+      @env_options = options.fetch('env_options', {}).each do |key, value|
+        @env_options[key] = value if value.present? && !filtered_env_keys.include?(key)
+      end
+      @env_options["#{CapistranoMulticonfigParallel::ENV_KEY_JOB_ID}"] = @id
+    end
+
+    def filtered_env_keys
+      %w(STAGES ACTION)
+    end
+
+    def finished?
+      status == 'finished'
+    end
+
+    def job_stage
+      @app.present? ? "#{@app}:#{@stage}" : "#{@stage}"
+    end
+
+    def capistrano_action(action = @action)
+      argv = @task_arguments.present? ? "[#{@task_arguments}]" : ''
+      "#{action}#{argv}"
+    end
+
+    def setup_command_line_standard(*args)
+      array_options = []
+      @env_options.each do |key, value|
+        array_options << "#{key}=#{value}" if value.present?
+      end
+      array_options << '--trace' if app_debug_enabled?
+      args.each do |arg|
+        array_options << arg if arg.present?
+      end
+      array_options
+    end
+
+    def build_capistrano_task(action = nil, env = [])
+      action = action.present? ? action : @action
+      environment_options = setup_command_line_standard(env).join(" ")
+      "cd #{detect_root} && RAILS_ENV=#{@stage}  bundle exec multi_cap #{job_stage} #{capistrano_action(action)}  #{environment_options}"
+    end
+
+
+    def execute_standard_deploy(action = nil)
+      command = build_capistrano_task(action)
+      puts("\n\n\n Executing '#{command}' \n\n\n .")
+      sh("#{command}")
+    rescue => ex
+      log_error(ex)
+      execute_standard_deploy('deploy:rollback') if action.blank? && @name == 'deploy'
+    end
+
+    def to_s
+      self.to_json
+    end
+
+  end
+end

data/lib/capistrano_multiconfig_parallel/classes/rake_hook_actor.rb

@@ -70,7 +70,7 @@ module CapistranoMulticonfigParallel
     end
 
     def rake_actor_id
-      @env['count_rake'].present? ? "rake_worker_#{job_id}_count" : "rake_worker_#{job_id}"
+      "rake_worker_#{job_id}"
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -55,7 +55,7 @@ module CapistranoMulticonfigParallel
 
     def format_error(error)
       JSON.pretty_generate(class_name: error.class,
-                           message: error.respond_to?(:message) ? error.message : error.inspect,
+                           message: error.respond_to?(:message) ? "#{error.message}#{error.message.class}" : error.inspect,
                            backtrace: error.respond_to?(:backtrace) ? error.backtrace.join("\n\n") : '')
     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 = 18
-    TINY = 2
+    MINOR = 19
+    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.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -39,7 +39,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: 0.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: 0.0.22
 - !ruby/object:Gem::Dependency
   name: composable_state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -632,9 +632,9 @@ files:
 - lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb
 - lib/capistrano_multiconfig_parallel/classes/input_stream.rb
 - lib/capistrano_multiconfig_parallel/classes/interactive_menu.rb
+- lib/capistrano_multiconfig_parallel/classes/job.rb
 - lib/capistrano_multiconfig_parallel/classes/output_stream.rb
 - lib/capistrano_multiconfig_parallel/classes/rake_hook_actor.rb
-- lib/capistrano_multiconfig_parallel/classes/standard_deploy.rb
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration/default.yml
 - lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

data/lib/capistrano_multiconfig_parallel/classes/standard_deploy.rb

@@ -1,50 +0,0 @@
-require 'fileutils'
-require_relative '../helpers/application_helper'
-module CapistranoMulticonfigParallel
-  # class used to find application dependencies
-  class StandardDeploy
-    include FileUtils
-    include CapistranoMulticonfigParallel::ApplicationHelper
-
-    attr_reader :app, :stage, :action, :task_arguments, :env_options
-    def initialize(options)
-      @app = options.fetch('app', '')
-      @stage = options.fetch('env', '')
-      @action = options.fetch('action', '')
-      @task_arguments = options.fetch('task_arguments:', [])
-      @env_options = options.fetch('env_options', {})
-      execute_standard_deploy
-    end
-
-    def job_stage
-      @app.present? ? "#{@app}:#{@stage}" : "#{@stage}"
-    end
-
-    def capistrano_action(action)
-      argv = task_arguments.present? ? "[#{@task_arguments}]" : ''
-      "#{action}#{argv}"
-    end
-
-    def setup_command_line_standard(options)
-      opts = ''
-      options.each do |key, value|
-        opts << "#{key}=#{value} " if value.present?
-      end
-      opts
-    end
-
-    def build_capistrano_task(action = @action, env = {})
-      environment_options = setup_command_line_standard(@env_options.merge(env))
-      "bundle exec cap #{job_stage} #{capistrano_action(action)}  #{environment_options} --trace"
-    end
-
-    def execute_standard_deploy(action = @action)
-      command = build_capistrano_task(action)
-      puts("\n\n\n Executing '#{command}' \n\n\n .")
-      sh("#{command}")
-    rescue => ex
-      log_error(ex)
-      execute_standard_deploy('deploy:rollback') if action.blank? && @name == 'deploy'
-    end
-  end
-end