capistrano_multiconfig_parallel 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4f5118640bf0eb0d4432550eabda6d3ab473c4
-  data.tar.gz: ba7d6e68442b703b128b5e5d39817b39e8e63aca
+  metadata.gz: f6825ac5589167ee4a3ddd9656816c6ca07ba078
+  data.tar.gz: 581c3abbc3e591f7805204182e6143bc51eabb51
 SHA512:
-  metadata.gz: abf7da6aed349a2ac5ee9b1b0f9839d6678344fb46a1050fd9b49261cc469832c391dcde9b972e74b95e2bb117b68a4c938403e6a8aa656cf4d8dff27ce9dfa6
-  data.tar.gz: 7fe10ebea517268960b73b09623c348b8457350bcf2c07bcc60d66361ad5343cb5282ec0910eb20b063c3353c63d6a2509cd490c0afc160b10fda35e0f6859d3
+  metadata.gz: ba070cc586ddbc2f1aaa1c4c39bd97950c5e0d5732b7457f0bea9ba922ca69a025c3eb7d18c91cc7ccf12dfd2c1e0462cbc0b4eec2c6e70ef4293a313981613e
+  data.tar.gz: 2169b6d170664cf324e46a61f392170d793a51faefe1873e784e3eb97e24224687a653672814344020e786f91510f3657d27129e90bff685802d22e139b2d25f

data/README.md

@@ -55,7 +55,7 @@ Requirements
 11.	[inquirer >= 0.2](https://github.com/arlimus/inquirer.rb)
 12.	[devnull >= 0.1](https://github.com/arlimus/inquirer.rb)
 13.	[capistrano_sentinel >= 0.0.16](http://github.com/bogdanRada/capistrano_sentinel)
-14.	[ruby-progressbar >= 1.8.1](https://github.com/jfelchner/ruby-progressbar)
+14.	[powerbar >= 1.0.17](https://github.com/busyloop/powerbar)
 
 Compatibility
 -------------

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -2,7 +2,7 @@ require_relative './helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # finds app dependencies, shows menu and delegates jobs to celluloid manager
   class Application
-    include CapistranoMulticonfigParallel::BaseActorHelper
+    include CapistranoMulticonfigParallel::ApplicationHelper
 
     attr_reader :stage_apps,
       :top_level_tasks,
@@ -19,7 +19,7 @@ module CapistranoMulticonfigParallel
       :patched_job_paths,
       :bundler_workers_store,
       :checked_job_paths
-      
+
     attr_writer :patched_job_paths
 
     def initialize
@@ -108,20 +108,11 @@ module CapistranoMulticonfigParallel
     end
 
     def check_before_starting
-      @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(Actor.current)
+      @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(self)
       @default_stage = configuration.development_stages.present? ? configuration.development_stages.first : 'development'
       @condition = Celluloid::Condition.new
-      @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
-      start_bundler_supervision_if_needed
-    end
-
-    def start_bundler_supervision_if_needed
-      return if configuration.check_app_bundler_dependencies.to_s.downcase != 'true'
-      @bundler_worker_supervisor = setup_supervision_group
-      @mutex = Mutex.new
-      @bundler_workers = setup_pool_of_actor(@bundler_worker_supervisor, actor_name: :bundler_workers, type: CapistranoMulticonfigParallel::BundlerWorker, size: 10)
-      Actor.current.link @bundler_workers
-      setup_actor_supervision(@bundler_worker_supervisor, actor_name: :bundler_terminal_server, type: CapistranoMulticonfigParallel::BundlerTerminalTable, args: [@manager, Actor.current, configuration.fetch(:terminal, {})])
+      @manager = CapistranoMulticonfigParallel::CelluloidManager.new(self)
+      @manager.start_bundler_supervision_if_needed
     end
 
     def collect_jobs(options = {}, &_block)
@@ -191,7 +182,11 @@ module CapistranoMulticonfigParallel
         collect_jobs(options)
       end
       if configuration.check_app_bundler_dependencies.to_s.downcase == 'true'
-        sleep(0.1) until @jobs.size == @bundler_workers_store.size
+        loop do
+          log_to_file("Trying to sleep until all budler workes are done (#{@jobs.size} and #{@bundler_workers_store.size})")
+          break if @jobs.size == @bundler_workers_store.size
+          sleep(0.1)
+        end
       end
       process_jobs
     end
@@ -235,6 +230,10 @@ module CapistranoMulticonfigParallel
       #terminate
     end
 
+    def add_job_to_list_of_jobs(job)
+      @jobs << job unless job_can_tag_staging?(job)
+    end
+
     def prepare_job(options)
       options = options.stringify_keys
       return raise_invalid_job_config if !job_stage_valid?(options)
@@ -248,31 +247,24 @@ module CapistranoMulticonfigParallel
       env_options = options['env_options']
       job_env_options = custom_command? ? env_options.except(action_key) : env_options
 
-      job = CapistranoMulticonfigParallel::Job.new(Actor.current, options.merge(
+      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)
 
       ))
+      raise "Please make sure you have a Gemfile in the project root directory #{job.job_path}" unless job.job_gemfile.present?
+      if job.find_capfile.blank?
+        raise "Please make sure you have a Capfile in the project root directory #{job.job_path}"
+      end
 
-      bundler_callback = lambda { |job|
-        raise "Please make sure you have a Gemfile in the project root directory #{job.job_path}" unless job.job_gemfile.present?
-        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} "
-        end
-        log_to_file("bundler callback called with #{job.inspect}")
-        job.application.jobs << job unless job.application.job_can_tag_staging?(job)
-      }
       if configuration.check_app_bundler_dependencies.to_s.downcase == 'true' && job.job_gemfile.present?
         if !@checked_job_paths.include?(job.job_path)
           @checked_job_paths << job.job_path
-          @bundler_workers.work(job, &bundler_callback) # make sure we have installed the dependencies first for this application
+          @manager.bundler_workers.work(job) # make sure we have installed the dependencies first for this application
         end
       else
-        bundler_callback.call(job)
+        add_job_to_list_of_jobs(job)
       end
 
     end

data/lib/capistrano_multiconfig_parallel/celluloid/bundler_worker.rb

@@ -15,9 +15,8 @@ module CapistranoMulticonfigParallel
       :show_bundler
     ]
 
-    def work(job, &callback)
+    def work(job)
       @job = job
-      @callback = callback
       @job.application.bundler_workers_store[job] = Actor.current
       @job_id = job.id
       @runner_status = nil
@@ -90,8 +89,9 @@ module CapistranoMulticonfigParallel
       @runner_status = runner_status
       @exit_status = exit_status
       progress_bar.close if defined?(@progress_bar)
-      if exit_status == 0
-        @callback.call(@job)
+        log_to_file("bundler worker #{@job_id} notifuy finished with #{exit_status.inspect}")
+      if exit_status.to_i == 0
+        @job.application.add_job_to_list_of_jobs(@job)
       else
         error_message = "Bundler worker #{@job_id} task  failed with exit status #{exit_status.inspect}"
         raise(CapistranoMulticonfigParallel::TaskFailed.new(error_message), error_message)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
     include CapistranoMulticonfigParallel::BaseActorHelper
     attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated, :stderr_buffer
 
-    attr_reader :worker_supervisor, :workers
+    attr_reader :worker_supervisor, :workers, :bundler_workers
     trap_exit :worker_died
 
     def initialize(job_manager)
@@ -38,6 +38,13 @@ module CapistranoMulticonfigParallel
       @job_to_condition = {}
     end
 
+    def start_bundler_supervision_if_needed
+      return if configuration.check_app_bundler_dependencies.to_s.downcase != 'true'
+      @bundler_workers = setup_pool_of_actor(@worker_supervisor, actor_name: :bundler_workers, type: CapistranoMulticonfigParallel::BundlerWorker, size: 10)
+      Actor.current.link @bundler_workers
+      setup_actor_supervision(@worker_supervisor, actor_name: :bundler_terminal_server, type: CapistranoMulticonfigParallel::BundlerTerminalTable, args: [Actor.current, @job_manager, configuration.fetch(:terminal, {})])
+    end
+
     # call to send an actor
     # a job
     def delegate_job(job, old_job = "")

data/lib/capistrano_multiconfig_parallel/celluloid/process_runner.rb

@@ -60,8 +60,8 @@ module CapistranoMulticonfigParallel
       exit_status = @runner_status.exit_status
       return if exit_status.blank?
       @timer.cancel
-      log_to_file("worker #{@job_id} startsnotify finished with exit status #{exit_status.inspect}")
       if @actor.present? && @actor.respond_to?(:notify_finished)
+        log_to_file("#{@actor.class} #{@job_id} startsnotify finished with exit status #{exit_status.inspect}")
         if @actor.respond_to?(:async) && @synchronicity == :async
           @actor.async.notify_finished(exit_status, @runner_status)
         else

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -94,7 +94,7 @@ module CapistranoMulticonfigParallel
     end
 
     def managers_alive?
-      @job_manager.alive? && @manager.alive?
+       @manager.alive?
     end
 
     def signal_complete

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -11,7 +11,7 @@ module CapistranoMulticonfigParallel
     end
 
     def fetch_apps_needed_for_deployment(application, action)
-      return [[], {}] unless @job_manager.multi_apps?
+      return [[], {}] unless @job_manager.send(:multi_apps?)
       if @job_manager.custom_command?
         show_interactive_menu(action)
       else

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -261,6 +261,9 @@ module CapistranoMulticonfigParallel
     end
 
     def prepare_application_for_deployment
+      unless capistrano_sentinel_needs_updating?
+        raise "Please consider upgrading the gem #{capistrano_sentinel_name} to version #{loaded_capistrano_sentinel_version} from #{job_capistrano_sentinel_version} in #{job_path} "
+      end
       config = @job.application.patched_job_paths.find{|hash| hash[:path] == job_path}
       if config.present?
         @job_final_gemfile = config[:gemfile]

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -9,7 +9,7 @@ module CapistranoMulticonfigParallel
 
     MAJOR = 2
     MINOR = 0
-    TINY = 4
+    TINY = 5
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

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