capistrano_multiconfig_parallel 0.21.6 → 0.21.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 243c50e263028d3c6b611e0f53f21c76166dacda
-  data.tar.gz: 43fd764e806b2d26a4ea90430f973a36eca1d24e
+  metadata.gz: 7f87a7482ae60ee3c54f450c9e20d6f489a7d2a4
+  data.tar.gz: 7716965e21fe4d4faf52ad69aadbb9dfb0039597
 SHA512:
-  metadata.gz: c271ca088192b718525c8fb0af6545c951f5ab4412b7749b476efd891098fb696b9dc002c0debcd3ef8b94808ad9aafb7ef4fa8a771e06fe98f302271da1d011
-  data.tar.gz: aaa5ab2e3217d90e8f355e5dad260c34d1c835f2336d774f7c9a5a8c70b70e8c631456815e5911014f80054c5c6041667a3ddd1912d48838cd358eaee2cf0939
+  metadata.gz: 3ac991a6da052876428b36d49dbe2e37007b01623b53427ac497bb1983c71e0dff89ef7bd8cc2ab7a07b477d5f126bf2953debe5094d12ff3ee12e1ff3357a03
+  data.tar.gz: 7a244b45ad63e01d0224490fa24ed153d0fcbdfe9cce6b4761f10ce6914c15e94d2e182eb75c84c051afb9f2237b157a60ae8945f2fac2538da356570fa85101

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -1,3 +1,4 @@
+
 require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class used to display the progress of each worker on terminal screen using a table
@@ -14,6 +15,8 @@ module CapistranoMulticonfigParallel
       @manager = manager
       @job_manager = job_manager
       async.run
+    rescue => ex
+      rescue_exception(ex)
     end
 
     def run
@@ -21,91 +24,57 @@ module CapistranoMulticonfigParallel
     end
 
     def notify_time_change(_topic, _message)
-      default_headings = ['Job ID', 'Job UUID', 'App/Stage', 'Action', 'ENV Variables', 'Current Task']
-      #   default_headings << 'Total'
-      #   default_headings << 'Progress'
-      table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_headings)
-      jobs = @manager.alive? ? @manager.jobs.dup : []
-      if jobs.present?
-        jobs.each_with_index do |(job_id, job), count|
-          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}")
+      table = Terminal::Table.new(title: 'Deployment Status Table', headings: ['Job ID', 'Job UUID', 'App/Stage', 'Action', 'ENV Variables', 'Current Task'])
+      jobs = @manager.alive? ? @manager.jobs : []
+      setup_table_jobs(table, jobs)
+      display_table_on_terminal(table)
+    end
+
+    def rescue_exception(ex)
+      log_to_file("Terminal Table client disconnected due to error #{ex.inspect}")
       log_error(ex, 'stderr')
       terminate
     end
 
+    def display_table_on_terminal(table)
+      terminal_clear
+      puts "\n#{table}\n"
+      signal_complete
+    end
+
+    def setup_table_jobs(table, jobs)
+      jobs.each_with_index do |(_job_id, job), count|
+        add_job_to_table(table, job, count)
+        table.add_separator
+      end
+    end
+
     def show_confirmation(message, default)
       exclusive do
         ask_confirm(message, default)
       end
     end
 
-    def show_terminal_screen(table)
-      return unless table.rows.present?
-      terminal_clear
-      #  table.style = { width: 20 }
-      puts "\n#{table}\n"
-      sleep(1)
-      if @job_manager.alive? && @manager.alive? && @manager.all_workers_finished?
-        @job_manager.condition.signal('completed')
-      end
+    def signal_complete
+      return if !@job_manager.alive? || @manager.alive?
+      @job_manager.condition.signal('completed') if @manager.all_workers_finished?
     end
 
-    def worker_state(job_id, job)
+    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 = @manager.get_worker_for_job(job.id)
       worker.alive? ? worker.worker_state : default
     end
 
-    def filtered_env_keys
-      %w(STAGES ACTION)
-    end
-
-    def add_job_to_table(table, job_id, job, index)
-      row = [{ value: (index + 1).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(job_id, job) }
-      ]
-
-      #   if  worker.alive?
-      #     row << { value: job.rake_tasks.size }
-      #     row << { value: worker_progress(job_id, job) }
-      #   else
-      #     row << { value: 0 }
-      #     row << { value:  worker_state(job_id) }
-      #   end
-      table.add_row(row)
-      table.add_separator
-      table
+    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
-
-    # 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(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})"
-    #   job.crashed? ? result.red : result.green
-    # end
-    #
-    # def percent_of(index, total)
-    #   index.to_f / total.to_f * 100.0
-    # end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -9,20 +9,35 @@ module CapistranoMulticonfigParallel
     attr_writer :status, :exit_status
 
     delegate :job_stage,
-             :capistrano_action,
-             :build_capistrano_task,
-             :execute_standard_deploy,
-             :setup_command_line_standard,
-             to: :command
+    :capistrano_action,
+    :build_capistrano_task,
+    :execute_standard_deploy,
+    :setup_command_line_standard,
+    to: :command
 
     def initialize(options)
       @options = options
     end
 
+    def env_variable
+      CapistranoMulticonfigParallel::ENV_KEY_JOB_ID
+    end
+
     def command
       @command ||= CapistranoMulticonfigParallel::JobCommand.new(self)
     end
 
+    def terminal_row(index, job_state)
+      [
+        { 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 }
+      ]
+    end
+
     def job_writer_attributes
       %w(status exit_status)
     end
@@ -54,7 +69,7 @@ module CapistranoMulticonfigParallel
     ].each do |hash|
       define_method hash[:name] do
         value = @options.fetch(hash[:name], hash[:default])
-        value["#{CapistranoMulticonfigParallel::ENV_KEY_JOB_ID}"] = id if hash[:name] == 'env_options'
+        value["#{env_variable}"] = id if hash[:name] == 'env_options'
         verify_empty_options(value)
       end
       # define_method "#{hash[:name]}=" do |value|

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -16,6 +16,10 @@ module CapistranoMulticonfigParallel
 
   module_function
 
+    def percent_of(index, total)
+      index.to_f / total.to_f * 100.0
+    end
+
     def multi_fetch_argv(args)
       options = {}
       args.each do |arg|

data/lib/capistrano_multiconfig_parallel/version.rb

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