capistrano_multiconfig_parallel 0.23.2 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae7c4b376c7329c94f00f2335f312f73bc4d42d
-  data.tar.gz: 210843574ae404d0a2e6ec626e7fdb303063e9d8
+  metadata.gz: fc16361255623968a8072c114d5bc7a6129be46d
+  data.tar.gz: 2c6477dede330ad276c6b985aea54fddeb2a0e2b
 SHA512:
-  metadata.gz: 17e1c46a802f7dc6811708f9be41928b757e54a0be99e82fe4cc09fd14c2991c48726c84f540477e9016aa9ee7f8c9564cd91aca59a55b20b0c0075f2d7f94df
-  data.tar.gz: 26c7014872dda4f088f9d40e91d0d85d66c75bcb217de791018cc12400beabdd75af3fc09593b1b56504ddf044867309252230742c5a1ad00382f83a59ffb5ec
+  metadata.gz: cd160acb58df0e43783156957ced50e4cd67d142c3173240d2bac8aa1a0161e36eb6ea034d1d94aa903bec150783fc2033bc79daa56b84d15a7bf0ac0fdb00f0
+  data.tar.gz: afed88d835ba15464fb6413ceb0cea5294745e91919441a0cb3624e3d98517ea2edbcbe3a653999694a5e4f87f4f840b83ccf0ff89bcf9eb2042333c326812af

data/.reek

@@ -1,3 +1,7 @@
 ---
 Attribute:
   enabled: false
+TooManyInstanceVariables:
+  enabled: false
+TooManyMethods:
+  enabled: false

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -14,20 +14,25 @@ module CapistranoMulticonfigParallel
     def initialize(manager, job_manager)
       @manager = manager
       @job_manager = job_manager
+      @table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_heaadings)
       async.run
     rescue => ex
       rescue_exception(ex)
     end
 
+    def default_heaadings
+      ['Job ID', 'Job UUID', 'App/Stage', 'Action', 'ENV Variables', 'Current Task']
+    end
+
     def run
       subscribe(CapistranoMulticonfigParallel::TerminalTable.topic, :notify_time_change)
     end
 
-    def notify_time_change(_topic, _message)
-      table = Terminal::Table.new(title: 'Deployment Status Table', headings: ['Job ID', 'Job UUID', 'App/Stage', 'Action', 'ENV Variables', 'Current Task'])
+    def notify_time_change(_channel, _message)
+      @table.rows = []
       jobs = @manager.alive? ? @manager.jobs.dup : []
-      setup_table_jobs(table, jobs)
-      display_table_on_terminal(table)
+      setup_table_jobs(jobs)
+      display_table_on_terminal
     end
 
     def rescue_exception(ex)
@@ -36,16 +41,16 @@ module CapistranoMulticonfigParallel
       terminate
     end
 
-    def display_table_on_terminal(table)
+    def display_table_on_terminal
       terminal_clear
-      puts "\n#{table}\n"
+      puts "\n#{@table}\n"
       signal_complete
     end
 
-    def setup_table_jobs(table, jobs)
+    def setup_table_jobs(jobs)
       jobs.each_with_index do |(_job_id, job), count|
-        table.add_row(job.terminal_row(count))
-        table.add_separator
+        @table.add_row(job.terminal_row(count))
+        @table.add_separator
       end
     end
 

data/lib/capistrano_multiconfig_parallel/classes/interactive_menu.rb

@@ -14,17 +14,17 @@ module CapistranoMulticonfigParallel
 
     def fetch_menu
       print_menu_choices
-      default_printing
-      result = show_all_websites_interactive_menu
+      result = print_selections
       print "#{@msg}\n"
       result.present? ? result.split(',') : []
     end
 
   private
 
-    def default_printing
+    def print_selections
       print "\nYou selected"
       @msg = ' nothing'
+      show_all_websites_interactive_menu
     end
 
     def show_all_websites_interactive_menu

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -12,7 +12,7 @@ module CapistranoMulticonfigParallel
              :capistrano_action,
              :build_capistrano_task,
              :execute_standard_deploy,
-             :setup_command_line_standard,
+             :setup_command_line,
              to: :command
 
     def initialize(application, options)
@@ -29,14 +29,18 @@ module CapistranoMulticonfigParallel
       @command ||= CapistranoMulticonfigParallel::JobCommand.new(self)
     end
 
+    def terminal_env_variables
+      setup_command_line(filtered_keys: [env_variable])
+    end
+
     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: [env_variable]).join("\n") },
-        { value: worker_state }
+        { value: wrap_string(job_stage) },
+        { value: wrap_string(capistrano_action) },
+        { value: terminal_env_variables.map { |str| wrap_string(str) }.join("\n") },
+        { value: wrap_string(worker_state) }
       ]
     end
 
@@ -58,15 +62,15 @@ module CapistranoMulticonfigParallel
     end
 
     def id
-      @id ||= SecureRandom.uuid
+      @id ||= @options.fetch('id', SecureRandom.uuid)
     end
 
     def status
-      @status ||= :unstarted
+      @status ||= @options.fetch('status', :unstarted)
     end
 
     def exit_status
