capistrano_multiconfig_parallel 0.19.2 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f4b58bbdce3cdd3899eff03a73404925292f109
-  data.tar.gz: 2a3f5e01b27dcb4f1b5d1fc067b9dc4404e7fd8c
+  metadata.gz: 641de7a89fa577cee18d2a6aa6b2419aea55d861
+  data.tar.gz: e240a8295e20d5c93e989021ef9368f8ec3ef6b2
 SHA512:
-  metadata.gz: beeacc1ff046749c4c2803f23e2533787ed0e4298d10105967e853e83ddd9910afcd9bfa78b41f4185360f88c623c19a3e38bbe17d59ba6fd3db852ef3e33a30
-  data.tar.gz: 9a582a0574b9a38154efa7f58377dc0886d5457b34ab9258aace05fa62a1c1d5d69feb70e9c099241a4c86b6960dd558dc9396061baeb99252c7d1ccc7a6429e
+  metadata.gz: fc6090766c60e6a44d4a59e83e71c84714d308a1e210d460cd24472e27a1e470ba605357e3da095e14ce332cf3d7ea95754cf5ff720aae121e0bae31ab27f01d
+  data.tar.gz: b3357c295e0b6c2b04408678c8f04098589d7628ef66622f42f633da086375a85db23ebc9feec00d6ff9013d8f25b5258d63beeb6ff1c36c4d644d5400e128ec

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -246,16 +246,6 @@ module CapistranoMulticonfigParallel
       options
     end
 
-    def multi_fetch_argv(args)
-      options = {}
-      args.each do |arg|
-        if arg =~ /^(\w+)=(.*)$/m
-          options[Regexp.last_match(1)] = Regexp.last_match(2)
-        end
-      end
-      options
-    end
-
     def execute_on_multiple_boxes(main_box_name, options)
       boxes = strip_characters_from_string(main_box_name).split(',').compact
       boxes.each do |box_name|

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -156,7 +156,7 @@ module CapistranoMulticonfigParallel
     def confirm_task_approval(result, task, processed_job = nil)
       return unless result.present?
       result = print_confirm_task_approvall(result, task, processed_job)
-      return if result.blank? || result.downcase != 'y'
+      return unless action_confirmed?(result)
       @jobs.pmap do |job_id, job|
         worker = get_worker_for_job(job_id)
         worker.publish_rake_event('approved' => 'yes',
@@ -169,8 +169,7 @@ module CapistranoMulticonfigParallel
 
     def get_worker_for_job(job)
       if job.present?
-        if job.is_a?(Hash)
-          job = job.stringify_keys
+        if job.is_a?(CapistranoMulticonfigParallel::Job)
           @job_to_worker[job.id]
         else
           @job_to_worker[job]
@@ -196,35 +195,27 @@ module CapistranoMulticonfigParallel
     def get_job_status(job)
       status = nil
       if job.present?
-        if job.is_a?(Hash)
-          job = job.stringify_keys
+        if job.is_a?(CapistranoMulticonfigParallel::Job)
           actor = @job_to_worker[job.id]
-          status = actor.status
+          status = actor.job_status
         else
           actor = @job_to_worker[job]
-          status = actor.status
+          status = actor.job_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.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_crashed?(job)
+      return if job.blank? || job.crashed?
       return unless job.action == 'deploy'
       log_to_file "restarting #{job} on new worker"
       job.status = 'worker_died'
-      dispatch_new_job(job, action: 'deploy:rollback')
+      job.action = 'deploy:rollback'
+      dispatch_new_job(job)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -41,6 +41,15 @@ module CapistranoMulticonfigParallel
       manager.register_worker_for_job(job, Actor.current)
     end
 
+    def worker_state
+      if Actor.current.alive?
+        status = @machine.state.to_s
+        job.crashed? ? status.red : status.green
+      else
+        'dead'.upcase.red
+      end
+    end
+
     def start_task
       @manager.setup_worker_conditions(@job)
       log_to_file("exec worker #{@job_id} starts task with #{@job.inspect}")
@@ -101,7 +110,8 @@ module CapistranoMulticonfigParallel
 
     def check_gitflow
       return if @job.stage != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
-      @manager.dispatch_new_job(@job, 'env' => 'production')
+      @job.stage = 'production'
+      @manager.dispatch_new_job(@job)
     end
 
     def handle_subscription(message)
@@ -150,7 +160,6 @@ module CapistranoMulticonfigParallel
 
     def update_machine_state(name)
       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.new("task #{@action} failed ")) if name == 'deploy:failed' # force worker to rollback
     end

