capistrano_multiconfig_parallel 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e671ffb5b25e82a157ff5daba3de38b84902228c
-  data.tar.gz: ae97811db72349e8377dfbd54adf2a56c4385d59
+  metadata.gz: 2699a6ed6f5e38540aa4bbbfc86c17842febbc9c
+  data.tar.gz: cd6b4acefa3ac596d711b6dab2c450f47f93a8f9
 SHA512:
-  metadata.gz: 22e2d3da34a9824010707e04e5a8a5d7dd0ee712bd73e904d8161da10568e4eaaa2eb2af2cc29734e56d07c27c8b731556d8b06061788b661f776ccf85e2696b
-  data.tar.gz: 9714d4b0b21ac6fcee820f591ff650299b22fb1afc3733934f4b14c18d46f0c35eb4c78ee9df1066cf97d9853c9a26dba1fb5be290942d7e37f6b79d6aad72db
+  metadata.gz: 9210b7536d87f6d17ba7f0f99a120947728dfd239074d99eb0e46f9a61f8b7c8cd99ae4a2f16f207e138f40a190697d55d2ead9ae595f3050b18398e59524ce4
+  data.tar.gz: ba98002b12565a804aff218cc24cc958a4af662eb86dbe684a1c416bf8032c78bb3544eeaa867a6653310b3604d0b64caea539daf52e8b2a398bdec05fe30948

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -12,6 +12,7 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel.enable_logging
       @stage_apps = multi_apps? ? app_names_from_stages : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
+      @bundler_workers = []
       @jobs = []
       @checked_job_paths = []
       @patched_job_paths = [] # for deploy
@@ -164,6 +165,9 @@ module CapistranoMulticonfigParallel
       else
         collect_jobs(options)
       end
+      if configuration.check_app_bundler_dependencies.to_s.downcase == 'true'
+        sleep(0.1) until @jobs.size == @bundler_workers.size
+      end
       process_jobs
     end
 
@@ -225,21 +229,28 @@ module CapistranoMulticonfigParallel
       path:  job_path(options)
 
       ))
+
+      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
+        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_worker = CapistranoMulticonfigParallel::BundlerWorker.new
-          bundler_worker.work(job) # make sure we have installed the dependencies first for this application
+          @bundler_workers << {job: job, worker: bundler_worker }
+          bundler_worker.work(job, &bundler_callback) # make sure we have installed the dependencies first for this application
         end
+      else
+        bundler_callback.call(job)
       end
-      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
-      @jobs << job unless job_can_tag_staging?(job)
+
     end
 
     def job_can_tag_staging?(job)

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -4,6 +4,9 @@ module CapistranoMulticonfigParallel
   GITFLOW_CALCULATE_TAG_TASK = 'gitflow:calculate_tag'
   GITFLOW_VERIFY_UPTODATE_TASK = 'gitflow:verify_up_to_date'
 
+  class TaskFailed < StandardError; end
+
+
   class << self
     attr_accessor :logger, :original_args, :config, :config_keys
     include CapistranoMulticonfigParallel::Configuration
@@ -51,7 +54,7 @@ module CapistranoMulticonfigParallel
       Celluloid.logger = logger
       Celluloid.task_class = defined?(Celluloid::TaskThread) ? Celluloid::TaskThread : Celluloid::Task::Threaded
       Celluloid.exception_handler do |ex|
-        unless ex.is_a?(Interrupt) || ex.is_a?(SystemExit) || ex.is_a?(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed)
+        unless ex.is_a?(Interrupt) || ex.is_a?(SystemExit) || ex.is_a?(CapistranoMulticonfigParallel::TaskFailed)
           rescue_error(ex, 'stderr')
         end
       end

data/lib/capistrano_multiconfig_parallel/celluloid/bundler_worker.rb

@@ -15,7 +15,7 @@ module CapistranoMulticonfigParallel
       :show_bundler
     ]
 
-    def work(job)
+    def work(job, &callback)
       @job = job
       @job_id = job.id
       @runner_status = nil
@@ -24,7 +24,7 @@ module CapistranoMulticonfigParallel
       @total_dependencies = bundler_dependencies.size
       @show_bundler = true
       progress_bar
-      check_missing_deps
+      async.check_missing_deps
     end
 
     def progress_bar
@@ -41,7 +41,10 @@ module CapistranoMulticonfigParallel
     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?
+      if data.include?("Error") && @show_bundler == true && gem_spec.present?
+        error_message = "Bundler worker #{@job_id} task  failed for #{gem_spec.inspect}"
+        raise(CapistranoMulticonfigParallel::TaskFailed.new(error_message), error_message)
+      elsif  @show_bundler == true && gem_spec.present?
         @checked_bundler_deps = [gem_spec.name]
         progress_bar.increment
       elsif @show_bundler == false
@@ -57,11 +60,20 @@ module CapistranoMulticonfigParallel
 
     def do_bundle_sync_command(command)
       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
+      process_runner.work(@job, command, process_sync: :async, actor: Actor.current, log_prefix: @log_prefix, runner_status_klass: CapistranoMulticonfigParallel::BundlerStatus)
     end
 
+    def notify_finished(exit_status, runner_status)
+      @runner_status = runner_status
+      @exit_status = exit_status
+      progress_bar.finish
+      if exit_status == 0
+        callback.call(@job)
+      else
+        error_message = "Bundler worker #{@job_id} task  failed with exit status #{exit_status.inspect}"
+        raise(CapistranoMulticonfigParallel::TaskFailed.new(error_message), error_message)
+      end
+    end
 
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -19,7 +19,6 @@ module CapistranoMulticonfigParallel
   #
   class CelluloidWorker
     include CapistranoMulticonfigParallel::BaseActorHelper
-    class TaskFailed < StandardError; end
 
 
     ATTRIBUTE_LIST = [
@@ -170,7 +169,7 @@ module CapistranoMulticonfigParallel
       log_to_file("worker #{@job_id} triest to transition from #{@machine.state} to  #{name}") unless options[:bundler]
       @machine.go_to_transition(name.to_s, options)
       error_message = "worker #{@job_id} task #{name} failed "
-      raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new(error_message), error_message) if job.failed? # force worker to rollback
+      raise(CapistranoMulticonfigParallel::TaskFailed.new(error_message), error_message) if job.failed? # force worker to rollback
     end
 
     def send_msg(channel, message = nil)
@@ -193,7 +192,7 @@ module CapistranoMulticonfigParallel
       finish_worker(exit_status)
       return if exit_status == 0
       error_message = "worker #{@job_id} task  failed with exit status #{exit_status.inspect}  "
-      raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new(error_message), error_message)
+      raise(CapistranoMulticonfigParallel::TaskFailed.new(error_message), error_message)
     end
 
     # def inspect

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -49,7 +49,7 @@ module CapistranoMulticonfigParallel
     end
 
     def error_filtered?(error)
-      [CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, SystemExit].find { |class_name| error.is_a?(class_name) }.present?
+      [CapistranoMulticonfigParallel::TaskFailed, SystemExit].find { |class_name| error.is_a?(class_name) }.present?
     end
 
     def development_debug?

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -9,7 +9,7 @@ module CapistranoMulticonfigParallel
 
     MAJOR = 2
     MINOR = 0
-    TINY = 0
+    TINY = 1
     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.0
+  version: 2.0.1
 platform: ruby
 authors:
 - bogdanRada