capistrano_multiconfig_parallel 2.0.0.rc3 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e1fd5e54ce834910e9d5a10bc8b8fda48d7fcc
-  data.tar.gz: 26042aa56996fccd7368b8cabff50d085b1f6014
+  metadata.gz: ac23d7c22bd2218a3698e42af759ca31f5acc788
+  data.tar.gz: 36698d180f0f36eb03c7d31d6a7de9151083c577
 SHA512:
-  metadata.gz: 98552410ce19198066f3b6d5c13750e398a550cbc30261531f923b38909286e3cdc8ce73be8b7a9d449cb9cb24b06ab520ee113861221f7d85a125c287fb803c
-  data.tar.gz: 1ceb4b40efe8193f5a9ed568685f36c86c6f5e39fa82d5174eb5c5d8b6255546d600880807833ed4893a7edbeb277922ade06ae4edb95be6d48d56c4c28893e5
+  metadata.gz: 40ca91f76026730c6a2202980b01a697ce81da78f2929405d2add331abc2c43b74a68db273d4698def4eaf9356814b0fa481f263fa340a8924c7e33ba89ed99c
+  data.tar.gz: 9874920c58f868739a8aa9a07a2d03c0d873a6850d3ce4838b87b6f14b27b6dd171dc0f3228dab9289664616cac78ced4a38e8a46709ac53b6da4765e67f15d2

data/capistrano_multiconfig_parallel.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'inquirer', '~> 0.2', '>= 0.2'
   s.add_runtime_dependency 'devnull','~> 0.1', '>= 0.1'
   s.add_runtime_dependency 'capistrano_sentinel',  '>= 0.0', '>= 0.0.16'
+  s.add_runtime_dependency 'ruby-progressbar', '~> 1.8', '>= 1.8.1'
 
   s.add_development_dependency 'rake', '>= 10.4', '>= 10.4'
   s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -20,6 +20,7 @@ require 'configliere'
 require 'devnull'
 require 'inquirer'
 require "capistrano_sentinel"
+require 'ruby-progressbar'
 
 require 'etc'
 require 'logger'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -4,7 +4,8 @@ module CapistranoMulticonfigParallel
   class Application
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :stage_apps, :top_level_tasks, :jobs, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
+    attr_reader :stage_apps, :top_level_tasks, :jobs, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage,:patched_job_paths
+    attr_writer :patched_job_paths
 
     def initialize
       Celluloid.boot unless Celluloid.running?
@@ -12,6 +13,8 @@ module CapistranoMulticonfigParallel
       @stage_apps = multi_apps? ? app_names_from_stages : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
       @jobs = []
+      @checked_job_paths = []
+      @patched_job_paths = [] # for deploy
     end
 
     def start
@@ -50,13 +53,13 @@ module CapistranoMulticonfigParallel
     end
 
     def verify_valid_data
-     return if  @top_level_tasks != ['default']
-     raise_invalid_job_config
+      return if  @top_level_tasks != ['default']
+      raise_invalid_job_config
     end
 
     def raise_invalid_job_config
-        puts 'Invalid execution, please call something such as `multi_cap production deploy`, where production is a stage you have defined'.red
-        exit(false)
+      puts 'Invalid execution, please call something such as `multi_cap production deploy`, where production is a stage you have defined'.red
+      exit(false)
     end
 
     def initialize_data
@@ -105,7 +108,6 @@ module CapistranoMulticonfigParallel
 
     def process_jobs
       return unless @jobs.present?
-      FileUtils.rm Dir["#{log_directory}/worker_*.log"]
       if configuration.multi_secvential.to_s.downcase == 'true'
         @jobs.each(&:execute_standard_deploy)
       else
@@ -153,6 +155,8 @@ module CapistranoMulticonfigParallel
     end
 
     def run
+      FileUtils.rm Dir["#{log_directory}/worker_*.log"]
+      FileUtils.rm Dir["#{log_directory}/multi_cap_worker_*.log"]
       options = {}
       if custom_command?
         options = verify_options_custom_command(options)
@@ -214,17 +218,27 @@ module CapistranoMulticonfigParallel
 
       env_options = options['env_options']
       job_env_options = custom_command? ? env_options.except(action_key) : env_options
+
       job = CapistranoMulticonfigParallel::Job.new(self, options.merge(
-                                                                    action: custom_command? && env_options[action_key].present? ? env_options[action_key] : options['action'],
-                                                                    env_options: job_env_options,
-                                                                    path:  job_path(options)
+      action: custom_command? && env_options[action_key].present? ? env_options[action_key] : options['action'],
+      env_options: job_env_options,
+      path:  job_path(options)
 
       ))
+        if job.job_gemfile.present?
+          if !@checked_job_paths.include?(job.job_path)
+            @checked_job_paths << job.job_path
+            bundler_worker = CapistranoMulticonfigParallel::BundlerWorker.new
+            bundler_worker.work(job) # make sure we have installed the dependencies first for this application
+          end
+        else
+          raise "Please make sure you have a Gemfile in the project root directory #{job.job_path}"
+        end
       if job.find_capfile.blank?
         raise "Please make sure you have a Capfile in the project root directory #{job.job_path}"
       end
       unless job.capistrano_sentinel_needs_updating?
-         raise "Please consider upgrading the gem #{job.capistrano_sentinel_name} to version #{job.loaded_capistrano_sentinel_version} from #{job.job_capistrano_sentinel_version} in #{job.job_path} "
+        raise "Please consider upgrading the gem #{job.capistrano_sentinel_name} to version #{job.loaded_capistrano_sentinel_version} from #{job.job_capistrano_sentinel_version} in #{job.job_path} "
       end
       @jobs << job unless job_can_tag_staging?(job)
     end
@@ -234,7 +248,8 @@ module CapistranoMulticonfigParallel
     end
 
     def job_path(options)
-      options.fetch("path", nil).present? ? options["path"] : detect_root
+      path = options["path"].present? ? options["path"] : nil
+      path.present? && File.directory?(path) ? path : detect_root
     end
 
     def job_stage_valid?(options)

data/lib/capistrano_multiconfig_parallel/celluloid/bundler_worker.rb

@@ -1,34 +1,67 @@
 require_relative './celluloid_worker'
 require_relative './process_runner'
-require_relative '../classes/runner_status'
+require_relative '../classes/bundler_status'
 module CapistranoMulticonfigParallel
   class BundlerWorker
     include CapistranoMulticonfigParallel::BaseActorHelper
 
-    def work(job, options = {}, &callback)
+    attr_reader *[
+      :job,
+      :job_id,
+      :runner_status,
+      :log_prefix,
+      :checked_bundler_deps,
+      :total_dependencies,
+      :show_bundler
+    ]
+
+    def work(job)
       @job = job
-      @options = options.symbolize_keys
       @job_id = job.id
       @runner_status = nil
+      @log_prefix = 'bundler'
+      @checked_bundler_deps = []
+      @total_dependencies = bundler_dependencies.size
+      @show_bundler = true
+      progress_bar
       check_missing_deps
     end
 
-    def actor_id
-      "bundler_worker_#{@job_id}".to_sym
+    def progress_bar
+      @progress_bar ||= ProgressBar.create(:title => "Checking app #{File.basename(@job.job_path)} bundler dependencies ", :starting_at => 0, :total => @total_dependencies.to_i, length: 160, :format => '%a |%b>>%i| %p%% %t | Processed: %c from %C gem dependencies')
+    end
+
+    def bundler_dependencies
+      builder = Bundler::Dsl.new
+      builder.eval_gemfile(@job.job_gemfile)
+      definition = builder.to_definition(@job.job_gemfile_lock, {})
+      @bundler_dependencies ||= definition.dependencies
+    end
+
+    def show_bundler_progress(data)
+      @show_bundler = false if  data.to_s.include?("The Gemfile's dependencies are satisfied") || data.to_s.include?("Bundle complete")
+      gem_spec = bundler_dependencies.find{|spec| data.include?(spec.name) }
+      if  @show_bundler == true && gem_spec.present?
+        @checked_bundler_deps = [gem_spec.name]
+        progress_bar.increment
+      elsif @show_bundler == false
+        progress_bar.finish
+      end
     end
 
     def check_missing_deps
       command = @job.fetch_bundler_worker_command
-      log_to_file("bundler worker #{@job_id} executes: #{command}")
+      log_to_file("bundler worker #{@job_id} executes: #{command}", job_id: @job_id, prefix: @log_prefix)
       do_bundle_sync_command(command)
     end
 
     def do_bundle_sync_command(command)
-      CapistranoMulticonfigParallel::ProcessRunner.supervise as: actor_id
-      result =  Celluloid::Actor[actor_id].work(@job, command,sync: :sync, :callback => lambda { |runner_status| @runner_status = runner_status } )
+      process_runner = CapistranoMulticonfigParallel::ProcessRunner.new
+      process_runner.work(@job, command, process_sync: :sync, actor: Actor.current, log_prefix: @log_prefix, runner_status_klass: CapistranoMulticonfigParallel::BundlerStatus, :callback => lambda {|runner_status| @runner_status = runner_status })
       sleep(0.1) until @runner_status.present?
-      @runner_status.output_text.include?("The Gemfile's dependencies are satisfied")
+      @runner_status.output_text
     end
 
+
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -236,7 +236,7 @@ module CapistranoMulticonfigParallel
       mailbox = worker.mailbox
       log_to_file("worker_died: worker job #{job.inspect} with mailbox #{mailbox.inspect} and #{mailbox.address.inspect} died  for reason:  #{reason}")
       return true if job.blank? || job.rolling_back? || job.action != 'deploy'
-      job.rollback_changes_to_application
+      #job.rollback_changes_to_application
       @worker_to_job.delete(mailbox.address)
       log_to_file("RESTARTING: worker job #{job.inspect} with mailbox #{mailbox.inspect} and #{mailbox.address.inspect} died  for reason:  #{reason}")
 

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -100,7 +100,7 @@ module CapistranoMulticonfigParallel
       check_child_proces
       command = job.fetch_deploy_command
       log_to_file("worker #{@job_id} executes: #{command}")
-      @child_process.async.work(@job, command, actor: Actor.current, silent: true,sync: :async, runner_status_klass: CapistranoMulticonfigParallel::ChildProcessStatus)
+      @child_process.async.work(@job, command, actor: Actor.current, silent: true, process_sync: :async, runner_status_klass: CapistranoMulticonfigParallel::ChildProcessStatus)
     end
 
     def check_child_proces
@@ -186,12 +186,9 @@ module CapistranoMulticonfigParallel
       @manager.workers_terminated.signal('completed') if !@job.marked_for_dispatching_new_job? && @manager.present? && @manager.alive? && @manager.all_workers_finished?
     end
 
-    def mark_for_dispatching_new_job
-      @job.will_dispatch_new_job = @job.new_jobs_dispatched.size + 1 unless @job.rolling_back?
-    end
 
-    def notify_finished(exit_status)
-      mark_for_dispatching_new_job if exit_status != 0
+    def notify_finished(exit_status, _runner_status)
+      @job.mark_for_dispatching_new_job if exit_status != 0
       @job.exit_status = exit_status
       finish_worker(exit_status)
       return if exit_status == 0

data/lib/capistrano_multiconfig_parallel/celluloid/process_runner.rb

@@ -27,14 +27,14 @@ module CapistranoMulticonfigParallel
 
       @runner_status_klass = @options[:runner_status_klass].present? ? @options[:runner_status_klass] : RunnerStatus
       @runner_status = @runner_status_klass.new(Actor.current, job, cmd,  @options)
-      @synchronicity = @options[:sync]
+      @synchronicity = @options[:process_sync]
       start_running
     end
 
     def start_running
       setup_attributes
       run_right_popen3
-      setup_em_error_handler if @synchronicity == :async
+      setup_em_error_handler
     end
 
     def setup_attributes
@@ -63,9 +63,9 @@ module CapistranoMulticonfigParallel
       log_to_file("worker #{@job_id} startsnotify finished with exit status #{exit_status.inspect}")
       if @actor.present? && @actor.respond_to?(:notify_finished)
         if @actor.respond_to?(:async) && @synchronicity == :async
-          @actor.async.notify_finished(exit_status)
-        elsif @synchronicity == :sync
-          @actor.notify_finished(exit_status)
+          @actor.async.notify_finished(exit_status, @runner_status)
+        else
+          @actor.notify_finished(exit_status, @runner_status)
         end
       end
     end
@@ -96,7 +96,6 @@ module CapistranoMulticonfigParallel
 
     def run_right_popen3_sync(command, popen3_options)
       do_right_popen3_sync(command, popen3_options)
-      sleep(0.1) until @runner_status.exit_status.present?
     end
 
     def run_right_popen3_async(command, popen3_options)

data/lib/capistrano_multiconfig_parallel/classes/bundler_status.rb

@@ -0,0 +1,28 @@
+require_relative './runner_status'
+module CapistranoMulticonfigParallel
+  # class that is used to execute the capistrano tasks and it is invoked by the celluloid worker
+  class BundlerStatus < CapistranoMulticonfigParallel::RunnerStatus
+
+    def on_read_stdout(data)
+      show_bundler_progress(data)
+      super(data)
+    end
+
+    def show_bundler_progress(data)
+      data = data.strip
+      return if data.blank? || data == '.'
+      if @actor.present? && @actor.respond_to?(:show_bundler_progress)
+        call_bundler_progress(data)
+      end
+    end
+
+    def call_bundler_progress(data)
+      if @actor.respond_to?(:async)
+        @actor.async.show_bundler_progress(data)
+      else
+        @actor.show_bundler_progress(data)
+      end
+    end
+
+  end
+end

data/lib/capistrano_multiconfig_parallel/classes/child_process_status.rb

@@ -65,7 +65,7 @@ module CapistranoMulticonfigParallel
     end
 
     def io_callback(io, data)
-      log_to_file("#{io.upcase} ---- #{data}", job_id: @job_id)
+      log_to_worker(data, io)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -15,9 +15,11 @@ module CapistranoMulticonfigParallel
       @options = options.stringify_keys
       @application = application
       @manager = @application.manager
-      @gitflow ||= command.gitflow_enabled?
     end
 
+    def gitflow
+      @gitflow ||= command.gitflow_enabled?
+    end
 
     def save_stderr_error(data)
       return unless development_debug?
@@ -111,7 +113,6 @@ module CapistranoMulticonfigParallel
 
     def setup_additional_env_variables(value)
       value["#{env_variable}"] = id
-      value["capistrano_version"] = job_capistrano_version
     end
 
     def finished?
@@ -126,6 +127,11 @@ module CapistranoMulticonfigParallel
       ['deploy:rollback'].include?(action)
     end
 
+    def mark_for_dispatching_new_job
+      return if rolling_back?
+      will_dispatch_new_job = new_jobs_dispatched.size + 1
+    end
+
     def marked_for_dispatching_new_job?
       will_dispatch_new_job.to_i != new_jobs_dispatched.size
     end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -12,14 +12,13 @@ module CapistranoMulticonfigParallel
     def initialize(job)
       @job = job
       @job_final_gemfile = job_gemfile_multi
-      @legacy_capistrano = legacy_capistrano? ? true : false
     end
 
     def lockfile_parser
       if File.exists?(job_gemfile) && File.exists?(job_gemfile_lock)
         @lockfile_parser ||= Bundler::LockfileParser.new(Bundler.read_file("#{job_gemfile_lock}"))
       else
-        raise RuntimeError, "please install the gems separately for this application #{job_path} and re-try again!"
+        raise "please install the gems separately for this application #{job_path} and re-try again!"
       end
     end
 
@@ -28,12 +27,12 @@ module CapistranoMulticonfigParallel
     end
 
     def fetch_bundler_worker_command
-      get_command_script(fetch_bundler_check_command)
+      get_command_script(fetch_bundler_check_command, "bundler")
     end
 
 
     def find_capfile(custom_path = job_path)
-      @capfile_path ||= Pathname.new(custom_path).children.find { |file| check_file(file, 'capfile') }
+      @capfile_path ||= find_file_by_names(custom_path, 'capfile').first
     end
 
     def capfile_name
@@ -109,13 +108,13 @@ module CapistranoMulticonfigParallel
       array_options = []
       filtered_keys = options.delete(:filtered_keys) || []
       env_options.each do |key, value|
-        array_options << "#{env_prefix(key, @legacy_capistrano)} #{env_key_format(key, @legacy_capistrano)}=#{value}" if value.present? && !env_option_filtered?(key, filtered_keys)
+        array_options << "#{env_prefix(key, legacy_capistrano)} #{env_key_format(key, legacy_capistrano)}=#{value}" if value.present? && !env_option_filtered?(key, filtered_keys)
       end
       setup_remaining_flags(array_options, options)
     end
 
     def setup_remaining_flags(array_options, options)
-      array_options << trace_flag(@legacy_capistrano) if app_debug_enabled?
+      array_options << trace_flag(legacy_capistrano) if app_debug_enabled?
       array_options.concat(setup_flags_for_job(options))
     end
 
@@ -128,10 +127,14 @@ module CapistranoMulticonfigParallel
       @job_capistrano_version ||= job_gem_version("capistrano")
     end
 
-    def legacy_capistrano?
+    def legacy_capistrano_version?
       verify_gem_version(job_capistrano_version, '3.0', operator: '<')
     end
 
+    def legacy_capistrano
+      @legacy_capistrano  ||= legacy_capistrano_version? ? true : false
+    end
+
     def capistrano_sentinel_needs_updating?
       if capistrano_sentinel_available?
         loaded_capistrano_sentinel_version == job_capistrano_sentinel_version
@@ -198,7 +201,15 @@ module CapistranoMulticonfigParallel
       rvm_enabled_for_job? ? "bash --login -c '#{command}'" : command
     end
 
-    def get_command_script(command)
+    def log_to_worker(message, action = nil)
+      if action.present? || action.to_s == id.to_s
+        log_to_file(message, job_id: id, prefix: action)
+      else
+        log_to_file(message)
+      end
+    end
+
+    def get_command_script(command, action = nil)
       command = rvm_bash_prefix(command)
       command = command.inspect
       command_text =<<-CMD
@@ -211,13 +222,13 @@ module CapistranoMulticonfigParallel
 
       if rvm_enabled_for_job?
         create_job_tempfile_command(command_text)
-        log_to_file "JOB #{@job_id}  created Tempfile #{@tempfile.path} with contents #{File.read(@tempfile.path)}"
+        log_to_worker("JOB #{@job_id}  created Tempfile #{@tempfile.path} with contents #{File.read(@tempfile.path)}", action)
         "ruby #{@tempfile.path}"
       else
         final_command=<<-CMD
         cd #{job_path} && bundle exec ruby -e "#{command_text}"
         CMD
-        log_to_file "JOB #{@job_id}  prepared command #{final_command}"
+        log_to_worker("JOB #{@job_id}  prepared command #{final_command}", action)
         final_command
       end
     end
@@ -250,12 +261,15 @@ module CapistranoMulticonfigParallel
     end
 
     def prepare_application_for_deployment
-      if ENV['MULTI_CAP_WEB_APP'].present?
-        bundler_worker = CapistranoMulticonfigParallel::BundlerWorker.new
-        result = bundler_worker.work(job)
+      config = @job.application.patched_job_paths.find{|hash| hash[:path] == job_path}
+      if config.present?
+        @job_final_gemfile = config[:gemfile]
+        @job_final_capfile = config[:capfile]
+      else
+        check_capistrano_sentinel_availability
+        prepare_capfile
+        @job.application.patched_job_paths << {path: job_path, gemfile: @job_final_gemfile, capfile: @job_final_capfile}
       end
-      check_capistrano_sentinel_availability
-      prepare_capfile
     end
 
     def check_capistrano_sentinel_availability
@@ -307,17 +321,7 @@ module CapistranoMulticonfigParallel
     def rollback_changes_to_application
       FileUtils.rm_rf(job_gemfile_multi) if File.exists?(job_gemfile_multi)
       FileUtils.rm_rf("#{job_gemfile_multi}.lock") if File.exists?("#{job_gemfile_multi}.lock")
-      unless capistrano_sentinel_available?
-        File.open(job_capfile, 'r') do |f|
-          File.open("#{job_capfile}.tmp", 'w') do |f2|
-            f.each_line do |line|
-              f2.write(line) unless line.include?(capistrano_sentinel_name)
-            end
-          end
-        end
-        FileUtils.mv "#{job_capfile}.tmp", job_capfile
-        FileUtils.rm_rf("#{job_capfile}.tmp")
-      end
+      FileUtils.rm_rf(job_capfile_multi) if  File.exists?(job_capfile_multi)
       FileUtils.rm_rf(@tempfile.path) if defined?(@tempfile) && @tempfile
     end
 
@@ -331,7 +335,7 @@ module CapistranoMulticonfigParallel
     private
 
     def run_shell_command(command)
-      sh("#{command}")
+      Kernel.system("#{command}")
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/runner_status.rb

@@ -52,49 +52,59 @@ module CapistranoMulticonfigParallel
       @async_exception   = nil
     end
 
+    def log_to_worker(message, io = nil)
+      if io.present?
+        log_to_file("#{io.upcase} ---- #{message}", job_id: @job_id, prefix: @options[:log_prefix])
+      elsif @options[:log_prefix].present?
+        log_to_file(message, job_id: @job_id, prefix: @options[:log_prefix])
+      else
+        log_to_file(message)
+      end
+    end
+
     def on_pid(pid)
-      log_to_file "Child process for worker #{@job_id} on_pid  #{pid.inspect}"
+      log_to_worker"Child process for worker #{@job_id} on_pid  #{pid.inspect}"
       @pid ||= pid
     end
 
 
     def on_input_stdin(data)