data/lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb

@@ -2,17 +2,19 @@ module CapistranoMulticonfigParallel
   # class that handles the states of the celluloid worker executing the child process in a fork process
   class StateMachine
     include ComposableStateMachine::CallbackRunner
-    attr_accessor :job, :actor, :initial_state, :state, :output
+    attr_accessor :job, :actor, :initial_state, :state
 
     def initialize(job, actor)
       @job = job
       @actor = actor
-      @initial_state = :unstarted
+      @initial_state = @job.status
       machine
     end
 
     def go_to_transition(action)
-      machine.trigger(action.to_s)
+      transitions.on(action, state.to_s => action)
+      @job.status = action
+      machine.trigger(action)
     end
 
     def machine

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -1,7 +1,6 @@
 require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class used to display the progress of each worker on terminal screen using a table
-  # rubocop:disable ClassLength
   class TerminalTable
     include Celluloid
     include Celluloid::Notifications
@@ -21,19 +20,18 @@ module CapistranoMulticonfigParallel
       subscribe(CapistranoMulticonfigParallel::TerminalTable.topic, :notify_time_change)
     end
 
-    def notify_time_change(topic, message)
-      return unless topic == CapistranoMulticonfigParallel::TerminalTable.topic
+    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)
-
-      if @manager.alive? && @manager.jobs.present? && message_valid?(message)
+      jobs = @manager.alive? ? @manager.jobs : []
+      if jobs.present?
         count = 0
-        last_job_id = @manager.jobs.keys.last.to_i
-        @manager.jobs.each do |job_id, job|
+        last_job_id = jobs.keys.last.to_i
+        jobs.each do |_job_id, job|
           count += 1
-          add_job_to_table(table, job_id, job, count, last_job_id)
+          add_job_to_table(table, job, count, last_job_id)
         end
       end
       show_terminal_screen(table)
@@ -49,56 +47,33 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def message_valid?(message)
-      message[:type].present? && message[:type] == 'output' || message[:type] == 'event'
-    end
-
     def show_terminal_screen(table)
       return unless table.rows.present?
       terminal_clear
-      puts "\n"
       #  table.style = { width: 20 }
-      puts table
-      puts "\n"
-      sleep(1)
+      puts "\n#{table}\n"
+      sleep(0.1)
       @job_manager.condition.signal('completed') if @manager.all_workers_finished?
     end
 
-    def worker_state(worker, job)
-      if worker.alive?
-        state = worker.machine.state.to_s
-        @manager.job_crashed?(job) ? state.red : state.green
-      else
-        'dead'.upcase.red
-      end
+    def worker_state(worker)
+      worker.alive? ? worker.worker_state : 'dead'.upcase.red
     end
 
-    def get_worker_details(job_id, job, worker)
-      {
-        'job_id' => job_id,
-        '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
-      }
+    def filtered_env_keys
+      %w(STAGES ACTION)
     end
 
-    def add_job_to_table(table, job_id, job, count, last_job_id)
+    def add_job_to_table(table, job, count, last_job_id)
       return unless @manager.alive?
-      worker = @manager.get_worker_for_job(job_id)
-
-      details = get_worker_details(job_id, job, worker)
+      worker = @manager.get_worker_for_job(job.id)
 
       row = [{ value: count.to_s },
-             { value: job_id.to_s },
-             { value: details['full_stage'] },
-             { value: details['action_name'] },
-             { value: details['env_options'] },
-             { value: "#{details['state']}" }
+             { 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(worker) }
             ]
 
       #   if  worker.alive?
@@ -109,34 +84,35 @@ module CapistranoMulticonfigParallel
       #     row << { value:  worker_state(worker) }
       #   end
       table.add_row(row)
