capistrano_multiconfig_parallel 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dc5369df42690fa5ef870983a214797511279f1
-  data.tar.gz: f88009806ea57b3592a5764fd11d9a462eed320f
+  metadata.gz: 5e6f19bd4a7bf784e65f3bc34d3e49bb9e09cbe0
+  data.tar.gz: 69ce6bff1ffa9bb244ee9c12e6a035850c458be5
 SHA512:
-  metadata.gz: 92e18862adee46ad87c6b367a4667d5b5042f4470d449aeed06e39f7064f363b803f47aff6eeeae50a5d700fa1288a846f8e2809910471a9dc4367fceebd2e90
-  data.tar.gz: e85230d220e7f440e38c3164113b70050432b09267120b0ae15e35c0caa759accd38806c1094b8f7ae821d7079c60e1bcde6863f1af515c9d076f580a0e8ceab
+  metadata.gz: 500a0d5722c22bc3d00abfedd395050a7ce693fd9eec858cb4fc5d4f6ef82c62ce782b5cfb15aa6426fabf284f54dc4f0d3f1baee62b3ee00909ce74cfe41fbf
+  data.tar.gz: 7be10e250b4ed0e1c3990e4071816203022b0b7b20d34a8f60a1a1d475ec469b8ffd6a782b976e2e47fa193a80944c6276ea1f4e668c54a17225555875e202a5

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -105,12 +105,18 @@ module CapistranoMulticonfigParallel
       @job_manager.condition.signal(results2) if results2.size == @jobs.size
     end
 
+    def need_confirmations?
+      CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
+    end
+    
     def wait_task_confirmations
-      return unless CapistranoMulticonfigParallel.configuration.task_confirmation_active
+      return unless need_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, index|
         results = []
         @jobs.pmap do |job_id, _job|
-          results << @job_to_condition[job_id][:first_condition][index].wait
+          current_job = @job_to_condition[job_id][:first_condition][index]
+          result = current_job.respond_to?(:wait) ? current_job.wait : current_job
+          results << result
         end
         if results.size == @jobs.size
           confirm_task_approval(results, task)
@@ -120,17 +126,19 @@ module CapistranoMulticonfigParallel
 
     def confirm_task_approval(results, task)
       return unless results.present?
-      set :apps_symlink_confirmation, CapistranoMulticonfigParallel.ask_confirm("Do you want  to continue the deployment and execute #{task}?", 'Y/N')
-      until fetch(:apps_symlink_confirmation).present?
-        sleep(0.1) # keep current thread alive
+      if results.detect {|x| !x.is_a?(Proc)}
+        set :apps_symlink_confirmation, CapistranoMulticonfigParallel.ask_confirm("Do you want  to continue the deployment and execute #{task}?", 'Y/N')
+        until fetch(:apps_symlink_confirmation).present?
+          sleep(0.1) # keep current thread alive
+        end
       end
       return if fetch(:apps_symlink_confirmation).blank? || fetch(:apps_symlink_confirmation).downcase != 'y'
       @jobs.pmap do |job_id, job|
         worker = get_worker_for_job(job_id)
         worker.publish_rake_event('approved' => 'yes',
-                                  'action' => 'invoke',
-                                  'job_id' => job['id'],
-                                  'task' => task
+          'action' => 'invoke',
+          'job_id' => job['id'],
+          'task' => task
         )
       end
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -182,7 +182,7 @@ module CapistranoMulticonfigParallel
     end
 
     def need_confirmation_for_tasks?
-      executes_deploy? && CapistranoMulticonfigParallel.configuration.task_confirmation_active
+      executes_deploy? == true  && @manager.need_confirmations?
     end
 
     def executes_deploy?

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY = 3
+    TINY = 4
     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: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - bogdanRada