capistrano_multiconfig_parallel 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383ca1a8dd3caa6d1ae38370f3a3f5b7d05c6dbc
-  data.tar.gz: 4a2bce60bf821d9f65692c40fd133c67e5e77a04
+  metadata.gz: a35d2e97aa86ca857d89790da96cfa0378f8c61e
+  data.tar.gz: 17f2c290edb9ae3bc40dbede9be2554237982186
 SHA512:
-  metadata.gz: a426aff1833349f6862f9aa2bd42f4f3e249df4057659f86f29a1e3c60e2682c4b474c7c0bbf8f4b25ef1f1400351aaf10fd85e6ae9e96ea1c40b2b54fe6f4c0
-  data.tar.gz: 5b3ed5196838866db3f1b4369785f3eb0fc49dec74665139e4dde7488f9ccf1995dc8542be6045125224c1ea4f724e47b36ddef3cbe2628a0d35ec683e872875
+  metadata.gz: f902cda7987cd1c172bb59afce5a1b1f76a85194835508b8522b283ac4b9005772f3c50ac2c6f2aa443544ad32e100d1f22538d0621102139be4023e801899bd
+  data.tar.gz: 39602658bd7b01eed3fea2b4c5e2b48aa0db9fc97776ebd154c9773b2895817cf526ac9a4b1dd92d83adac47432afb2e994ed6b8ddcceba762ca2a72a88864a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano_multiconfig_parallel (0.16.2)
+    capistrano_multiconfig_parallel (0.17.0)
       activesupport (~> 4.0, >= 4.0)
       capistrano (~> 3.0, >= 3.0)
       celluloid-pmap (~> 0.2, >= 0.2.2)

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -18,14 +18,14 @@ module CapistranoMulticonfigParallel
     end
 
     def start
-      verify_app_dependencies if multi_apps? && configuration.application_dependencies.present?
+      verify_app_dependencies if multi_apps? && app_configuration.application_dependencies.present?
       check_before_starting
       initialize_data
       run
     end
 
     def verify_app_dependencies
-      wrong = configuration.application_dependencies.find do |hash|
+      wrong = app_configuration.application_dependencies.find do |hash|
         !@stage_apps.include?(hash[:app]) || (hash[:dependencies].present? && hash[:dependencies].find { |val| !@stage_apps.include?(val) })
       end
       raise ArgumentError, "Invalid configuration for #{wrong.inspect}".red if wrong.present?
@@ -56,25 +56,16 @@ module CapistranoMulticonfigParallel
 
     def custom_command?
       if multi_apps?
-        !@stages.include?(@top_level_tasks.first) && custom_commands.values.include?(@top_level_tasks.first)
+        !@stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.first)
       else
-        !@stages.include?(@top_level_tasks.second) && @stages.include?(@top_level_tasks.first) && custom_commands.values.include?(@top_level_tasks.second)
+        !@stages.include?(@top_level_tasks.second) && @stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.second)
       end
     end
 
-    def custom_commands
-      key = multi_apps? ? CapistranoMulticonfigParallel::MULTI_KEY : CapistranoMulticonfigParallel::SINGLE_KEY
-      CapistranoMulticonfigParallel::CUSTOM_COMMANDS[key]
-    end
-
     def multi_apps?
       @stages.find { |stage| stage.include?(':') }.present?
     end
 
-    def configuration
-      CapistranoMulticonfigParallel.configuration
-    end
-
     def initialize_data
       @application = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[1]
       @stage = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[0]
@@ -103,7 +94,7 @@ module CapistranoMulticonfigParallel
     def check_before_starting
       CapistranoMulticonfigParallel.enable_logging
       @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(Actor.current)
-      @default_stage = CapistranoMulticonfigParallel.configuration.development_stages.present? ? CapistranoMulticonfigParallel.configuration.development_stages.first : 'development'
+      @default_stage = app_configuration.development_stages.present? ? app_configuration.development_stages.first : 'development'
       @condition = Celluloid::Condition.new
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
     end
@@ -116,13 +107,13 @@ module CapistranoMulticonfigParallel
       deploy_multiple_apps(apps, options)
       deploy_app(options) if !custom_command? || !multi_apps?
     rescue => e
-      CapistranoMulticonfigParallel.log_message(e)
+      log_error(e)
     end
 
     def process_jobs
       return unless @jobs.present?
       FileUtils.rm Dir["#{CapistranoMulticonfigParallel.log_directory}/worker_*.log"]
-      if configuration.multi_secvential.to_s.downcase == 'true'
+      if app_configuration.multi_secvential.to_s.downcase == 'true'
         @jobs.each { |job| CapistranoMulticonfigParallel::StandardDeploy.new(job) }
       else
         run_async_jobs
@@ -130,7 +121,7 @@ module CapistranoMulticonfigParallel
     end
 
     def tag_staging_exists? # check exists task from capistrano-gitflow
-      CapistranoMulticonfigParallel.find_loaded_gem('capistrano-gitflow').present?
+      find_loaded_gem('capistrano-gitflow').present?
     end
 
     def fetch_multi_stages
@@ -167,7 +158,7 @@ module CapistranoMulticonfigParallel
       app_name = (app.is_a?(Hash) && app[:app].present?) ? app[:app].camelcase : app
       app_name = app_name.present? ? app_name : 'current application'
       message = "Please write additional ENV options for #{app_name} for #{app_message}"
-      app_additional_env_options = CapistranoMulticonfigParallel.ask_confirm(message, nil)
+      app_additional_env_options = ask_confirm(message, nil)
       fetch_app_additional_env_options(app_additional_env_options)
     end
 
@@ -190,7 +181,7 @@ module CapistranoMulticonfigParallel
       options = options.stringify_keys
       main_box_name = @argv['BOX'].blank? ? '' : @argv['BOX']
       stage = options.fetch('stage', @default_stage)
-      if CapistranoMulticonfigParallel.configuration.development_stages.include?(stage) && main_box_name.present? && /^[a-z0-9,]+/.match(main_box_name)
+      if app_configuration.development_stages.include?(stage) && main_box_name.present? && /^[a-z0-9,]+/.match(main_box_name)
         execute_on_multiple_boxes(main_box_name, options)
       else
         prepare_job(options)
@@ -211,7 +202,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_jobs_termination
-      return if configuration.multi_secvential.to_s.downcase == 'true'
+      return if app_configuration.multi_secvential.to_s.downcase == 'true'
       result = @condition.wait
       return unless result.present?
       @manager.terminate

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -7,36 +7,56 @@ module CapistranoMulticonfigParallel
 
   class << self
     attr_accessor :logger, :original_args
-
     include CapistranoMulticonfigParallel::Configuration
-    include CapistranoMulticonfigParallel::ApplicationHelper
-    include CapistranoMulticonfigParallel::CoreHelper
 
     def enable_logging
       enable_file_logging
-      self.logger ||= ::Logger.new(DevNull.new)
-      Celluloid.logger = CapistranoMulticonfigParallel.logger
+      Celluloid.logger = logger
       Celluloid.task_class = Celluloid::TaskThread
     end
 
+    def detect_root
+      if find_env_multi_cap_root
+        Pathname.new(find_env_multi_cap_root)
+      elsif defined?(::Rails)
+        ::Rails.root
+      else
+        try_detect_capfile
+      end
+    end
+
+    def config_file
+      File.join(detect_root.to_s, 'config', 'multi_cap.yml')
+    end
+
+    def log_directory
+      File.join(detect_root.to_s, 'log')
+    end
+
+    def main_log_file
+      File.join(log_directory, 'multi_cap.log')
+    end
+
+    def custom_commands
+      ['deploy_multi_stages']
+    end
+
+  private
+
     def enable_file_logging
-      return if configuration.multi_debug.to_s.downcase != 'true'
+      if configuration.multi_debug.to_s.downcase == 'true'
+        enable_main_log_file
+        self.logger = ::Logger.new(main_log_file)
+      else
+        self.logger ||= ::Logger.new(DevNull.new)
+      end
+    end
+
+    def enable_main_log_file
       FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
       FileUtils.touch(main_log_file) unless File.file?(main_log_file)
       log_file = File.open(main_log_file, 'w')
       log_file.sync = true
-      self.logger = ::Logger.new(main_log_file)
-    end
-
-    def custom_commands
-      {
-        'multi ' => {
-          stages: 'deploy_multi_stages'
-        },
-        'single' => {
-          stages: 'deploy_multi_stages'
-        }
-      }
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -1,14 +1,14 @@
 require_relative './celluloid_worker'
 require_relative './terminal_table'
 require_relative './web_server'
+require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # rubocop:disable ClassLength
   class CelluloidManager
     include Celluloid
     include Celluloid::Notifications
     include Celluloid::Logger
-
-    cattr_accessor :debug_enabled
+    include CapistranoMulticonfigParallel::ApplicationHelper
 
     attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated
 
@@ -34,19 +34,15 @@ module CapistranoMulticonfigParallel
       @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, self.class.websocket_config)
-    end
-
-    def self.debug_enabled?
-      debug_enabled
+      @worker_supervisor.supervise_as(:web_server, CapistranoMulticonfigParallel::WebServer, websocket_config)
     end
 
-    def self.debug_websocket?
+    def debug_websocket?
       websocket_config['enable_debug'].to_s == 'true'
     end
 
-    def self.websocket_config
-      config = CapistranoMulticonfigParallel.configuration[:websocket_server]
+    def websocket_config
+      config = app_configuration[:websocket_server]
       config.present? && config.is_a?(Hash) ? config.stringify_keys : {}
       config['enable_debug'] = config.fetch('enable_debug', '').to_s == 'true'
       config
@@ -74,7 +70,7 @@ module CapistranoMulticonfigParallel
     def register_worker_for_job(job, worker)
       job = job.stringify_keys
       if job['id'].blank?
-        debug("job id not found. delegating again the job #{job.inspect}") if self.class.debug_enabled?
+        log_to_file("job id not found. delegating again the job #{job.inspect}")
         delegate(job)
       else
         start_worker(job, worker)
@@ -85,7 +81,7 @@ module CapistranoMulticonfigParallel
       worker.job_id = job['id'] if worker.job_id.blank?
       @job_to_worker[job['id']] = worker
       @worker_to_job[worker.mailbox.address] = job
-      debug("worker #{worker.job_id} registed into manager") if self.class.debug_enabled?
+      log_to_file("worker #{worker.job_id} registed into manager")
       Actor.current.link worker
       worker.async.start_task unless syncronized_confirmation?
       @registration_complete = true if @job_manager.jobs.size == @job_to_worker.size
@@ -107,12 +103,12 @@ module CapistranoMulticonfigParallel
       until condition.present?
         sleep(0.1) # keep current thread alive
       end
-      debug("all jobs have completed #{condition}") if self.class.debug_enabled?
+      log_to_file("all jobs have completed #{condition}")
       Celluloid::Actor[:terminal_server].async.notify_time_change(CapistranoMulticonfigParallel::TerminalTable.topic, type: 'output') if Celluloid::Actor[:terminal_server].alive?
     end
 
     def apply_confirmations?
-      confirmations = CapistranoMulticonfigParallel.configuration.task_confirmations
+      confirmations = app_configuration.task_confirmations
       confirmations.is_a?(Array) && confirmations.present?
     end
 
@@ -121,13 +117,13 @@ module CapistranoMulticonfigParallel
     end
 
     def apply_confirmation_for_worker(worker)
-      worker.alive? && CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(worker.env_name) && apply_confirmations?
+      worker.alive? && app_configuration.apply_stage_confirmation.include?(worker.env_name) && apply_confirmations?
     end
 
     def setup_worker_conditions(worker)
       return unless apply_confirmation_for_worker(worker)
       hash_conditions = {}
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
+      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
@@ -135,7 +131,7 @@ module CapistranoMulticonfigParallel
 
     def mark_completed_remaining_tasks(worker)
       return unless apply_confirmation_for_worker(worker)
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
+      app_configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
         task_confirmation = @job_to_condition[worker.job_id][task]
         if task_confirmation[:status] != 'confirmed'
@@ -147,7 +143,7 @@ module CapistranoMulticonfigParallel
 
     def wait_task_confirmations_worker(worker)
       return if !apply_confirmation_for_worker(worker) || !syncronized_confirmation?
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
+      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?
       end
@@ -158,9 +154,9 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations
-      stage_apply = CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(@job_manager.stage)
+      stage_apply = app_configuration.apply_stage_confirmation.include?(@job_manager.stage)
       return if !stage_apply || !syncronized_confirmation?
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
+      app_configuration.task_confirmations.each_with_index do |task, _index|
         results = []
         @jobs.pmap do |job_id, _job|
           result = wait_condition_for_task(job_id, task)
@@ -269,11 +265,11 @@ module CapistranoMulticonfigParallel
 
     def worker_died(worker, reason)
       job = @worker_to_job[worker.mailbox.address]
-      debug("worker job #{job} with mailbox #{worker.mailbox.inspect} died  for reason:  #{reason}") if self.class.debug_enabled?
+      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'
-      debug "restarting #{job} on new worker" if self.class.debug_enabled?
+      log_to_file "restarting #{job} on new worker"
       job = job.merge(:action => 'deploy:rollback', 'worker_action' => 'worker_died')
       delegate(job)
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -1,5 +1,6 @@
 require_relative './child_process'
 require_relative './state_machine'
+require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # rubocop:disable ClassLength
   # worker that will spawn a child process in order to execute a capistrano job and monitor that process
@@ -20,12 +21,13 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Notifications
     include Celluloid::Logger
+    include CapistranoMulticonfigParallel::ApplicationHelper
     class TaskFailed < StandardError; end
 
     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
+                  :job_termination_condition, :worker_state, :invocation_chain, :filename, :worker_log
 
     def work(job, manager)
       @job = job
@@ -33,20 +35,16 @@ module CapistranoMulticonfigParallel
       @manager = manager
       @job_confirmation_conditions = []
       process_job(job) if job.present?
-      debug("worker #{@job_id} received #{job.inspect}") if debug_enabled?
+      log_to_file("worker #{@job_id} received #{job.inspect}")
       @subscription_channel = "worker_#{@job_id}"
       @machine = CapistranoMulticonfigParallel::StateMachine.new(job, Actor.current)
       manager.register_worker_for_job(job, Actor.current)
     end
 
-    def debug_enabled?
-      @manager.class.debug_enabled?
-    end
-
     def start_task
       @manager.setup_worker_conditions(Actor.current)
-      debug("exec worker #{@job_id} starts task with #{@job.inspect}") if debug_enabled?
-      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: @manager.class.debug_websocket?, channel: subscription_channel)
+      log_to_file("exec worker #{@job_id} starts task with #{@job.inspect}")
+      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: @manager.debug_websocket?, channel: subscription_channel)
     end
 
     def publish_rake_event(data)
@@ -58,7 +56,7 @@ module CapistranoMulticonfigParallel
     end
 
     def on_message(message)
-      debug("worker #{@job_id} received:  #{message.inspect}") if debug_enabled?
+      log_to_file("worker #{@job_id} received:  #{message.inspect}")
       if @client.succesfull_subscription?(message)
         @successfull_subscription = true
         execute_after_succesfull_subscription
@@ -96,10 +94,10 @@ module CapistranoMulticonfigParallel
     end
 
     def execute_deploy
-      debug("invocation chain #{@job_id} is : #{@rake_tasks.inspect}") if debug_enabled?
+      log_to_file("invocation chain #{@job_id} is : #{@rake_tasks.inspect}")
       check_child_proces
       setup_task_arguments
-      debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
+      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)
     end
@@ -115,7 +113,7 @@ module CapistranoMulticonfigParallel
     end
 
     def on_close(code, reason)
-      debug("worker #{@job_id} websocket connection closed: #{code.inspect}, #{reason.inspect}") if debug_enabled?
+      log_to_file("worker #{@job_id} websocket connection closed: #{code.inspect}, #{reason.inspect}")
     end
 
     def check_gitflow
@@ -128,13 +126,13 @@ module CapistranoMulticonfigParallel
         check_gitflow
         save_tasks_to_be_executed(message)
         update_machine_state(message['task']) # if message['action'] == 'invoke'
-        debug("worker #{@job_id} state is #{@machine.state}") if debug_enabled?
+        log_to_file("worker #{@job_id} state is #{@machine.state}")
         task_approval(message)
       elsif message_is_for_stdout?(message)
         result = Celluloid::Actor[:terminal_server].show_confirmation(message['question'], message['default'])
         publish_rake_event(message.merge('action' => 'stdin', 'result' => result, 'client_action' => 'stdin'))
       else
-        debug("worker #{@job_id} could not handle  #{message}") if debug_enabled?
+        log_to_file(message, @job_id)
       end
     end
 
@@ -152,7 +150,7 @@ module CapistranoMulticonfigParallel
 
     def task_approval(message)
       job_conditions = @manager.job_to_condition[@job_id]
-      if job_conditions.present? && CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
+      if job_conditions.present? && app_configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
         task_confirmation = job_conditions[message['task']]
         task_confirmation[:status] = 'confirmed'
         task_confirmation[:condition].signal(message['task'])
@@ -162,13 +160,13 @@ module CapistranoMulticonfigParallel
     end
 
     def save_tasks_to_be_executed(message)
-      debug("worler #{@job_id} current invocation chain : #{rake_tasks.inspect}") if debug_enabled?
+      log_to_file("worler #{@job_id} current invocation chain : #{rake_tasks.inspect}")
       rake_tasks << message['task'] if rake_tasks.last != message['task']
       invocation_chain << message['task'] if invocation_chain.last != message['task']
     end
 
     def update_machine_state(name)
-      debug("worker #{@job_id} triest to transition from #{@machine.state} to  #{name}") if debug_enabled?
+      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)
       raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task #{@action} failed ") if name == 'deploy:failed' # force worker to rollback
@@ -196,7 +194,7 @@ module CapistranoMulticonfigParallel
       @env_options.each do |key, value|
         array_options << "#{key}=#{value}" if value.present?
       end
-      array_options << '--trace' if debug_enabled?
+      array_options << '--trace' if app_debug_enabled?
       args.each do |arg|
         array_options << arg
       end
@@ -236,11 +234,11 @@ module CapistranoMulticonfigParallel
 
     def notify_finished(exit_status)
       if exit_status.exitstatus != 0
-        debug("worker #{job_id} tries to terminate") if debug_enabled?
+        log_to_file("worker #{job_id} tries to terminate")
         raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task  failed with exit status #{exit_status.inspect} ") # force worker to rollback
       else
         update_machine_state('FINISHED')
-        debug("worker #{job_id} notifies manager has finished") if debug_enabled?
+        log_to_file("worker #{job_id} notifies manager has finished")
         finish_worker
       end
     end

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -1,10 +1,13 @@
+require_relative '../helpers/application_helper'
+require_relative '../helpers/core_helper'
 module CapistranoMulticonfigParallel
   # class that is used to execute the capistrano tasks and it is invoked by the celluloid worker
   class ChildProcess
     include Celluloid
     include Celluloid::Logger
+    include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_accessor :actor, :pid, :exit_status, :process, :filename, :worker_log, :job_id, :debug_enabled
+    attr_accessor :actor, :pid, :exit_status, :process, :job_id
 
     finalizer :process_finalizer
 
@@ -12,8 +15,6 @@ module CapistranoMulticonfigParallel
       @options = options
       @actor = @options.fetch(:actor, nil)
       @job_id = @actor.job_id
-      @debug_enabled = @actor.debug_enabled?
-      set_worker_log
       EM.run do
         EM.next_tick do
           start_async_deploy(cmd, options)
@@ -23,24 +24,12 @@ module CapistranoMulticonfigParallel
         end
       end
       EM.error_handler do|e|
-        @worker_log.debug "Error during event loop for worker #{@job_id}: #{e.inspect}" if @debug_enabled
-        @worker_log.debug e.backtrace if @debug_enabled
+        log_to_file("Error during event loop for worker #{@job_id}: #{e.inspect}", @job_id)
+        log_to_file(e.backtrace, @job_id)
         EM.stop
       end
     end
 
-    def set_worker_log
-      FileUtils.mkdir_p(CapistranoMulticonfigParallel.log_directory) unless File.directory?(CapistranoMulticonfigParallel.log_directory)
-      @filename = File.join(CapistranoMulticonfigParallel.log_directory, "worker_#{@actor.job_id}.log")
-      FileUtils.rm_rf(@filename) if File.file?(@filename) && !@actor.crashed?
-      @worker_log = ::Logger.new(@filename)
-      @worker_log.level = ::Logger::Severity::DEBUG
-      @worker_log.formatter = proc do |severity, datetime, progname, msg|
-        date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
-        "[#{date_format}] #{severity}  (#{progname}): #{msg}\n"
-      end
-    end
-
     def process_finalizer
       @timer.cancel
       EM.stop if EM.reactor_running?
@@ -83,12 +72,12 @@ module CapistranoMulticonfigParallel
     end
 
     def on_exit(status)
-      @worker_log.debug "Child process for worker #{@job_id} on_exit  disconnected due to error #{status.inspect}" if @debug_enabled
+      log_to_file "Child process for worker #{@job_id} on_exit  disconnected due to error #{status.inspect}"
       @exit_status = status
     end
 
     def async_exception_handler(*data)
-      @worker_log.debug "Child process for worker #{@job_id} async_exception_handler  disconnected due to error #{data.inspect}" if @debug_enabled
+      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
     end
@@ -98,7 +87,7 @@ module CapistranoMulticonfigParallel
     end
 
     def io_callback(io, data)
-      @worker_log.debug("#{io.upcase} ---- #{data}")
+      log_to_file("#{io.upcase} ---- #{data}", @job_id)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -1,9 +1,11 @@
+require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class that handles the rake task and waits for approval from the celluloid worker
   # rubocop:disable ClassLength
   class RakeWorker
     include Celluloid
     include Celluloid::Logger
+    include CapistranoMulticonfigParallel::ApplicationHelper
 
     attr_accessor :env, :client, :job_id, :action, :task,
                   :task_approved, :successfull_subscription,
@@ -50,11 +52,7 @@ module CapistranoMulticonfigParallel
 
     def initialize_subscription
       return if defined?(@client) && @client.present?
-      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: debug_enabled?, channel: @subscription_channel)
-    end
-
-    def debug_enabled?
-      CapistranoMulticonfigParallel::CelluloidManager.debug_websocket?
+      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: false, channel: @subscription_channel)
     end
 
     def task_name
@@ -82,12 +80,12 @@ module CapistranoMulticonfigParallel
         task_approval(message)
         stdin_approval(message)
       else
-        warn "unknown action: #{message.inspect}" if debug_enabled?
+        show_warning "unknown action: #{message.inspect}"
       end
     end
 
     def log_debug(action, message)
-      debug("Rake worker #{@job_id} received after #{action}: #{message}") if debug_enabled?
+      log_to_file("Rake worker #{@job_id} received after #{action}: #{message}")
     end
 
     def msg_for_stdin?(message)
@@ -117,7 +115,7 @@ module CapistranoMulticonfigParallel
       if @job_id.to_i == message['job_id'].to_i && message['result'].present?
         @stdin_result = message['result']
       else
-        warn "unknown invocation #{message.inspect}" if debug_enabled?
+        show_warning "unknown invocation #{message.inspect}"
       end
     end
 
@@ -126,12 +124,12 @@ module CapistranoMulticonfigParallel
       if @job_id.to_i == message['job_id'].to_i && message['task'] == task_name && message['approved'] == 'yes'
         @task_approved = true
       else
-        warn "unknown invocation #{message.inspect}" if debug_enabled?
+        show_warning "unknown invocation #{message.inspect}"
       end
     end
 
     def on_close(code, reason)
-      debug("websocket connection closed: #{code.inspect}, #{reason.inspect}") if debug_enabled?
+      log_to_file("websocket connection closed: #{code.inspect}, #{reason.inspect}")
       terminate
     end
 

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
   # rubocop:disable ClassLength
@@ -5,7 +6,7 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Notifications
     include Celluloid::Logger
-
+    include CapistranoMulticonfigParallel::ApplicationHelper
     def self.topic
       'sshkit_terminal'
     end
@@ -44,7 +45,7 @@ module CapistranoMulticonfigParallel
 
     def show_confirmation(message, default)
       exclusive do
-        CapistranoMulticonfigParallel.ask_confirm(message, default)
+        ask_confirm(message, default)
       end
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/web_server.rb

@@ -1,10 +1,12 @@
+require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class used to start the web server for websockets
   class WebServer < CelluloidPubsub::WebServer
+    include CapistranoMulticonfigParallel::ApplicationHelper
     def initialize(*args)
       super(*args)
     rescue => exc
-      CapistranoMulticonfigParallel.log_message(exc)
+      log_error(exc)
       # fails silently
     end
   end

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -1,8 +1,9 @@
 require_relative './interactive_menu'
-
+require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class used to find application dependencies
   class DependencyTracker
+    include CapistranoMulticonfigParallel::ApplicationHelper
     attr_accessor :job_manager
 
     def initialize(job_manager)
@@ -15,7 +16,7 @@ module CapistranoMulticonfigParallel
       if @job_manager.custom_command?
         apps_selected = all_websites_return_applications_selected
         applications = get_applications_to_deploy(action, apps_selected)
-      elsif CapistranoMulticonfigParallel.configuration.application_dependencies.present?
+      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 }
@@ -31,7 +32,7 @@ module CapistranoMulticonfigParallel
   private
 
     def application_dependencies
-      deps = CapistranoMulticonfigParallel.configuration.application_dependencies
+      deps = app_configuration.application_dependencies
       deps.present? && deps.is_a?(Array) ? deps.map(&:stringify_keys) : []
     end
 
@@ -68,7 +69,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 = CapistranoMulticonfigParallel.ask_confirm("Do you want to  #{action} all dependencies also ?", 'Y/N')
+      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
     end
@@ -102,7 +103,7 @@ module CapistranoMulticonfigParallel
 
     def print_frameworks_used(app_names, applications_to_deploy, action)
       app_names.each { |app| puts "#{app}" }
-      apps_deploy_confirmation = CapistranoMulticonfigParallel.ask_confirm("Are you sure you want to #{action} these apps?", 'Y/N')
+      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'

data/lib/capistrano_multiconfig_parallel/classes/rake_hook_actor.rb

@@ -23,18 +23,26 @@ module CapistranoMulticonfigParallel
 
   private
 
+    def output_stream
+      CapistranoMulticonfigParallel::OutputStream
+    end
+
+    def input_stream
+      CapistranoMulticonfigParallel::InputStream
+    end
+
     def actor_execute_block(&block)
       stringio = StringIO.new
-      CapistranoMulticonfigParallel::OutputStream.hook(stringio)
-      CapistranoMulticonfigParallel::InputStream.hook(actor, stringio)
+      output_stream.hook(stringio)
+      input_stream.hook(actor, stringio)
       block.call
-      CapistranoMulticonfigParallel::InputStream.unhook
-      CapistranoMulticonfigParallel::OutputStream.unhook
+      input_stream.unhook
+      output_stream.unhook
     end
 
     def actor_start_working
       if actor.blank?
-        CapistranoMulticonfigParallel::RakeWorker.supervise_as rake_actor_id
+        supervise_actor
         actor.work(@env, actor_id: rake_actor_id, job_id: job_id, task: @task)
       else
         actor.publish_new_work(@env, task: @task)
@@ -42,9 +50,8 @@ module CapistranoMulticonfigParallel
     end
 
     def supervise_actor
-      CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id,
-                                                             actor_id: rake_actor_id,
-                                                             job_id: job_id) if actor.blank?
+      return unless actor.blank?
+      CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id)
     end
 
     def actor

data/lib/capistrano_multiconfig_parallel/classes/standard_deploy.rb

@@ -1,8 +1,10 @@
 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)
@@ -40,9 +42,9 @@ module CapistranoMulticonfigParallel
       command = build_capistrano_task(action)
       puts("\n\n\n Executing '#{command}' \n\n\n .")
       sh("#{command}")
-      # rescue => ex
-      #   CapistranoMulticonfigParallel.log_message(ex)
-      #   execute_standard_deploy('deploy:rollback') if action.blank? && @name == 'deploy'
+    rescue => ex
+      log_error(ex)
+      execute_standard_deploy('deploy:rollback') if action.blank? && @name == 'deploy'
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -4,6 +4,8 @@ module CapistranoMulticonfigParallel
   # this is the class that will be invoked from terminal , and willl use the invoke task as the primary function.
   class CLI
     class << self
+      include CapistranoMulticonfigParallel::ApplicationHelper
+
       # method used to start
       def start
         verify_validation
@@ -26,7 +28,7 @@ module CapistranoMulticonfigParallel
       end
 
       def verify_validation
-        CapistranoMulticonfigParallel.check_terminal_tty
+        check_terminal_tty
         CapistranoMulticonfigParallel.original_args = ARGV.dup
         CapistranoMulticonfigParallel.configuration_valid?
       end

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -2,44 +2,37 @@ require_relative './core_helper'
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module ApplicationHelper
-    extend ActiveSupport::Concern
-    included do
-      def app_configuration
-        CapistranoMulticonfigParallel.configuration
-      end
-
-      def change_config_type(type)
-        ['boolean'].include?(type) ? type.delete(':').to_sym : type.constantize
-      end
+    include CapistranoMulticonfigParallel::CoreHelper
 
-      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
-      end
+  module_function
 
-      def parse_task_string(string) # :nodoc:
-        /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
+    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
+    end
 
-        name           = Regexp.last_match(1)
-        remaining_args = Regexp.last_match(2)
+    def parse_task_string(string) # :nodoc:
+      /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
 
-        return string, [] unless name
-        return name,   [] if     remaining_args.empty?
+      name           = Regexp.last_match(1)
+      remaining_args = Regexp.last_match(2)
 
-        args = []
+      return string, [] unless name
+      return name,   [] if     remaining_args.empty?
 
-        loop do
-          /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
+      args = []
 
-          remaining_args = Regexp.last_match(2)
-          args << Regexp.last_match(1).gsub(/\\(.)/, '\1')
-          break if remaining_args.blank?
-        end
+      loop do
+        /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
 
-        [name, args]
+        remaining_args = Regexp.last_match(2)
+        args << Regexp.last_match(1).gsub(/\\(.)/, '\1')
+        break if remaining_args.blank?
       end
+
+      [name, args]
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -1,7 +1,9 @@
+require_relative './application_helper'
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module Configuration
     extend ActiveSupport::Concern
+    include CapistranoMulticonfigParallel::ApplicationHelper
 
     included do
       attr_reader :configuration
@@ -13,8 +15,8 @@ module CapistranoMulticonfigParallel
 
       def fetch_configuration
         @fetched_config = Configliere::Param.new
-        command_line_params.each do |param|
-          param_type = change_config_type(param['type'].to_s)
+        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
 
@@ -32,11 +34,6 @@ module CapistranoMulticonfigParallel
         @fetched_config.resolve!
       end
 
-      def command_line_params
-        @default_config ||= YAML.load_file(File.join(internal_config_directory, 'default.yml'))['default_config']
-        @default_config
-      end
-
       def verify_array_of_strings(value)
         return true if value.blank?
         value.reject(&:blank?)
@@ -82,7 +79,6 @@ module CapistranoMulticonfigParallel
         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))
-        CapistranoMulticonfigParallel::CelluloidManager.debug_enabled = true if c[:multi_debug].to_s.downcase == 'true'
       end
     end
   end

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -1,82 +1,105 @@
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module CoreHelper
-    extend ActiveSupport::Concern
-    included do
-      def config_file
-        File.join(detect_root.to_s, 'config', 'multi_cap.yml')
-      end
+  module_function
 
-      def internal_config_directory
-        File.join(root.to_s, 'capistrano_multiconfig_parallel', 'configuration')
-      end
+    def internal_config_directory
+      File.join(root.to_s, 'capistrano_multiconfig_parallel', 'configuration')
+    end
 
-      def find_env_multi_cap_root
-        ENV['MULTI_CAP_ROOT']
-      end
+    def internal_config_file
+      File.join(internal_config_directory, 'default.yml')
+    end
 
-      def detect_root
-        if find_env_multi_cap_root
-          Pathname.new(find_env_multi_cap_root)
-        elsif defined?(::Rails)
-          ::Rails.root
-        else
-          try_detect_capfile
-        end
-      end
+    def default_internal_config
+      @default_config ||= YAML.load_file(internal_config_file)['default_config']
+      @default_config
+    end
 
-      def log_directory
-        File.join(detect_root.to_s, 'log')
-      end
+    def find_env_multi_cap_root
+      ENV['MULTI_CAP_ROOT']
+    end
 
-      def main_log_file
-        File.join(log_directory, 'multi_cap.log')
-      end
+    def root
+      File.expand_path(File.dirname(File.dirname(__dir__)))
+    end
 
-      def websokect_log_file
-        File.join(log_directory, 'multi_cap_websocket.log')
-      end
+    def find_config_type(type)
+      ['boolean'].include?(type.to_s) ? type.to_s.delete(':').to_sym : type.to_s.constantize
+    end
 
-      def root
-        File.expand_path(File.dirname(File.dirname(__dir__)))
-      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
+    end
 
-      def check_terminal_tty
-        $stdin.sync = true if $stdin.isatty
-        $stdout.sync = true if $stdout.isatty
-      end
+    def app_debug_enabled?
+      app_configuration.multi_debug.to_s.downcase == 'true'
+    end
 
-      def ask_confirm(message, default)
-        `stty -raw echo`
-        check_terminal_tty
-        result = Ask.input message, default: default
-        $stdout.flush
-        `stty -raw echo`
-        return result
-      rescue
-        return nil
-      end
+    def show_warning(message)
+      warn message if app_debug_enabled?
+    end
 
-      def log_message(message)
-        return unless logger.present?
-        logger.debug(
-          class_name: message.class,
-          message: message.respond_to?(:message) ? message.message : message.inspect,
-          backtrace: message.respond_to?(:backtrace) ? message.backtrace.join("\n\n") : ''
-        )
-      end
+    def app_configuration
+      CapistranoMulticonfigParallel.configuration
+    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
-      end
+    def custom_commands
+      CapistranoMulticonfigParallel.custom_commands
+    end
+
+    def app_logger
+      CapistranoMulticonfigParallel.logger
+    end
+
+    def check_terminal_tty
+      $stdin.sync = true if $stdin.isatty
+      $stdout.sync = true if $stdout.isatty
+    end
+
+    def find_loaded_gem(name)
+      Gem.loaded_specs.values.find { |repo| repo.name == name }
+    end
+
+    def ask_confirm(message, default)
+      `stty -raw echo`
+      check_terminal_tty
+      result = Ask.input message, default: default
+      $stdout.flush
+      `stty -raw echo`
+      return result
+    rescue
+      return nil
+    end
+
+    def log_error(message)
+      log_to_file(
+        class_name: message.class,
+        message: message.respond_to?(:message) ? message.message : message.inspect,
+        backtrace: message.respond_to?(:backtrace) ? message.backtrace.join("\n\n") : ''
+      )
+    end
+
+    def log_to_file(message, job_id = nil)
+      worker_log = job_id.present? ? find_worker_log(job_id) : app_logger
+      worker_log.debug(message) if worker_log.present? && app_debug_enabled?
+    end
 
-      def find_loaded_gem(name)
-        Gem.loaded_specs.values.find { |repo| repo.name == name }
+    def find_worker_log(job_id)
+      return if job_id.blank?
+      FileUtils.mkdir_p(CapistranoMulticonfigParallel.log_directory) unless File.directory?(CapistranoMulticonfigParallel.log_directory)
+      filename = File.join(CapistranoMulticonfigParallel.log_directory, "worker_#{job_id}.log")
+      worker_log = ::Logger.new(filename)
+      worker_log.level = ::Logger::Severity::DEBUG
+      worker_log.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
   end
 end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,7 +7,7 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 17
+    MINOR = 18
     TINY = 0
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - bogdanRada