-      table.add_separator if last_job_id != job_id.to_i
+      table.add_separator if last_job_id != job.id.to_i
+      table
     end
 
     def terminal_clear
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end
 
-    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, processed_job)
-    end
-
-    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?
-        @manager.job_crashed?(processed_job) ? result.red : result.green
-      else
-        worker_state(worker)
-      end
-    end
-
-    def percent_of(index, total)
-      index.to_f / total.to_f * 100.0
-    end
+    # 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, processed_job)
+    # end
+    #
+    # 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?
+    #     processed_job.crashed? ? result.red : result.green
+    #   else
+    #     worker_state(worker)
+    #   end
+    # end
+    #
+    # def percent_of(index, total)
+    #   index.to_f / total.to_f * 100.0
+    # end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -11,29 +11,30 @@ module CapistranoMulticonfigParallel
     end
 
     def fetch_apps_needed_for_deployment(application, action)
-      applications = []
-      return applications unless @job_manager.multi_apps?
+      return [] unless @job_manager.multi_apps?
       if @job_manager.custom_command?
-        apps_selected = all_websites_return_applications_selected
-        applications = get_applications_to_deploy(action, apps_selected)
-      elsif app_configuration.application_dependencies.present?
-        if application.present?
-          applications = get_applications_to_deploy(action, [application.camelcase])
-          applications = applications.delete_if { |hash| hash['app'] == application }
-        else
-          applications = []
-        end
+        show_interactive_menu(action)
       else
-        applications = []
+        fetch_application_dependencies(application, action)
       end
-      applications
     end
 
   private
 
+    def fetch_application_dependencies(application, action)
+      return [] if app_configuration.application_dependencies.blank? || application.blank?
+      applications = get_applications_to_deploy(action, [application.camelcase])
+      applications.delete_if { |hash| hash['app'] == application }
+    end
+
+    def show_interactive_menu(action)
+      apps_selected = CapistranoMulticonfigParallel::InteractiveMenu.new(available_apps).fetch_menu
+      get_applications_to_deploy(action, apps_selected)
+    end
+
     def application_dependencies
       deps = app_configuration.application_dependencies
-      deps.present? && deps.is_a?(Array) ? deps.map(&:stringify_keys) : []
+      value_is_array?(deps) ? deps.map(&:stringify_keys) : []
     end
 
     def available_apps
@@ -42,12 +43,6 @@ module CapistranoMulticonfigParallel
       applications
     end
 
-    def all_websites_return_applications_selected
-      interactive_menu = CapistranoMulticonfigParallel::InteractiveMenu.new
-      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)
       return unless app_to_deploy.present?
       applications_to_deploy << app_to_deploy
@@ -71,7 +66,7 @@ module CapistranoMulticonfigParallel
     def check_app_dependency_unique(applications_selected, apps_dependencies, applications_to_deploy, action)
       return applications_to_deploy if applications_selected.blank? || apps_dependencies.blank? || (apps_dependencies.map { |app| app['app'] } - applications_to_deploy.map { |app| app['app'] }).blank?
       apps_dependency_confirmation = ask_confirm("Do you want to  #{action} all dependencies also ?", 'Y/N')
-      applications_to_deploy = applications_to_deploy.concat(apps_dependencies) if apps_dependency_confirmation.present? && apps_dependency_confirmation.downcase == 'y'
+      applications_to_deploy = applications_to_deploy.concat(apps_dependencies) if action_confirmed?(apps_dependency_confirmation)
       applications_to_deploy
     end
 
@@ -105,10 +100,10 @@ module CapistranoMulticonfigParallel
     def print_frameworks_used(app_names, applications_to_deploy, action)
       app_names.each { |app| puts "#{app}" }
       apps_deploy_confirmation = ask_confirm("Are you sure you want to #{action} these apps?", 'Y/N')
-      if apps_deploy_confirmation.blank? || (apps_deploy_confirmation.present? && apps_deploy_confirmation.downcase != 'y')
-        return []
-      elsif apps_deploy_confirmation.present? && apps_deploy_confirmation.downcase == 'y'
+      if action_confirmed?(apps_deploy_confirmation)
         return applications_to_deploy
+      else
+        return []
       end
     end
   end

data/lib/capistrano_multiconfig_parallel/classes/interactive_menu.rb

@@ -4,21 +4,42 @@ module CapistranoMulticonfigParallel
   class InteractiveMenu
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    def show_all_websites_interactive_menu(applications)
-      msg = ''
-      choices = []
-      print_menu_choices(msg, choices, applications)
+    attr_accessor :msg, :choices, :applications
+
+    def initialize(applications)
+      @applications = applications
+      @msg = ' '
+      @choices = {}
+    end
+
+    def fetch_menu
+      print_menu_choices
+      default_printing
+      result = show_all_websites_interactive_menu
+      print "#{@msg}\n"
+      strip_characters_from_string(result).split(',')
+    end
+
+  private
+
+    def default_printing
       print "\nYou selected"
-      msg = ' nothing'
+      @msg = ' nothing'
+    end
+
+    def show_all_websites_interactive_menu
       result = ''
-      applications.each_with_index do |option_name, index|
-        next unless choices[index].present?
-        print(" #{option_name}")
-        msg = ''
-        result += "#{option_name},"
+      @applications.each_with_index do |option_name, index|
+        result += "#{option_name}," if choices[index].present?
+        print_option_name(option_name, index)
       end
-      print "#{msg}\n"
-      strip_characters_from_string(result)
+      result
+    end
+
+    def print_option_name(option_name, index)
+      return unless @choices[index].present?
+      print(" #{option_name}")
+      @msg = ''
     end
 
     def confirm_option_selected
@@ -26,39 +47,61 @@ module CapistranoMulticonfigParallel
       $stdin.gets.squeeze(' ').strip
     end
 
-    def print_menu_choices(msg, choices, applications)
-      while print_all_websites_available_options(applications, msg, choices) && (option = confirm_option_selected).present?
+    def print_menu_choices
+      while print_all_websites_available_options && (option = confirm_option_selected).present?
         if /^[0-9,]+/.match(option)
-          handle_menu_option(msg, option, choices, applications)
+          handle_menu_option(option)
         else
-          msg = "Invalid option: #{option}\n  "
+          @msg = "Invalid option: #{option}\n  "
           next
         end
       end
     end
 
-    def print_all_websites_available_options(applications, msg, choices)
+    def print_all_websites_available_options
       puts 'Available options:'
-      applications.each_with_index do |option, index|
-        puts "#{(index + 1)} #{choices[index].present? ? "#{choices[index]}" : ''}) #{option} "
+      @applications.each_with_index do |option, index|
+        print_selected_index_option(index, option)
       end
-      puts "\n#{msg}" if msg.present?
+      puts "\n#{@msg}" if @msg.present?
       true
     end
 
-    def handle_menu_option(msg, option, choices, applications)
-      arr_in = option.split(',')
-      arr_in.each_with_index do |number_option, _index|
+    def handle_menu_option(option)
+      option.split(',').each_with_index do |number_option, _index|
         num = number_option.to_i
-        if /^[0-9]+/.match(num.to_s) && ((num.to_i > 0 && num.to_i <= applications.size))
-          num -= 1
-          msg += "#{applications[num]} was #{choices[num].present? ? 'un' : ''}checked\n"
-          choices[num] = choices[num].blank? ? '+' : ' '
-        else
-          msg = "Invalid option: #{num}\n"
-          next
-        end
+        show_option_selected(num)
+        setup_message_invalid(num)
+        next
       end
     end
+
+    def check_number_selected(num)
+      check_numeric(num) && (num > 0 && num <= @applications.size)
+    end
+
+    def show_option_selected(num)
+      return unless check_number_selected(num)
+      num -= 1
+      @msg += "#{@applications[num]} was #{@choices[num].present? ? 'un' : ''}checked\n"
+      setup_choices_number(num)
+    end
+
+    def setup_message_invalid(num)
+      return if check_number_selected(num)
+      @msg = "Invalid option: #{num}\n"
+    end
+
+    def print_selected_index_option(index, option)
+      puts "#{(index + 1)} #{fetch_choice(index)}) #{option} "
+    end
+
+    def setup_choices_number(num)
+      @choices[num] = @choices[num].blank? ? '+' : ' '
+    end
+
+    def fetch_choice(num)
+      @choices.fetch(num, '')
+    end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -1,71 +1,62 @@
-require 'fileutils'
 require_relative '../helpers/application_helper'
+require_relative './job_command'
 module CapistranoMulticonfigParallel
-  # class used to find application dependencies
+  # class used for defining the job class
   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
+    attr_reader :options, :command
+    attr_writer :status, :exit_status
+
+    delegate :job_stage,
+             :capistrano_action,
+             :build_capistrano_task,
+             :execute_standard_deploy,
+             :setup_command_line_standard,
+             to: :command
 
-    def filtered_env_keys
-      %w(STAGES ACTION)
+    def initialize(options)
+      @options = options
+      @command = CapistranoMulticonfigParallel::JobCommand.new(self)
     end
 
-    def finished?
-      status == 'finished'
+    def id
+      @id ||= SecureRandom.uuid
     end
 
-    def job_stage
-      @app.present? ? "#{@app}:#{@stage}" : "#{@stage}"
+    def status
+      @status ||= :unstarted
     end
 
-    def capistrano_action(action = @action)
-      argv = @task_arguments.present? ? "[#{@task_arguments}]" : ''
-      "#{action}#{argv}"
+    def exit_status
+      @exit_status ||= nil
     end
 
-    def setup_command_line_standard(*args)
-      array_options = []
-      @env_options.each do |key, value|
-        array_options << "#{key}=#{value}" if value.present?
+    [
+      { name: 'app', default: '' },
+      { name: 'stage', default: '' },
+      { name: 'action', default: '' },
+      { name: 'task_arguments', default: [] },
+      { name: 'env_options', default: {} }
+    ].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'
+        verify_empty_options(value)
       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}"
+    def finished?
+      @status == 'finished'
     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'
+    def crashed?
+      crashing_actions = ['deploy:rollback', 'deploy:failed']
+      crashing_actions.include?(action) || crashing_actions.include?(status) || failed?
     end
 
-    def to_s
-      to_json
+    def failed?
+      status.present? && status == 'worker_died'
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -0,0 +1,69 @@
+require 'fileutils'
+require_relative '../helpers/application_helper'
+module CapistranoMulticonfigParallel
+  # class used to find application dependencies
+  class JobCommand
+    include FileUtils
+    include CapistranoMulticonfigParallel::ApplicationHelper
+
+    attr_reader :job
+    delegate :app, :stage, :action, :task_arguments, :env_options, to: :job
+
+    def initialize(job)
+      @job = job
+    end
+
+    def filtered_env_keys
+      %w(STAGES ACTION)
+    end
+
+    def job_stage
+      app.present? ? "#{app}:#{stage}" : "#{stage}"
+    end
+
+    def capistrano_action(rake_action = action)
+      argv = task_arguments.present? ? "[#{task_arguments}]" : ''
+      "#{rake_action}#{argv}"
+    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))
+      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
+    end
+
+    def build_capistrano_task(rake_action = nil, env = [])
+      rake_action = rake_action.present? ? rake_action : action
+      environment_options = setup_command_line_standard(env).join(' ')
+      "cd #{detect_root} && RAILS_ENV=#{@stage}  bundle exec multi_cap #{job_stage} #{capistrano_action(rake_action)}  #{environment_options}"
+    end
+
+    def execute_standard_deploy(action = nil)
+      command = build_capistrano_task(action)
+      run_shell_command(command)
+    rescue => ex
+      log_error(ex)
+      execute_standard_deploy('deploy:rollback') if action.blank? && @name == 'deploy'
+    end
+
+  private
+
+    def run_shell_command(command)
+      puts("\n\n\n Executing '#{command}' \n\n\n .")
+      sh("#{command}")
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -8,14 +8,14 @@ module CapistranoMulticonfigParallel
 
       # method used to start
       def start
-        execute_with_rescue('stderr') do
-          verify_validation
-          job_manager = CapistranoMulticonfigParallel::Application.new
-          if job_manager.argv[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
-            job_manager.start
-          else
-            Capistrano::Application.new.run
+        verify_validation
+        arguments = multi_fetch_argv(ARGV.dup)
+        if arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
+          execute_with_rescue('stderr') do
+            CapistranoMulticonfigParallel::Application.new.start
           end
+        else
+          Capistrano::Application.new.run
         end
       end
 

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -10,33 +10,85 @@ module CapistranoMulticonfigParallel
 
   module_function
 
+    def multi_fetch_argv(args)
+      options = {}
+      args.each do |arg|
+        if arg =~ /^(\w+)=(.*)$/m
+          options[Regexp.last_match(1)] = Regexp.last_match(2)
+        end
+      end
+      options
+    end
+
+    def action_confirmed?(result)
+      result.present? && result.downcase == 'y'
+    end
+
+    def check_numeric(num)
+      /^[0-9]+/.match(num.to_s)
+    end
+
+    def verify_empty_options(options)
+      if options.is_a?(Hash)
+        options.reject { |_key, value| value.blank? }
+      elsif options.is_a?(Array)
+        options.reject(&:blank?)
+      else
+        options
+      end
+    end
+
+    def verify_array_of_strings(value)
+      value.reject(&:blank?)
+      warn_array_without_strings(value)
+    end
+
+    def warn_array_without_strings(value)
+      raise ArgumentError, 'the array must contain only task names' if value.find { |row| !row.is_a?(String) }
+    end
+
+    def check_hash_set(hash, props)
+      !Set.new(props).subset?(hash.keys.to_set) || hash.values.find(&:blank?).present?
+    end
+
+    def value_is_array?(value)
+      value.present? && value.is_a?(Array)
+    end
+
     def strip_characters_from_string(value)
       return unless value.present?
       value = value.delete("\r\n").delete("\n")
-      value = value.gsub(/\s+/, ' ').strip if value.present?
+      value = value.gsub(/\s+/, ' ').strip
       value
     end
 
+    def regex_last_match(number)
+      Regexp.last_match(number)
+    end
+
     def parse_task_string(string) # :nodoc:
       /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
 
-      name           = Regexp.last_match(1)
-      remaining_args = Regexp.last_match(2)
+      name           = regex_last_match(1)
+      remaining_args = regex_last_match(2)
 
       return string, [] unless name
       return name,   [] if     remaining_args.empty?
 
-      args = []
+      args = find_remaaining_args(remaining_args)
+      [name, args]
+    end
 
+    def find_remaining_args(remaining_args)
+      args = []
       loop do
         /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
 
-        remaining_args = Regexp.last_match(2)
-        args << Regexp.last_match(1).gsub(/\\(.)/, '\1')
+        remaining_args = regex_last_match(2)
+        args << regex_last_match(1).gsub(/\\(.)/, '\1')
         break if remaining_args.blank?
       end
-
-      [name, args]
+      args
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -15,33 +15,34 @@ module CapistranoMulticonfigParallel
 
       def fetch_configuration
         @fetched_config = Configliere::Param.new
-        default_internal_config.each do |param|
-          param_type = find_config_type(param['type'])
-          @fetched_config.define param['name'], type: param_type, description: param['description'], default: param['default']
-        end
+        setup_default_config
+        setup_configuration
+      end
 
-        ARGV.clear
+      def setup_default_config
+        default_internal_config.each do |array_param|
+          @fetched_config.define array_param[0], array_param[1].symbolize_keys
+        end
+      end
 
-        CapistranoMulticonfigParallel.original_args.each { |a| ARGV << a }
+      def setup_configuration
         @fetched_config.read config_file if File.file?(config_file)
         @fetched_config.use :commandline
 
         @fetched_config.use :config_block
-        @fetched_config.finally do |c|
-          check_configuration(c)
+        validate_configuration
+      end
+
+      def validate_configuration
+        @fetched_config.finally do |config|
+          @check_config = config.stringify_keys
+          check_configuration
         end
         @fetched_config.process_argv!
         @fetched_config.resolve!
       end
 
-      def verify_array_of_strings(value)
-        return true if value.blank?
-        value.reject(&:blank?)
-        raise ArgumentError, 'the array must contain only task names' if value.find { |row| !row.is_a?(String) }
-      end
-
-      def verify_application_dependencies(c, prop, props)
-        value = c[prop.to_sym]
+      def verify_application_dependencies(value, props)
         return unless value.is_a?(Array)
         value.reject { |val| val.blank? || !val.is_a?(Hash) }
         wrong = check_array_of_hash(value, props.map(&:to_sym))
@@ -50,35 +51,45 @@ module CapistranoMulticonfigParallel
 
       def check_array_of_hash(value, props)
         value.find do|hash|
-          !Set.new(props).subset?(hash.keys.to_set) ||
-            hash.values.find(&:blank?).present?
+          check_hash_set(hash, props)
         end
       end
 
-      def check_boolean(c, prop)
-        raise ArgumentError, "the property `#{prop}` must be boolean" unless %w(true false).include?(c[prop].to_s.downcase)
+      def check_boolean(prop)
+        value = get_prop_config(prop)
+        raise ArgumentError, "the property `#{prop}` must be boolean" unless %w(true false).include?(value.to_s.downcase)
       end
 
       def configuration_valid?
         configuration
       end
 
-      def check_boolean_props(c, props)
+      def check_boolean_props(props)
         props.each do |prop|
-          c.send("#{prop}=", c[prop.to_sym]) if check_boolean(c, prop.to_sym)
+          @check_config.send("#{prop}=", get_prop_config(prop)) if check_boolean(prop)
         end
       end
 
-      def check_array_props(c, props)
+      def check_array_props(props)
         props.each do |prop|
-          c.send("#{prop}=", c[prop.to_sym]) if c[prop.to_sym].is_a?(Array) && verify_array_of_strings(c[prop.to_sym])
+          value = get_prop_config(prop)
+          @check_config.send("#{prop}=", value) if value_is_array?(value) && verify_array_of_strings(value)
+        end
+      end
+
+      def get_prop_config(prop)
+        config = @check_config
+        if prop.include?('.')
+          multi_level_prop(config, prop)
+        else
+          config[prop]
         end
       end
 
-      def check_configuration(c)
-        check_boolean_props(c, %w(multi_debug multi_secvential websocket_server.enable_debug))
-        check_array_props(c, %w(task_confirmations development_stages apply_stage_confirmation))
-        verify_application_dependencies(c, 'application_dependencies', %w(app priority dependencies))
+      def check_configuration
+        check_boolean_props(%w(multi_debug multi_secvential websocket_server.enable_debug))
+        check_array_props(%w(task_confirmations development_stages apply_stage_confirmation))
+        verify_application_dependencies(@check_config['application_dependencies'], %w(app priority dependencies))
       end
     end
   end

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -3,10 +3,6 @@ module CapistranoMulticonfigParallel
   module CoreHelper
   module_function
 
-    def find_config_type(type)
-      ['boolean'].include?(type.to_s) ? type.to_s.delete(':').to_sym : type.to_s.constantize
-    end
-
     def app_debug_enabled?
       app_configuration.multi_debug.to_s.downcase == 'true'
     end
@@ -32,9 +28,15 @@ module CapistranoMulticonfigParallel
       Gem.loaded_specs.values.find { |repo| repo.name == name }
     end
 
+    def ask_stdout_confirmation(message, default)
+      result = Ask.input message, default: default
+      $stdout.flush
+      result
+    end
+
     def ask_confirm(message, default)
       force_confirmation do
-        Ask.input message, default: default
+        ask_stdout_confirmation(message, default)
       end
     rescue
       return nil
@@ -44,7 +46,6 @@ module CapistranoMulticonfigParallel
       `stty -raw echo`
       check_terminal_tty
       result = block.call
-      $stdout.flush
       `stty -raw echo`
       result
     end
@@ -55,7 +56,7 @@ module CapistranoMulticonfigParallel
 
     def format_error(error)
       JSON.pretty_generate(class_name: error.class,
-                           message: error.respond_to?(:message) ? "#{error.message}#{error.message.class}" : error.inspect,
+                           message: error.respond_to?(:message) ? error.message : error.inspect,
                            backtrace: error.respond_to?(:backtrace) ? error.backtrace.join("\n\n") : '')
     end
 
@@ -68,13 +69,21 @@ module CapistranoMulticonfigParallel
       return if job_id.blank?
       FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
       filename = File.join(log_directory, "worker_#{job_id}.log")
+      setup_filename_logger(filename)
+    end
+
+    def setup_filename_logger(filename)
       worker_log = ::Logger.new(filename)
       worker_log.level = ::Logger::Severity::DEBUG
-      worker_log.formatter = proc do |severity, datetime, progname, msg|
+      setup_logger_formatter(worker_log)
+      worker_log
+    end
+
+    def setup_logger_formatter(logger)
+      logger.formatter = proc do |severity, datetime, progname, msg|
         date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
         "[#{date_format}] #{severity}  (#{progname}): #{msg}\n"
       end
-      worker_log
     end
 
     def debug_websocket?

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -3,6 +3,11 @@ module CapistranoMulticonfigParallel
   module InternalHelper
   module_function
 
+    def multi_level_prop(config, prop)
+      prop.split('.').each { |new_prop| config = config[new_prop] }
+      config
+    end
+
     def internal_config_directory
       File.join(root.to_s, 'capistrano_multiconfig_parallel', 'configuration')
     end
@@ -12,10 +17,42 @@ module CapistranoMulticonfigParallel
     end
 
     def default_internal_config
-      @default_config ||= YAML.load_file(internal_config_file)['default_config']
+      @default_config ||= fetch_default_internal_config
       @default_config
     end
 
+    def fetch_default_internal_config
+      config = YAML.load_file(internal_config_file)['default_config']
+      new_config = config.map do |hash|
+        setup_default_configuration_types(hash)
+      end
+      default_internal_configuration_params(new_config)
+    end
+
+    def default_internal_configuration_params(new_config)
+      array = []
+      new_config.each do |hash|
+        array << [hash['name'], sliced_default_config(hash)]
+      end
+      array
+    end
+
+    def sliced_default_config(hash)
+      hash.slice('type', 'description', 'default')
+    end
+
+    def setup_default_configuration_types(hash)
+      hash.each_with_object({}) do |(key, value), memo|
+        memo[key] = (key == 'type') ? find_config_type(value) : value
+        memo
+      end
+    end
+
+    def find_config_type(type)
+      type = type.to_s
+      ['boolean'].include?(type) ? type.delete(':').to_sym : type.constantize
+    end
+
     def find_env_multi_cap_root
       ENV['MULTI_CAP_ROOT']
     end
@@ -24,11 +61,34 @@ module CapistranoMulticonfigParallel
       File.expand_path(File.dirname(File.dirname(__dir__)))
     end
 
+    def pathname_is_root?(root)
+      root.root?
+    end
+
+    def fail_capfile_not_found(root)
+      fail "Can't detect Capfile in the  application root".red if pathname_is_root?(root)
+    end
+
+    def pwd_parent_dir
+      pwd_directory.directory? ? pwd_directory : pwd_directory.parent
+    end
+
+    def pwd_directory
+      Pathname.new(FileUtils.pwd)
+    end
+
+    def check_file(file, filename)
+      file.file? && file.basename.to_s.downcase == filename.to_s.downcase
+    end
+
+    def find_file_in_directory(root, filename)
+      root.children.find { |file| check_file(file, filename) }.present? || pathname_is_root?(root)
+    end
+
     def try_detect_capfile
-      root = Pathname.new(FileUtils.pwd)
-      root = root.parent unless root.directory?
-      root = root.parent until root.children.find { |f| f.file? && f.basename.to_s.downcase == 'capfile' }.present? || root.root?
-      fail "Can't detect Capfile in the  application root".red if root.root?
+      root = pwd_parent_dir
+      root = root.parent until find_file_in_directory(root, 'capfile')
+      fail_capfile_not_found(root)
       root
     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 = 19
-    TINY = 2
+    MINOR = 20
+    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.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -633,6 +633,7 @@ files:
 - 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/job_command.rb
 - lib/capistrano_multiconfig_parallel/classes/output_stream.rb
 - lib/capistrano_multiconfig_parallel/classes/rake_hook_actor.rb
 - lib/capistrano_multiconfig_parallel/cli.rb