-        log_to_file "Child process for worker #{@job_id} on_input_stdin  #{data.inspect}"
-        @output_text << data
+      log_to_worker(data, "stdin")
+      @output_text << data
     end
 
     def on_read_stdout(data)
-      log_to_file "Child process for worker #{@job_id} on_read_stdout  #{data.inspect}"
+      log_to_worker(data, "stdout")
       @output_text << data
     end
 
     def on_read_stderr(data)
-      log_to_file "Child process for worker #{@job_id} on_read_stderr  #{data.inspect}"
+      log_to_worker(data, "stderr")
       @error_text << data
     end
 
 
     def on_timeout
-      log_to_file "Child process for worker #{@job_id} on_timeout  disconnected"
+      log_to_worker "Child process for worker #{@job_id} on_timeout  disconnected"
       @did_timeout = true
-      @callback.call(self) if @callback && @expect_timeout
+      @callback.call(self) if @callback && process_runner.synchronicity == :sync && @expect_timeout
     end
 
     def on_size_limit
-      log_to_file "Child process for worker #{@job_id} on_size_limit  disconnected"
+      log_to_worker "Child process for worker #{@job_id} on_size_limit  disconnected"
       @did_size_limit = true
-      @callback.call(self) if  @callback && @expect_size_limit
+      @callback.call(self) if @callback && process_runner.synchronicity == :sync && @expect_size_limit
     end
 
     def on_exit(status)
-      log_to_file "Child process for worker #{@job_id} on_exit  disconnected due to error #{status.inspect}"
+      log_to_worker "Child process for worker #{@job_id} on_exit  disconnected due to #{status.inspect}"
       @exit_status = status.exitstatus
-      @callback.call(self) if @callback
+      @callback.call(self) if @callback && process_runner.synchronicity == :sync
     end
 
     def async_exception_handler(async_exception)
       @async_exception = async_exception
-      log_to_file "Child process for worker #{@job_id} async_exception_handler  disconnected due to error #{data.inspect}"
+      log_to_worker "Child process for worker #{@job_id} async_exception_handler  disconnected due to error #{data.inspect}"
       @exit_status = 1
     end
 

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -84,7 +84,7 @@ module CapistranoMulticonfigParallel
     end
 
     def log_to_file(message, options = {})
-      worker_log = options.fetch(:job_id, '').present? ? find_worker_log(options[:job_id]) : logger
+      worker_log = options.fetch(:job_id, '').present? ? find_worker_log(options[:job_id], options[:prefix]) : logger
       print_to_log_file(worker_log, options.merge(message: message)) if worker_log.present? && app_debug_enabled?
     end
 
@@ -94,10 +94,10 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def find_worker_log(job_id)
+    def find_worker_log(job_id, prefix = nil)
       return if job_id.blank?
       FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
-      filename = File.join(log_directory, "worker_#{job_id}.log")
+      filename = File.join(log_directory, "multi_cap_worker_#{prefix.present? ? "#{prefix}_" : ''}#{job_id}.log")
       setup_filename_logger(filename)
     end
 

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -125,6 +125,15 @@ module CapistranoMulticonfigParallel
       root.children.find { |file| check_file(file, filename) }.present? || pathname_is_root?(root)
     end
 
+    def find_file_by_names(custom_path = detect_root, names = ['capfile'])
+      names = names.is_a?(Array) ? names : [names]
+      pathnames = names.collect do |name|
+        Pathname.new(custom_path).children.find { |file| check_file(file, name) }
+      end
+      pathnames.present? && pathnames.is_a?(Array) ? pathnames.compact : pathnames
+    end
+
+
     def try_detect_file(filename = 'capfile')
       root = pwd_parent_dir
       root = root.parent until find_file_in_directory(root, filename)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
     MAJOR = 2
     MINOR = 0
     TINY = 0
-    PRE = 'rc3'
+    PRE = 'rc4'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - bogdanRada
@@ -258,6 +258,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.16
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -491,6 +511,7 @@ files:
 - lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb
 - lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb
 - lib/capistrano_multiconfig_parallel/celluloid/web_server.rb
+- lib/capistrano_multiconfig_parallel/classes/bundler_status.rb
 - lib/capistrano_multiconfig_parallel/classes/child_process_status.rb
 - lib/capistrano_multiconfig_parallel/classes/cursor.rb
 - lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb