capistrano_multiconfig_parallel 0.21.7 → 0.21.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f87a7482ae60ee3c54f450c9e20d6f489a7d2a4
-  data.tar.gz: 7716965e21fe4d4faf52ad69aadbb9dfb0039597
+  metadata.gz: 1e0b5a6c4d757da56822db1d3841df24d849005f
+  data.tar.gz: 47e706d3ca497fcce259094b026baeda873fa173
 SHA512:
-  metadata.gz: 3ac991a6da052876428b36d49dbe2e37007b01623b53427ac497bb1983c71e0dff89ef7bd8cc2ab7a07b477d5f126bf2953debe5094d12ff3ee12e1ff3357a03
-  data.tar.gz: 7a244b45ad63e01d0224490fa24ed153d0fcbdfe9cce6b4761f10ce6914c15e94d2e182eb75c84c051afb9f2237b157a60ae8945f2fac2538da356570fa85101
+  metadata.gz: 156d0a858b5cac59ae2e393ec367f010b47efff8d212826eee6e5c45ea1446ab780f9200a1e7a728b36b0a2d8df71885e1d49f801c8996dd0939982407e85f16
+  data.tar.gz: e10b68c1ac518825a070dd221d77ab8c80a02c2e74ec5ca42e09431d87bda94ef32864e2a805a88bad2b626ded2cd44ab99e92c0b1cad657c957b579d990a907

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -219,7 +219,7 @@ 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 = CapistranoMulticonfigParallel::Job.new(options.merge(
+      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
       ))

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -194,7 +194,7 @@ module CapistranoMulticonfigParallel
       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 = CapistranoMulticonfigParallel::Job.new(@job_manager, 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

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -44,7 +44,7 @@ module CapistranoMulticonfigParallel
 
     def setup_table_jobs(table, jobs)
       jobs.each_with_index do |(_job_id, job), count|
-        add_job_to_table(table, job, count)
+        table.add_row(job.terminal_row(count))
         table.add_separator
       end
     end
@@ -60,19 +60,6 @@ module CapistranoMulticonfigParallel
       @job_manager.condition.signal('completed') if @manager.all_workers_finished?
     end
 
-    def worker_state(job)
-      default = job.status.to_s.upcase.red
-      return default unless @manager.alive?
-      worker = @manager.get_worker_for_job(job.id)
-      worker.alive? ? worker.worker_state : default
-    end
-
-    def add_job_to_table(table, job, index)
-      job_state = worker_state(job)
-      job_row = job.terminal_row(index, job_state)
-      table.add_row(job_row)
-    end
-
     def terminal_clear
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -15,8 +15,10 @@ module CapistranoMulticonfigParallel
     :setup_command_line_standard,
     to: :command
 
-    def initialize(options)
+    def initialize(application, options)
       @options = options
+      @application = application
+      @manager = @application.manager
     end
 
     def env_variable
@@ -27,17 +29,24 @@ module CapistranoMulticonfigParallel
       @command ||= CapistranoMulticonfigParallel::JobCommand.new(self)
     end
 
-    def terminal_row(index, job_state)
+    def terminal_row(index)
       [
         { value: (index + 1).to_s },
         { value: id.to_s },
         { value: job_stage },
         { value: capistrano_action },
         { value: setup_command_line_standard(filtered_keys: [CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]).join("\n") },
-        { value: job_state }
+        { value: worker_state }
       ]
     end
 
+    def worker_state
+      default = status.to_s.upcase.red
+      return default unless @manager.alive?
+      worker = @manager.get_worker_for_job(id)
+      worker.alive? ? worker.worker_state : default
+    end
+
     def job_writer_attributes
       %w(status exit_status)
     end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 21
-    TINY = 7
+    TINY = 8
     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.21.7
+  version: 0.21.8
 platform: ruby
 authors:
 - bogdanRada