-      @exit_status ||= nil
+      @exit_status ||= @options.fetch('exit_status', nil)
     end
 
     [

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -26,28 +26,27 @@ module CapistranoMulticonfigParallel
       "#{rake_action}#{argv}"
     end
 
+    def env_option_filtered?(key, filtered_keys_array = [])
+      filtered_env_keys.include?(key) || filtered_keys_array.include?(key.to_s)
+    end
+
     def setup_env_options(options = {})
-      options.stringify_keys!
       array_options = []
       env_options.each do |key, value|
-        array_options << "#{key}=#{value}" if value.present? && (!filtered_env_keys.include?(key) && !options.fetch('filtered_keys', []).include?(key.to_s))
+        array_options << "#{key}=#{value}" if value.present? && !env_option_filtered?(key, options.fetch(:filtered_keys, []))
       end
       array_options << '--trace' if app_debug_enabled?
       array_options
     end
 
-    def setup_command_line_standard(*args)
-      options = args.extract_options!
-      array_options = setup_env_options(options)
-      args.each do |arg|
-        array_options << arg if arg.present?
-      end
-      array_options
+    def setup_command_line(*args)
+      new_arguments, options = setup_command_line_standard(*args)
+      setup_env_options(options).concat(new_arguments)
     end
 
-    def build_capistrano_task(rake_action = nil, env = [])
+    def build_capistrano_task(rake_action = nil, *args)
       rake_action = rake_action.present? ? rake_action : action
-      environment_options = setup_command_line_standard(env).join(' ')
+      environment_options = setup_command_line(*args).join(' ')
       "cd #{detect_root} && RAILS_ENV=#{@stage}  bundle exec multi_cap #{job_stage} #{capistrano_action(rake_action)}  #{environment_options}"
     end
 

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -7,9 +7,12 @@ module CapistranoMulticonfigParallel
 
       # method used to start
       def start
-        check_terminal_tty
-        CapistranoMulticonfigParallel.original_args = ARGV.dup
+        before_start
         arguments = multi_fetch_argv(original_args)
+        execute_start(arguments)
+      end
+
+      def execute_start(arguments)
         if arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
           require_relative './application'
           run_the_application
@@ -18,6 +21,11 @@ module CapistranoMulticonfigParallel
         end
       end
 
+      def before_start
+        check_terminal_tty
+        CapistranoMulticonfigParallel.original_args = ARGV.dup
+      end
+
       def run_the_application
         execute_with_rescue('stderr') do
           configuration_valid?

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -14,6 +14,17 @@ module CapistranoMulticonfigParallel
 
   module_function
 
+    def setup_command_line_standard(*args)
+      options = args.extract_options!
+      args.select(&:present?)
+      [args, options]
+    end
+
+    def wrap_string(string, options = {})
+      options.stringify_keys!
+      string.scan(/.{#{options.fetch('length', 80)}}|.+/).map(&:strip).join(options.fetch('character', $INPUT_RECORD_SEPARATOR))
+    end
+
     def find_loaded_gem(name)
       Gem.loaded_specs.values.find { |repo| repo.name == name }
     end
@@ -79,28 +90,28 @@ module CapistranoMulticonfigParallel
     end
 
     def parse_task_string(string) # :nodoc:
-      /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
-
-      name           = regex_last_match(1)
-      remaining_args = regex_last_match(2)
+      name, remaining_args = fetch_parsed_string(string)
+      name.present? ? find_remaining_args(name, remaining_args) : [string, []]
+    end
 
-      return string, [] unless name
-      return name,   [] if     remaining_args.empty?
+    def fetch_parsed_string(string)
+      /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
+      [regex_last_match(1), regex_last_match(2)]
+    end
 
-      args = find_remaining_args(remaining_args)
-      [name, args]
+    def fetch_remaining_arguments(args, remaining_args)
+      /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
+      args << regex_last_match(1).gsub(/\\(.)/, '\1')
+      regex_last_match(2)
     end
 
-    def find_remaining_args(remaining_args)
+    def find_remaining_args(name, remaining_args)
       args = []
       loop do
-        /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
-
-        remaining_args = regex_last_match(2)
-        args << regex_last_match(1).gsub(/\\(.)/, '\1')
+        remaining_args = fetch_remaining_arguments(args, remaining_args)
         break if remaining_args.blank?
       end
-      args
+      [name, args]
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/initializers/terminal-table.rb

@@ -0,0 +1,3 @@
+Terminal::Table.class_eval do
+  attr_accessor :rows
+end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 23
-    TINY = 2
+    TINY = 3
     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.23.2
+  version: 0.23.3
 platform: ruby
 authors:
 - bogdanRada
@@ -662,6 +662,7 @@ files:
 - lib/capistrano_multiconfig_parallel/helpers/core_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb
 - lib/capistrano_multiconfig_parallel/initializers/rake.rb
+- lib/capistrano_multiconfig_parallel/initializers/terminal-table.rb
 - lib/capistrano_multiconfig_parallel/version.rb
 homepage: http://github.com/bogdanRada/capistrano_multiconfig_parallel/
 licenses: