capistrano_multiconfig_parallel 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9578694025dca215377cd4d9d78dea9a0bad48
-  data.tar.gz: 0de2d1f4b3c3ad520620769ac2e2baf3c2b88e67
+  metadata.gz: 807e40ee77401d31f5ca168c79daa993f0742d2e
+  data.tar.gz: f0fcf399fd6dde6a96fdc40ae10fa6c6e593bd5d
 SHA512:
-  metadata.gz: 2c123c22fc754c732ec4d64be8477f264e2deb67080b638848a23253453aa3e0270281c6867516d618ed427bf86c245e3811b7dc300c692afe1a94f9493dac50
-  data.tar.gz: 5e8cd281aed6385d4bb2e072767572206a6c1b824bb8a0b4ce0cef170e50e7f6ab9aad40036d17f31fc0a609b3defedd34abb80310d896081a9e6ed322bcfcf3
+  metadata.gz: 5e4d5b0d0e9869d781067480e025b25ac187c67a196247fd8f07c2691adb8f968425c297f4b3d5d788068b01b226a7668a32af096cab4b0cdadedf0dfbf2cb94
+  data.tar.gz: 1ce688cb8219b2bb26ade54ca01af7a198497ed9932ba03242a9c385f951bdc681417b42da32fbb298d613ffd6955020ff4cf29dbf448e1f2cc8906e5df399d0

data/README.md

@@ -98,7 +98,8 @@ websocket_server:
 development_stages: 
   - development
   - webdev
-  
+
+syncronize_confirmation: true  
 task_confirmation_active: false  
 task_confirmations: 
   - deploy:symlink:release
@@ -128,6 +129,9 @@ application_dependencies: []
 * --development_stages
   * if option is present and has value an ARRAY of STRINGS, each of them will be used as a development stage
 
+* --syncronize_confirmation
+  * if option is present and has value TRUE, all workers will be synchronized to wait for same task from the ***task_confirmations** Array before they execute it 
+
 * --task_confirmation_active
   * if option is present and has value TRUE, will enable user confirmation dialogs before executing each task from option  **--task_confirmations**
 

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -23,7 +23,7 @@ module CapistranoMulticonfigParallel
   }
 
   class << self
-    attr_accessor :show_task_progress, :interactive_menu, :execute_in_sequence, :logger, :show_task_progress_tree
+    attr_accessor :show_task_progress, :execute_in_sequence, :logger, :original_args
 
     def root
       File.expand_path(File.dirname(__dir__))
@@ -33,14 +33,6 @@ module CapistranoMulticonfigParallel
       Ask.input message, default: default
     end
 
-    def verify_app_dependencies(stages)
-      applications = stages.map { |stage| stage.split(':').reverse[1] }
-      wrong = CapistranoMulticonfigParallel.configuration.application_dependencies.find do |hash|
-        !applications.include?(hash[:app]) || (hash[:dependencies].present? && hash[:dependencies].find { |val| !applications.include?(val) })
-      end
-      raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
-    end
-
     def log_directory
       File.join(CapistranoMulticonfigParallel.detect_root.to_s, 'log')
     end
@@ -56,14 +48,13 @@ module CapistranoMulticonfigParallel
     def enable_logging
       CapistranoMulticonfigParallel.configuration_valid?
       return unless CapistranoMulticonfigParallel::CelluloidManager.debug_enabled
-      FileUtils.mkdir_p(log_directory) unless  File.directory?(log_directory)
+      FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
       FileUtils.touch(main_log_file) unless File.file?(main_log_file)
-      if  ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
+      if ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
         log_file = File.open(main_log_file, 'w')
         log_file.sync = true
       end
       self.logger = ::Logger.new(main_log_file)
-      Celluloid.logger = logger
     end
 
     def log_message(message)
@@ -90,11 +81,11 @@ module CapistranoMulticonfigParallel
         try_detect_capfile
       end
     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?
+      root = root.parent until root.children.find { |f| f.file? && f.basename.to_s.downcase == 'capfile' }.present? || root.root?
       raise "Can't detect Rails application root" if root.root?
       root
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -24,6 +24,7 @@ module CapistranoMulticonfigParallel
       @mutex = Mutex.new
       # http://rubydoc.info/gems/celluloid/Celluloid/SupervisionGroup/Member
       @workers = @worker_supervisor.pool(CapistranoMulticonfigParallel::CelluloidWorker, as: :workers, size: 10)
+      Actor.current.link @workers
       # Get a handle on the PoolManager
       # http://rubydoc.info/gems/celluloid/Celluloid/PoolManager
       # @workers = workers_pool.actor
@@ -83,59 +84,76 @@ module CapistranoMulticonfigParallel
         @worker_to_job[worker.mailbox.address] = job
         debug("worker #{worker.job_id} registed into manager") if self.class.debug_enabled?
         Actor.current.link worker
+        worker.async.start_task unless syncronized_confirmation?
         if @job_manager.jobs.size == @job_to_worker.size
           @registration_complete = true
         end
       end
     end
 
-    def process_jobs(&block)
-      @job_to_worker.pmap do |job_id, worker|
-        setup_worker_conditions(job_id)
-        worker.async.start_task
+    def process_jobs
+      if syncronized_confirmation?
+        @job_to_worker.pmap do |_job_id, worker|
+          worker.async.start_task
+        end
+        wait_task_confirmations
       end
-      block_given? ? block.call : wait_task_confirmations
-      until  @job_to_worker.all?{|job_id, worker| worker.alive? && worker.worker_state =='finished'}
+      condition = @job_to_worker.all? { |_job_id, worker| worker.alive? && worker.worker_state == 'finished' }
+      until condition == true
         sleep(0.1) # keep current thread alive
       end
-      mark_completed_remaining_tasks
-      @job_manager.condition.signal("completed") 
+      debug("all jobs have completed #{condition}") if self.class.debug_enabled?
+      @job_manager.condition.signal('completed') if condition
     end
-    
-    def setup_worker_conditions(job_id)
+
+    def syncronized_confirmation?
+      CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true' && !@job_manager.executes_deploy_stages?
+    end
+
+    def setup_worker_conditions(worker)
       hash_conditions = {}
       if need_confirmations?
         CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
-          hash_conditions[task] = { condition:  Celluloid::Condition.new, status: 'unconfirmed' }
+          hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
         end
       end
-      @job_to_condition[job_id] = hash_conditions
+      @job_to_condition[worker.job_id] = hash_conditions
     end
 
     def need_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
     end
-    
-    def mark_completed_remaining_tasks
+
+    def mark_completed_remaining_tasks(worker)
       return unless need_confirmations?
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, index|
-        @jobs.pmap do |job_id, _job|
-          fake_result = proc{ |sum| sum }
-          task_confirmation = @job_to_condition[job_id][task]
-          if task_confirmation[:status] != 'confirmed'
-            task_confirmation[:status] = 'confirmed'
-            task_confirmation[:condition].signal(fake_result)
-          end
+      CapistranoMulticonfigParallel.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'
+          task_confirmation[:status] = 'confirmed'
+          task_confirmation[:condition].signal(fake_result)
         end
       end
     end
-    
+
+    def wait_task_confirmations_worker(worker)
+      return if !need_confirmations? || syncronized_confirmation?
+      CapistranoMulticonfigParallel.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
+   end
+
+    def wait_condition_for_task(job_id, task)
+      @job_to_condition[job_id][task][:condition].wait
+    end
+
     def wait_task_confirmations
       return unless need_confirmations?
-      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, index|
+      CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         results = []
         @jobs.pmap do |job_id, _job|
-          result = @job_to_condition[job_id][task][:condition].wait
+          result = wait_condition_for_task(job_id, task)
           results << result
         end
         if results.size == @jobs.size
@@ -144,11 +162,13 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    
-    def confirm_task_approval(results, task)
-      return unless results.present?
-      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')
+    def confirm_task_approval(result, task, worker = nil)
+      return unless result.present?
+      unless result.is_a?(Proc)
+        message = "Do you want  to continue the deployment and execute #{task.upcase}"
+        message += " for JOB #{worker.job_id}" if worker.present?
+        message += '?'
+        set :apps_symlink_confirmation, CapistranoMulticonfigParallel.ask_confirm(message, 'Y/N')
         until fetch(:apps_symlink_confirmation).present?
           sleep(0.1) # keep current thread alive
         end
@@ -157,9 +177,9 @@ module CapistranoMulticonfigParallel
       @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
@@ -177,6 +197,21 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def process_job(job)
+      env_options = {}
+      job['env_options'].each do |key, value|
+        env_options[key] = value if value.present?
+      end
+      {
+        'job_id' => job['id'],
+        'app_name' => job['app'],
+        'env_name' =>  job['env'],
+        'action_name' =>  job['action'],
+        'env_options' => env_options,
+        'task_arguments' => job['task_arguments'],
+      }
+    end
+    
     # lookup status of job by asking actor running it
     def get_job_status(job)
       status = nil

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -44,6 +44,7 @@ module CapistranoMulticonfigParallel
     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?) do |ws|
         ws.subscribe(@subscription_channel)
@@ -77,8 +78,8 @@ module CapistranoMulticonfigParallel
         @task_argv << 'count_rake=true'
         @child_process = CapistranoMulticonfigParallel::ChildProcess.new
         Actor.current.link @child_process
-        debug("worker #{@job_id} executes: bundle exec multi_cap #{@task_argv.join(' ')}") if debug_enabled?
-        @child_process.async.work("bundle exec multi_cap #{@task_argv.join(' ')}", actor: Actor.current, dry_run: true)
+        debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
+        @child_process.async.work(generate_command, actor: Actor.current, silent: true, dry_run: true)
       else
         async.execute_deploy
       end
@@ -88,9 +89,23 @@ module CapistranoMulticonfigParallel
       @rake_tasks ||= []
     end
 
+    def generate_command
+      <<-CMD
+            bundle exec ruby -e "require 'bundler' ;   Bundler.with_clean_env { %x[cd #{CapistranoMulticonfigParallel.detect_root.to_s} && bundle install && RAILS_ENV=#{@env_name} bundle exec multi_cap #{@task_argv.join(' ')} ] } "
+      CMD
+    end
+    
     def execute_deploy
       @execute_deploy = true
       debug("invocation chain #{@job_id} is : #{@rake_tasks.inspect}") if debug_enabled? && CapistranoMulticonfigParallel.show_task_progress
+      check_child_proces
+      setup_task_arguments
+      debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
+      @child_process.async.work(generate_command, actor: Actor.current, silent: true)
+      @manager.wait_task_confirmations_worker(Actor.current) unless @manager.syncronized_confirmation?
+    end
+
+    def check_child_proces
       if !defined?(@child_process) || @child_process.nil?
         @child_process = CapistranoMulticonfigParallel::ChildProcess.new
         Actor.current.link @child_process
@@ -98,9 +113,6 @@ module CapistranoMulticonfigParallel
         @client.unsubscribe("rake_worker_#{@job_id}_count")
         @child_process.exit_status = nil
       end
-      setup_task_arguments
-      debug("worker #{@job_id} executes: bundle exec multi_cap #{@task_argv.join(' ')}") if debug_enabled?
-      @child_process.async.work("bundle exec multi_cap #{@task_argv.join(' ')}", actor: Actor.current, silent: true)
     end
 
     def on_close(code, reason)
@@ -171,19 +183,25 @@ module CapistranoMulticonfigParallel
     end
 
     def process_job(job)
-      @job_id = job['id']
-      @app_name = job['app']
-      @env_name = job['env']
-      @action_name = job['action']
-      @env_options = {}
-      job['env_options'].each do |key, value|
-        @env_options[key] = value if value.present?
-      end
-      @task_arguments = job['task_arguments']
+      processed_job = @manager.process_job(job)
+      @job_id = processed_job['job_id']
+      @app_name = processed_job['app_name']
+      @env_name = processed_job['env_name']
+      @action_name = processed_job['action_name']
+      @env_options = processed_job['env_options']
+      @task_arguments = processed_job['task_arguments']
+    end
+   
+    def crashed?
+      @action_name == 'deploy:rollback' || @action_name == 'deploy:failed'
     end
 
-    def crashed?
-      @action_name == 'deploy:rollback'
+    def finish_worker
+      @manager.mark_completed_remaining_tasks(Actor.current)
+      @worker_state = 'finished'
+      @manager.job_to_worker.each do|_job_id, worker|
+        debug("worker #{worker.job_id}has state #{worker.worker_state}") if worker.alive? && ebug_enabled?
+      end
     end
 
     def notify_finished(exit_status)
@@ -194,16 +212,8 @@ module CapistranoMulticonfigParallel
       else
         update_machine_state('FINISHED')
         debug("worker #{job_id} notifies manager has finished") if debug_enabled?
-        @worker_state = "finished"
-        if debug_enabled?
-          debug("worker #{job_id}has state #{@worker_state}") 
-          @manager.job_to_worker.each{|job_id, worker| 
-            debug("worker #{worker.job_id}has state #{worker.worker_state}") if   worker.alive? 
-          }
-        end
+        finish_worker
       end
     end
-    
-    
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -4,13 +4,12 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
 
-    attr_accessor :actor, :pid, :exit_status, :process, :filename,:worker_log
-
+    attr_accessor :actor, :pid, :exit_status, :process, :filename, :worker_log
 
     def work(cmd, options = {})
       @options = options
       @actor = @options.fetch(:actor, nil)
-       set_worker_log
+      set_worker_log
       EM.run do
         EM.next_tick do
           start_async_deploy(cmd, options)
@@ -33,8 +32,8 @@ module CapistranoMulticonfigParallel
       @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"
+        date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
+        "[#{date_format}] #{severity}  (#{progname}): #{msg}\n"
       end
     end
 
@@ -96,7 +95,7 @@ module CapistranoMulticonfigParallel
     end
 
     def io_callback(io, data)
-       @worker_log.debug("#{io.upcase} ---- #{data}")
+      @worker_log.debug("#{io.upcase} ---- #{data}")
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -50,22 +50,42 @@ module CapistranoMulticonfigParallel
       puts "\n"
       sleep(1)
     end
-
-    def add_job_to_table(table, job_id)
+    
+    def get_worker_details(job_id)
+      job = @manager.jobs[job_id]
+      processed_job = @manager.process_job(job)
       worker = @manager.get_worker_for_job(job_id)
-      return unless worker.present?
+      if worker.alive?
+        state = worker.machine.state.to_s
+        state = worker_crashed?(worker) ? state.red : state.green
+      else
+        state = "dead".upcase.red
+      end
       worker_optons = ''
-      worker.env_options.each do |key, value|
+      processed_job['env_options'].each do |key, value|
         worker_optons << "#{key}=#{value}\n"
       end
-      state = worker.machine.state.to_s
-      state = worker_crashed?(worker) ? state.red : state.green
-      row = [{ value: worker.job_id.to_s },
-             { value: "#{worker.app_name}\n#{worker.env_name}" },
-             { value: worker.action_name },
-             { value: worker_optons },
-             { value: state }
-            ]
+      action = processed_job['task_arguments'].present? ? "#{processed_job['action_name']}[#{processed_job['task_arguments'].join(',')}]" :  processed_job['action_name']
+      
+      {
+        'job_id' => job_id,
+        'app_name' =>processed_job['app_name'],
+        'env_name' =>processed_job['env_name'],
+        'action_name' => action,
+        'env_options' => worker_optons,
+        'task_arguments' => job['task_arguments'],
+        'state' =>  state
+      }
+    end
+    
+    def add_job_to_table(table, job_id)
+      details = get_worker_details(job_id)
+      row = [{ value: job_id.to_s },
+        { value: "#{details['app_name']}\n#{details['env_name']}" },
+        { value: details['action_name']  },
+        { value: details['env_options'] },
+        { value: "#{details['state']}" }
+      ]
       if CapistranoMulticonfigParallel.show_task_progress
         row << { value: worker.rake_tasks.size }
         row << { value: worker_progress(worker) }

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -10,6 +10,7 @@ module CapistranoMulticonfigParallel
       if $stdout.isatty
         $stdout.sync = true
       end
+      CapistranoMulticonfigParallel.original_args = ARGV.dup
       CapistranoMulticonfigParallel::Application.new.run
     rescue Interrupt
       `stty icanon echo`

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -13,18 +13,17 @@ module CapistranoMulticonfigParallel
         command_line_params.each do |param|
           @config.define param[:name], type: param[:type], description: param[:description], default: param[:default]
         end
-        
+
+        ARGV.clear
+        CapistranoMulticonfigParallel.original_args.each { |a| ARGV << a }
         @config.read config_file if File.file?(config_file)
         @config.merge(Settings.use(:commandline).resolve!)
-         
+
         @config.use :config_block
         @config.finally do |c|
           check_configuration(c)
         end
         @config.resolve!
-      rescue => ex
-        puts ex.inspect
-        puts ex.backtrace if ex.respond_to?(:backtrace)
       end
 
       def default_config
@@ -42,65 +41,78 @@ module CapistranoMulticonfigParallel
           {
             name: 'multi_debug',
             type: :boolean,
-            description: '[MULTI_CAP] if option is present and has value TRUE , will enable debugging of workers',
+            description: 'if option is present and has value TRUE , will enable debugging of workers',
             default: default_config[:multi_debug]
           },
           {
             name: 'multi_progress',
             type: :boolean,
-            description: "[MULTI_CAP] if option is present and has value TRUE  will first execute before any process ,
-            same task but with option '--dry-run'  in order to show progress of how many tasks are in total for that task and what is the progress of executing
-           This will slow down the workers , because they will execute twice the same task.",
+            description: "if option is present and has value TRUE  will first execute before any process
+                                \t same task but with option '--dry-run'  in order to show progress of how many tasks
+                                \t are in total for that task and what is the progress of executing
+                                \t This will slow down the workers , because they will execute twice the same task.",
             default: default_config[:multi_progress]
           },
           {
             name: 'multi_secvential',
             type: :boolean,
-            description: "[MULTI_CAP] If parallel executing does not work for you, you can use this option so that each process is executed normally and ouputted to the screen.
-  However this means that all other tasks will have to wait for each other to finish before starting ",
+            description: "If parallel executing does not work for you, you can use this option so that
+                                \t each process is executed normally and ouputted to the screen.
+                                \t However this means that all other tasks will have to wait for each other to finish before starting ",
             default: default_config[:multi_secvential]
           },
           {
             name: 'websocket_server.enable_debug',
             type: :boolean,
-            description: '[MULTI_CAP]  if option is present and has value TRUE, will enable debugging of websocket communication between the workers',
+            description: "if option is present and has value TRUE
+                                \t will enable debugging of websocket communication between the workers",
             default: default_config[:websocket_server][:enable_debug]
           },
           {
             name: 'development_stages',
             type: Array,
-            description: '[MULTI_CAP] if option is present and has value an ARRAY of STRINGS, each of them will be used as a development stage',
+            description: "if option is present and has value an ARRAY of STRINGS,
+                                \t each of them will be used as a development stage",
             default: default_config[:development_stages]
           },
           {
             name: 'task_confirmations',
             type: Array,
-            description: '[MULTI_CAP] if option is present and has value TRUE, will enable user confirmation dialogs
-                                before executing each task from option  **--task_confirmations**',
+            description: "if option is present and has value TRUE, will enable user confirmation dialogs
+                                 \t before executing each task from option  **--task_confirmations**",
             default: default_config[:task_confirmations]
           },
           {
             name: 'task_confirmation_active',
             type: :boolean,
-            description: "[MULTI_CAP] if option is present and has value an ARRAY of Strings, and --task_confirmation_active is TRUE ,
-                                 then will require a confirmation from user before executing the task.
-                                  This will syncronize all workers to wait before executing that task, then a confirmation will be displayed,
-                                  and when user will confirm , all workers will resume their operation",
+            description: "if option is present and has value an ARRAY of Strings, and --task_confirmation_active is TRUE ,
+                                \t then will require a confirmation from user before executing the task.
+                                \t This will syncronize all workers to wait before executing that task, then a confirmation will be displayed,
+                                \t and when user will confirm , all workers will resume their operation",
             default: default_config[:task_confirmation_active]
           },
+          {
+            name: 'syncronize_confirmation',
+            type: :boolean,
+            description: "if option is present and has value TRUE, all workers will be synchronized to wait for same task
+                                \t from the ***task_confirmations** Array before they execute it ",
+            default: default_config[:syncronize_confirmation]
+          },
           {
             name: 'track_dependencies',
             type: :boolean,
-            description: "[MULTI_CAP] This should be useed only for Caphub-like applications , in order to deploy dependencies of an application in parallel.
-                                This is used only in combination with option **--application_dependencies** which is described
-                                 at section **[2.) Multiple applications](#multiple_apps)**",
+            description: "This should be useed only for Caphub-like applications ,
+                                \t in order to deploy dependencies of an application in parallel.
+                                \t This is used only in combination with option **--application_dependencies** which is described
+                                \t at section **[2.) Multiple applications](#multiple_apps)**",
             default: default_config[:track_dependencies]
           },
           {
             name: 'application_dependencies',
             type: Array,
-            description: "[MULTI_CAP] This is an array of hashes. Each hash has only the keys 'app' ( app name), 'priority' and 'dependencies'
-                                ( an array of app names that this app is dependent to) ",
+            description: "This is an array of hashes. Each hash has only the keys
+                                \t 'app' ( app name), 'priority' and 'dependencies'
+                                \t ( an array of app names that this app is dependent to) ",
             default: default_config[:application_dependencies]
           }
         ]
@@ -111,7 +123,7 @@ module CapistranoMulticonfigParallel
           [
             "--#{param[:name]}[=CAP_VALUE]",
             "--#{param[:name]}",
-            param[:description],
+            "[MULTI_CAP] #{param[:description]}",
             lambda do |_value|
             end
           ]
@@ -138,7 +150,7 @@ module CapistranoMulticonfigParallel
       end
 
       def check_boolean(c, prop)
-        return unless c[prop].present?
+        #   return unless c[prop].present?
         raise ArgumentError, "the property `#{prop}` must be boolean" unless [true, false, 'true', 'false'].include?(c[prop].to_s.downcase)
       end
 
@@ -158,13 +170,10 @@ module CapistranoMulticonfigParallel
       end
 
       def check_additional_config(c)
-        if c[:multi_debug].to_s.downcase == 'true'
-          CapistranoMulticonfigParallel::CelluloidManager.debug_enabled = true
-          Celluloid.task_class = Celluloid::TaskThread
-        end
+        CapistranoMulticonfigParallel::CelluloidManager.debug_enabled = true if c[:multi_debug].to_s.downcase == 'true'
         CapistranoMulticonfigParallel.show_task_progress = true if c[:multi_progress].to_s.downcase == 'true'
         CapistranoMulticonfigParallel.execute_in_sequence = true if c[:multi_secvential].to_s.downcase == 'true'
       end
     end
-  end
+end
 end

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -14,8 +14,6 @@ module CapistranoMulticonfigParallel
       @stages = stages
       @jobs = []
       CapistranoMulticonfigParallel.enable_logging
-      CapistranoMulticonfigParallel.configuration_valid?
-      CapistranoMulticonfigParallel.verify_app_dependencies(@stages) if CapistranoMulticonfigParallel.configuration.track_dependencies
     end
 
     def can_start?
@@ -31,11 +29,21 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel::CUSTOM_COMMANDS[key]
     end
 
+    def executes_deploy_stages?
+      @name == custom_commands[:stages]
+    end
+
     def multi_apps?
       @cap_app.multi_apps?
     end
 
+    def configuration
+      CapistranoMulticonfigParallel.configuration
+    end
+    
     def start(&block)
+       CapistranoMulticonfigParallel.configuration_valid?
+      check_before_starting
       @application = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[1]
       @stage = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[0]
       @name, @args = @cap_app.parse_task_string(@top_level_tasks.second)
@@ -45,6 +53,15 @@ module CapistranoMulticonfigParallel
       run
     end
 
+    def check_before_starting
+      @condition = Celluloid::Condition.new
+      @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
+      if CapistranoMulticonfigParallel::CelluloidManager.debug_enabled == true
+        Celluloid.logger = CapistranoMulticonfigParallel.logger
+        Celluloid.task_class = Celluloid::TaskThread
+      end
+    end
+    
     def collect_jobs(options = {}, &block)
       options = prepare_options(options)
       block.call(options) if block_given?
@@ -52,12 +69,12 @@ module CapistranoMulticonfigParallel
       raise [e, e.backtrace].inspect
     end
 
-    def process_jobs(&block)
+    def process_jobs
       return unless @jobs.present?
       if CapistranoMulticonfigParallel.execute_in_sequence
         @jobs.each { |job| CapistranoMulticonfigParallel::StandardDeploy.execute_standard_deploy(job) }
       else
-        run_async_jobs(&block)
+        run_async_jobs
       end
     end
 
@@ -91,10 +108,8 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def run_async_jobs(&block)
+    def run_async_jobs
       return unless @jobs.present?
-      @condition = Celluloid::Condition.new
-      @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
       @jobs.pmap do |job|
         @manager.async.delegate(job)
       end
@@ -102,7 +117,7 @@ module CapistranoMulticonfigParallel
         sleep(0.1) # keep current thread alive
       end
       return unless @manager.registration_complete
-      @manager.process_jobs(&block)
+      @manager.async.process_jobs
       wait_jobs_termination
     end
 
@@ -124,8 +139,8 @@ module CapistranoMulticonfigParallel
       env_opts = get_app_additional_env_options(app, message)
 
       options['env_options'] = options['env_options'].reverse_merge(env_opts.except('BOX'))
-      
-      env_options = branch_name.present? ?  { 'BRANCH' => branch_name }.merge(options['env_options']) : options['env_options']
+
+      env_options = branch_name.present? ? { 'BRANCH' => branch_name }.merge(options['env_options']) : options['env_options']
 
       job = {
         app: app,
@@ -164,8 +179,6 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    
-
     def get_app_additional_env_options(app, app_message)
       app_name = (app.is_a?(Hash) && app[:app].present?) ? app[:app].camelcase : app
       app_name = app_name.present? ? app_name : 'current application'

data/lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb

@@ -11,6 +11,19 @@ module CapistranoMulticonfigParallel
       @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(Actor.current)
     end
 
+    def check_before_starting
+      verify_app_dependencies(@stages) if configuration.present? && configuration.track_dependencies.to_s.downcase == 'true'
+      super
+    end
+
+    def verify_app_dependencies(stages)
+      applications = stages.map { |stage| stage.split(':').reverse[1] }
+      wrong = configuration.application_dependencies.find do |hash|
+        !applications.include?(hash[:app]) || (hash[:dependencies].present? && hash[:dependencies].find { |val| !applications.include?(val) })
+      end
+      raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
+    end
+    
     def run
       options = {}
       if custom_command?
@@ -54,7 +67,7 @@ module CapistranoMulticonfigParallel
       end
     end
 
-  private
+    private
 
     def multi_collect_and_run_jobs(options = {}, &block)
       collect_jobs(options) do |new_options|

data/lib/capistrano_multiconfig_parallel/initializers/default.yml

@@ -1,5 +1,5 @@
 multi_debug: true
-multi_progres: false
+multi_progress: false
 multi_secvential: false
 websocket_server:
   enable_debug: false
@@ -7,7 +7,8 @@ websocket_server:
 development_stages: 
   - development
   - webdev
-  
+
+syncronize_confirmation: true  
 task_confirmation_active: false  
 task_confirmations: 
   - deploy:symlink:release

data/lib/capistrano_multiconfig_parallel/initializers/rake.rb

@@ -12,7 +12,7 @@ Rake::Task.class_eval do
     end
   end
 
-  def run_the_actor(job_id, &block)
+  def run_the_actor(job_id)
     rake_actor_id = ENV['count_rake'].present? ? "rake_worker_#{job_id}_count" : "rake_worker_#{job_id}"
     if Celluloid::Actor[rake_actor_id].blank?
       CapistranoMulticonfigParallel::RakeWorker.supervise_as rake_actor_id
@@ -23,6 +23,6 @@ Rake::Task.class_eval do
     until Celluloid::Actor[rake_actor_id].task_approved
       sleep(0.1) # keep current thread alive
     end
-    block.call if Celluloid::Actor[rake_actor_id].task_approved
+    yield if Celluloid::Actor[rake_actor_id].task_approved
   end
 end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 2
-    TINY = 1
+    MINOR = 4
+    TINY = 0
     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.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - bogdanRada