capistrano_multiconfig_parallel 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b780bcf8adad1a2bf148a693c85c6f20d3447ca
-  data.tar.gz: 202318a839cbfdbaa4465cbe2c0f1889f8cbc531
+  metadata.gz: 8f0f8c07848c290c54be6147ed565365c4f5d9b6
+  data.tar.gz: 6e2a75cf93aee7cb7bbe1a6f484c53f3bf003db5
 SHA512:
-  metadata.gz: d5881082a7933b6acc37ee0b01c4c1b6fb3a595c85c6b90dcaf32c200ebd2f5bd1a37295220c7a0d566a576562738c791cda799d8a7417363d38fc3afe097c2a
-  data.tar.gz: b9327016b1d9bb84cdebc51f58f0f458b51bb42f7d0529c981b73b9fd1d65e4b7808b8cd3379b13620178d041a9c4d80b1cadf0d20117c6a3a7ee8fbbb5bf61d
+  metadata.gz: bf0d3c5f0d5453bece121ff9c6886e16e7f063a11772683188a396f528f88698f75cb874a08cf5f357ae1b22100dba2e5af994957eab1e46432d7c4bc48a139d
+  data.tar.gz: 06d957bbd180bc92b34ab03dfa0b31ec3af13f81fd4f8829d7ae750e4be9561e4bd2ad374fbe7179c374b7871b3aa2b25dee24ee70bce96155fd0dcc65ad9d37

data/README.md

@@ -183,7 +183,7 @@ bundle exec multi_cap  <development_stage> <task_name>   BOX=<box_name>,<box_nam
 
 ```
 
-If a branch is specified using "BRANCH=name" it will deploy same branch to all sandboxes
+If a branch is specified using **BRANCH=name** it will deploy same branch to all sandboxes
 The branch environment variable is then passed to the capistrano task
 
 Also the script will ask if there are any other environment variables that user might want to pass to each of the sandboxes separately.
@@ -195,10 +195,10 @@ Also the script will ask if there are any other environment variables that user
 
 bundle exec multi_cap deploy_multi_stages  STAGES=development, staging, production
 ```
-NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=<task_name>** either when you specify the STAGES, or can be done 
+NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=task_name** either when you specify the STAGES, or can be done 
 individually for each task when prompted about additional ENV options
 
-If a branch is specified using "BRANCH=name" it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
+If a branch is specified using **BRANCH=name**  it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
 
 Also the script will ask if there are any other environment variables that user might want to pass to each of the stages separately.
 
@@ -256,10 +256,10 @@ Will ask user if he wants to deploy the apps "foo" and "bar" , since they appear
 bundle exec multi_cap deploy_multi_stages  STAGES=development, staging, production
 ```
 
-NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=<task_name>** either when you specify the STAGES, or can be done 
+NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=task_name** either when you specify the STAGES, or can be done 
 individually for each task when prompted about additional ENV options
 
-If a branch is specified using **BRANCH=<name>** it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
+If a branch is specified using **BRANCH=branch_name** it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
 If you want different branches , capistrano will ask for additional ENV options for each stage, and can be specified then for each stage
 
 If you use **capistrano-gitflow**, the workers will first deploy to all the other stages 

data/capistrano_multiconfig_parallel.gemspec

@@ -41,12 +41,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls', '~> 0.7', '>= 0.7'
   s.add_development_dependency 'rvm-tester', '~> 1.1', '>= 1.1'
 
-  s.add_development_dependency 'rubocop', '0.29',  '>= 0.29'
-  s.add_development_dependency 'phare', '~> 0.6', '>= 0.6'
-  s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7'
-  s.add_development_dependency 'yard-rspec', '~> 0.1', '>= 0.1'
-  s.add_development_dependency 'redcarpet', '~> 3.2', '>= 3.2.2'
-  s.add_development_dependency 'github-markup', '~> 1.3', '>= 1.3.3'
-  s.add_development_dependency 'inch', '~> 0.5', '>= 0.5.10'
-  s.add_development_dependency 'guard-inch', '~> 0.1', '>= 0.1.0'
+  s.add_development_dependency 'rubocop', '~> 0',  '>= 0.29'
+  s.add_development_dependency 'phare', '~> 0', '>= 0.6'
+  s.add_development_dependency 'yard', '~> 0', '>= 0.8.7'
+  s.add_development_dependency 'yard-rspec', '~> 0', '>= 0.1'
+  s.add_development_dependency 'redcarpet', '~> 3', '>= 3.2.2'
+  s.add_development_dependency 'github-markup', '~> 1', '>= 1.3.3'
+  s.add_development_dependency 'inch', '~> 0', '>= 0.5.10'
+  s.add_development_dependency 'guard-inch', '~> 0', '>= 0.1.0'
 end

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -22,6 +22,7 @@ require 'logger'
 require 'pp'
 require 'devnull'
 require 'inquirer'
+require 'yaml'
 # fix error with not files that can not be found
 Gem.find_files('composable_state_machine/**/*.rb').each { |path| require path }
 

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -5,10 +5,10 @@ module CapistranoMulticonfigParallel
   ENV_KEY_JOB_ID = 'multi_cap_job_id'
   MULTI_KEY = 'multi'
   SINGLE_KEY = 'single'
-  GITFLOW_TAG_STAGING_TASK = "gitflow:tag_staging"
+  GITFLOW_TAG_STAGING_TASK = 'gitflow:tag_staging'
   GITFLOW_CALCULATE_TAG_TASK = 'gitflow:calculate_tag'
   GITFLOW_VERIFY_UPTODATE_TASK = 'gitflow:verify_up_to_date'
-  
+
   CUSTOM_COMMANDS = {
     CapistranoMulticonfigParallel::MULTI_KEY => {
       stages: 'deploy_multi_stages'
@@ -26,11 +26,9 @@ module CapistranoMulticonfigParallel
     end
 
     def ask_confirm(message, default)
-      begin
       Ask.input message, default: default
       rescue
         return nil
-      end
     end
 
     def log_directory
@@ -48,7 +46,7 @@ module CapistranoMulticonfigParallel
     def enable_logging
       CapistranoMulticonfigParallel.configuration_valid?
       FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
-      if  CapistranoMulticonfigParallel::CelluloidManager.debug_enabled.to_s.downcase == 'true'
+      if CapistranoMulticonfigParallel::CelluloidManager.debug_enabled.to_s.downcase == 'true'
         FileUtils.touch(main_log_file) unless File.file?(main_log_file)
         if ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
           log_file = File.open(main_log_file, 'w')
@@ -56,7 +54,7 @@ module CapistranoMulticonfigParallel
         end
         self.logger = ::Logger.new(main_log_file)
       else
-        self.logger =  ::Logger.new(DevNull.new)
+        self.logger = ::Logger.new(DevNull.new)
       end
       Celluloid.logger = CapistranoMulticonfigParallel.logger
       Celluloid.task_class = Celluloid::TaskThread

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -79,18 +79,21 @@ module CapistranoMulticonfigParallel
         debug("job id not found. delegating again the job #{job.inspect}") if self.class.debug_enabled?
         delegate(job)
       else
-        worker.job_id = job['id'] if worker.job_id.blank?
-        @job_to_worker[job['id']] = worker
-        @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
+        start_worker(job, worker)
       end
     end
 
+    def start_worker(job, worker)
+      worker.job_id = job['id'] if worker.job_id.blank?
+      @job_to_worker[job['id']] = worker
+      @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?
+      return unless @job_manager.jobs.size != @job_to_worker.size
+      @registration_complete = true
+    end
+
     def process_jobs
       if syncronized_confirmation?
         @job_to_worker.pmap do |_job_id, worker|
@@ -105,18 +108,18 @@ module CapistranoMulticonfigParallel
       debug("all jobs have completed #{condition}") if self.class.debug_enabled?
       @job_manager.condition.signal('completed') if condition
     end
-    
+
     def apply_confirmations?
-       CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
+      CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
     end
-    
+
     def syncronized_confirmation?
-        (CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true' &&  !@job_manager.executes_deploy_stages? ) || 
-      (@job_manager.executes_deploy_stages? &&  @job_manager.confirmation_applies_to_all_workers?)
+      (CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true' && !@job_manager.executes_deploy_stages?) ||
+        (@job_manager.executes_deploy_stages? && @job_manager.confirmation_applies_to_all_workers?)
     end
 
     def apply_confirmation_for_worker(worker)
-      worker.alive? &&  CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(worker.env_name)
+      worker.alive? && CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(worker.env_name)
     end
 
     def setup_worker_conditions(worker)
@@ -129,7 +132,7 @@ module CapistranoMulticonfigParallel
     end
 
     def mark_completed_remaining_tasks(worker)
-      return if !apply_confirmation_for_worker(worker)  || !apply_confirmations?
+      return if !apply_confirmation_for_worker(worker) || !apply_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
         task_confirmation = @job_to_condition[worker.job_id][task]
@@ -141,20 +144,20 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations_worker(worker)
-      return if !apply_confirmations? ||  !apply_confirmation_for_worker(worker) || syncronized_confirmation?
+      return if !apply_confirmations? || !apply_confirmation_for_worker(worker) || 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
+    end
 
     def wait_condition_for_task(job_id, task)
       @job_to_condition[job_id][task][:condition].wait
     end
 
     def wait_task_confirmations
-       stage_apply = CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(@job_manager.stage)
-      return  if  !apply_confirmations? || !stage_apply || !syncronized_confirmation?
+      stage_apply = CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(@job_manager.stage)
+      return if !apply_confirmations? || !stage_apply || !syncronized_confirmation?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         results = []
         @jobs.pmap do |job_id, _job|
@@ -167,17 +170,20 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def print_confirm_task_approvall(result, task, worker = nil)
+      return if 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
+    end
+
     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
-      end
+      print_confirm_task_approvall(result, task, worker = nil)
       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)
@@ -185,7 +191,7 @@ module CapistranoMulticonfigParallel
                                   'action' => 'invoke',
                                   'job_id' => job['id'],
                                   'task' => task
-        )
+                                 )
       end
     end
 
@@ -203,17 +209,17 @@ module CapistranoMulticonfigParallel
     end
 
     def can_tag_staging?
-     @job_manager.can_tag_staging?  &&
-       @jobs.detect{|job_id, job| job['env'] == 'production'}.blank? 
+      @job_manager.can_tag_staging? &&
+        @jobs.find { |_job_id, job| job['env'] == 'production' }.blank?
     end
-    
+
     def dispatch_new_job(job)
       original_env = job['env_options']
       env_opts = @job_manager.get_app_additional_env_options(job['app_name'], job['stage'])
-      job['env_options'] =  original_env.merge(env_opts)
+      job['env_options'] = original_env.merge(env_opts)
       async.delegate(job)
     end
-    
+
     def process_job(job)
       env_options = {}
       job['env_options'].each do |key, value|
@@ -222,13 +228,13 @@ module CapistranoMulticonfigParallel
       {
         'job_id' => job['id'],
         'app_name' => job['app'],
-        'env_name' =>  job['env'],
-        'action_name' =>  job['action'],
+        'env_name' => job['env'],
+        'action_name' => job['action'],
         'env_options' => env_options,
-        'task_arguments' => job['task_arguments'],
+        'task_arguments' => job['task_arguments']
       }
     end
-    
+
     # lookup status of job by asking actor running it
     def get_job_status(job)
       status = nil
@@ -244,7 +250,7 @@ module CapistranoMulticonfigParallel
       end
       status
     end
-    
+
     def job_failed?(job)
       job['worker_action'].present? && job['worker_action'] == 'worker_died'
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -23,9 +23,9 @@ module CapistranoMulticonfigParallel
     class TaskFailed < StandardError; end
 
     attr_accessor :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :client, :task_argv, :execute_deploy, :executed_dry_run,
-      :rake_tasks, :current_task_number, # tracking tasks
-    :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
-    :job_termination_condition, :worker_state
+                  :rake_tasks, :current_task_number, # tracking tasks
+                  :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
+                  :job_termination_condition, :worker_state
 
     def work(job, manager)
       @job = job
@@ -38,7 +38,7 @@ module CapistranoMulticonfigParallel
       @machine = CapistranoMulticonfigParallel::StateMachine.new(job, Actor.current)
       manager.register_worker_for_job(job, Actor.current)
     end
-    
+
     def debug_enabled?
       @manager.class.debug_enabled?
     end
@@ -88,18 +88,17 @@ module CapistranoMulticonfigParallel
     def rake_tasks
       @rake_tasks ||= []
     end
-      
-    
+
     def cd_working_directory
-      "cd #{CapistranoMulticonfigParallel.detect_root.to_s}"
+      "cd #{CapistranoMulticonfigParallel.detect_root}"
     end
-    
+
     def generate_command
       <<-CMD
            #{cd_working_directory} && 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
@@ -124,11 +123,14 @@ module CapistranoMulticonfigParallel
       debug("worker #{@job_id} websocket connection closed: #{code.inspect}, #{reason.inspect}") if debug_enabled?
     end
 
+    def check_gitflow
+      return if !@env_name == 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK)
+      @manager.dispatch_new_job(@job.merge('env' => 'production'))
+    end
+
     def handle_subscription(message)
       if message_is_about_a_task?(message)
-        if @env_name == 'staging' && @manager.can_tag_staging?  && has_executed_task?(CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK)
-         @manager.dispatch_new_job(@job.merge('env' =>  'production'))
-       end
+        check_gitflow
         save_tasks_to_be_executed(message)
         update_machine_state(message['task']) # if message['action'] == 'invoke'
         debug("worker #{@job_id} state is #{@machine.state}") if debug_enabled?
@@ -141,8 +143,8 @@ module CapistranoMulticonfigParallel
     def message_is_about_a_task?(message)
       message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present?
     end
-    
-    def has_executed_task?(task)
+
+    def executed_task?(task)
       @rake_tasks.present? && @rake_tasks[task].present?
     end
 
@@ -203,9 +205,9 @@ module CapistranoMulticonfigParallel
       @env_options = processed_job['env_options']
       @task_arguments = processed_job['task_arguments']
     end
-   
+
     def crashed?
-      @action_name == 'deploy:rollback' || @action_name == 'deploy:failed'  || @manager.job_failed?(@job)
+      @action_name == 'deploy:rollback' || @action_name == 'deploy:failed' || @manager.job_failed?(@job)
     end
 
     def finish_worker

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -28,7 +28,7 @@ module CapistranoMulticonfigParallel
     def set_worker_log
       FileUtils.mkdir_p(CapistranoMulticonfigParallel.log_directory) unless File.directory?(CapistranoMulticonfigParallel.log_directory)
       @filename = File.join(CapistranoMulticonfigParallel.log_directory, "worker_#{@actor.job_id}.log")
-      FileUtils.rm_rf(@filename) if File.file?(@filename) && !@actor.crashed? &&  (@options[:dry_run] || @actor.executed_dry_run != true)
+      FileUtils.rm_rf(@filename) if File.file?(@filename) && !@actor.crashed? && (@options[:dry_run] || @actor.executed_dry_run != true)
       @worker_log = ::Logger.new(@filename)
       @worker_log.level = ::Logger::Severity::DEBUG
       @worker_log.formatter = proc do |severity, datetime, progname, msg|

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -50,42 +50,52 @@ module CapistranoMulticonfigParallel
       puts "\n"
       sleep(1)
     end
-    
-    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)
+
+    def worker_state(worker)
       if worker.alive?
         state = worker.machine.state.to_s
-        state = worker.crashed? ? state.red : state.green
+        worker.crashed? ? state.red : state.green
       else
-        state = "dead".upcase.red
+        'dead'.upcase.red
       end
+    end
+
+    def worker_env_options(processed_job)
       worker_optons = ''
       processed_job['env_options'].each do |key, value|
         worker_optons << "#{key}=#{value}\n"
       end
-      action = processed_job['task_arguments'].present? ? "#{processed_job['action_name']}[#{processed_job['task_arguments'].join(',')}]" :  processed_job['action_name']
-      
+      worker_optons
+    end
+
+    def worker_action(processed_job)
+      processed_job['task_arguments'].present? ? "#{processed_job['action_name']}[#{processed_job['task_arguments'].join(',')}]" : processed_job['action_name']
+    end
+
+    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)
+
       {
         'job_id' => job_id,
-        'app_name' =>processed_job['app_name'],
-        'env_name' =>processed_job['env_name'],
-        'action_name' => action,
-        'env_options' => worker_optons,
+        'app_name' => processed_job['app_name'],
+        'env_name' => processed_job['env_name'],
+        'action_name' => worker_action(processed_job),
+        'env_options' => worker_env_options(processed_job),
         'task_arguments' => job['task_arguments'],
-        'state' =>  state
+        'state' => worker_state(worker)
       }
     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']}" }
-      ]
+             { 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) }
@@ -98,7 +108,6 @@ module CapistranoMulticonfigParallel
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end
 
-
     def worker_progress(worker)
       tasks = worker.rake_tasks
       current_task = worker.machine.state

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -27,7 +27,7 @@ module CapistranoMulticonfigParallel
 
       def default_config
         @default_config ||= Configliere::Param.new
-        @default_config.read File.join(CapistranoMulticonfigParallel.root.to_s, 'capistrano_multiconfig_parallel', 'initializers', 'default.yml')
+        @default_config.read File.join(internal_config_directory, 'default.yml')
         @default_config.resolve!
       end
 
@@ -35,7 +35,11 @@ module CapistranoMulticonfigParallel
         File.join(CapistranoMulticonfigParallel.detect_root.to_s, 'config', 'multi_cap.yml')
       end
 
-      def command_line_params
+        def internal_config_directory
+           File.join(CapistranoMulticonfigParallel.root.to_s, 'capistrano_multiconfig_parallel', 'initializers')
+        end
+      
+        def command_line_params
         [
           {
             name: 'multi_debug',
@@ -122,7 +126,7 @@ module CapistranoMulticonfigParallel
             default: default_config[:application_dependencies]
           }
         ]
-      end
+        end
 
       def capistrano_options
         command_line_params.map do |param|
@@ -181,5 +185,5 @@ module CapistranoMulticonfigParallel
         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

@@ -5,7 +5,7 @@ module CapistranoMulticonfigParallel
   class BaseManager
     include Celluloid
     include Celluloid::Logger
-  
+
     attr_accessor :condition, :manager, :deps, :application, :stage, :name, :args, :argv, :jobs, :job_registered_condition, :default_stage, :original_argv
 
     def initialize(cap_app, top_level_tasks, stages)
@@ -40,11 +40,15 @@ module CapistranoMulticonfigParallel
     def configuration
       CapistranoMulticonfigParallel.configuration
     end
-    
+
     def start(&block)
-      CapistranoMulticonfigParallel.configuration_valid?
-      @default_stage = CapistranoMulticonfigParallel.configuration.development_stages.present? ? CapistranoMulticonfigParallel.configuration.development_stages.first : 'development'
       check_before_starting
+      initialize_data
+      block.call if block_given?
+      run
+    end
+
+    def initialize_data
       @application = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[1]
       @stage = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[0]
       @stage = @stage.present? ? @stage : @default_stage
@@ -52,21 +56,21 @@ module CapistranoMulticonfigParallel
       @argv = @cap_app.handle_options.delete_if { |arg| arg == @stage || arg == @name || arg == @top_level_tasks.first }
       @argv = multi_fetch_argv(@argv)
       @original_argv = @argv.clone
-      block.call if block_given?
-      run
     end
-    
+
     def verify_options_custom_command(options)
       options[:action] = @argv['ACTION'].present? ? @argv['ACTION'] : 'deploy'
       @argv = @argv['ACTION'].present? ? @argv.except('ACTION') : @argv
       options
     end
-    
+
     def check_before_starting
+      CapistranoMulticonfigParallel.configuration_valid?
+      @default_stage = CapistranoMulticonfigParallel.configuration.development_stages.present? ? CapistranoMulticonfigParallel.configuration.development_stages.first : 'development'
       @condition = Celluloid::Condition.new
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
     end
-    
+
     def collect_jobs(options = {}, &block)
       options = prepare_options(options)
       block.call(options) if block_given?
@@ -82,48 +86,50 @@ module CapistranoMulticonfigParallel
         run_async_jobs
       end
     end
-    
+
     def tag_staging_exists? # check exists task from capistrano-gitflow
-      begin
-        rake1 = Rake::Task[CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK]
-        rake2 = Rake::Task[GITFLOW_CALCULATE_TAG_TASK]
-        rake3 = Rake::Task[GITFLOW_VERIFY_UPTODATE_TASK]
-        rake1.present? && rake2.present? && rake3.present? && rake2.prerequisites.present? && rake2.actions.present? && rake3.prerequisites.present?
-      rescue
-        return false
-      end
+      rake1 = Rake::Task[CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK]
+      rake2 = Rake::Task[GITFLOW_CALCULATE_TAG_TASK]
+      rake3 = Rake::Task[GITFLOW_VERIFY_UPTODATE_TASK]
+      check_giflow_tasks(rake1, rake2, rake3)
+    rescue
+      return false
+    end
+
+    def check_giflow_tasks(rake1, rake2, rake3)
+      rake1.present? && rake2.present? && rake3.present? && rake2.prerequisites.present? && rake2.actions.present? && rake3.prerequisites.present?
     end
 
     def fetch_multi_stages
       stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
       @argv = @argv['STAGES'].present? ? @argv.except('STAGES') : @argv
       stages = parse_inputted_value(value: stages).split(',').compact if stages.present?
-      stages.present? ? stages :  [@default_stage]
+      stages.present? ? stages : [@default_stage]
     end
 
     def wants_deploy_production?
-     (!custom_command? &&  @stage == 'production') || (custom_command? && fetch_multi_stages.include?("production"))
+      (!custom_command? && @stage == 'production') || (custom_command? && fetch_multi_stages.include?('production'))
     end
-    
-     def can_tag_staging?
-        using_git? &&  wants_deploy_production? && tag_staging_exists? 
+
+    def can_tag_staging?
+      using_git? && wants_deploy_production? && tag_staging_exists?
+    end
+
+    def check_multi_stages(stages)
+      can_tag_staging? ? stages.reject { |u| u == 'production' } : stages
     end
-    
-     def check_multi_stages(stages)
-         can_tag_staging? ?  stages.reject{|u| u == 'production'} : stages
-     end
-    
+
     def deploy_app(options = {})
       options = options.stringify_keys
       app = options['app'].is_a?(Hash) ? options['app'] : { 'app' => options['app'] }
       branch = @branch_backup.present? ? @branch_backup : @argv['BRANCH'].to_s
-        call_task_deploy_app({
-            branch: branch,
-            app: app,
-            action: options['action']
-          }.reverse_merge(options))
+      call_task_deploy_app({
+        branch: branch,
+        app: app,
+        action: options['action']
+      }.reverse_merge(options))
     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'
@@ -133,11 +139,11 @@ module CapistranoMulticonfigParallel
     end
 
     def confirmation_applies_to_all_workers?
-      environments = @jobs.map{|job| job['env']}
+      environments = @jobs.map { |job| job['env'] }
       CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.all? { |e| environments.include?(e) }
     end
-    
-    private
+
+  private
 
     def call_task_deploy_app(options = {})
       options = options.stringify_keys
@@ -183,9 +189,8 @@ module CapistranoMulticonfigParallel
       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']
-      job_env_options =  custom_command? && env_options['ACTION'].present? ? env_options.except('ACTION') : env_options
-      
-      
+      job_env_options = custom_command? && env_options['ACTION'].present? ? env_options.except('ACTION') : env_options
+
       job = {
         app: app,
         env: options['stage'],
@@ -196,8 +201,6 @@ module CapistranoMulticonfigParallel
       job = job.stringify_keys
       @jobs << job
     end
-    
-   
 
     def prepare_options(options)
       options = options.stringify_keys
@@ -222,13 +225,11 @@ module CapistranoMulticonfigParallel
         return ''
       end
     end
-     
+
     def using_git?
-    fetch(:scm, :git).to_sym == :git
+      fetch(:scm, :git).to_sym == :git
     end
 
-  
-
     def fetch_app_additional_env_options
       options = {}
       return options if fetch(:app_additional_env_options).blank?

data/lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb

@@ -23,7 +23,7 @@ module CapistranoMulticonfigParallel
       end
       raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
     end
-    
+
     def run
       options = {}
       if custom_command?
@@ -39,7 +39,7 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel.interactive_menu = true
       options = verify_options_custom_command(options)
       action_name = @name
-      if  action_name == custom_commands[:stages]
+      if action_name == custom_commands[:stages]
         multi_stage_deploy(options)
       else
         raise "Custom command #{@name} not available for multi apps"
@@ -66,7 +66,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/helper.rb

@@ -19,5 +19,4 @@ module CapistranoMulticonfigParallel
       stream_io.reopen(origin_stream)
     end
   end
-
 end

data/lib/capistrano_multiconfig_parallel/multi_app_helpers/interactive_menu.rb

@@ -49,7 +49,7 @@ module CapistranoMulticonfigParallel
         num = number_option.to_i
         if /^[0-9]+/.match(num.to_s) && ((num.to_i > 0 && num.to_i <= applications.size))
           num -= 1
-          msg += "#{applications[num]} was #{choices[num].present? ? 'un' : '' }checked\n"
+          msg += "#{applications[num]} was #{choices[num].present? ? 'un' : ''}checked\n"
           choices[num] = choices[num].blank? ? '+' : ' '
         else
           msg = "Invalid option: #{num}\n"

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 6
-    TINY = 3
+    MINOR = 7
+    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.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - bogdanRada
@@ -454,9 +454,9 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.29'
@@ -464,9 +464,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.29'
@@ -476,7 +476,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -486,7 +486,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -496,7 +496,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
@@ -506,7 +506,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
@@ -516,7 +516,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
@@ -526,7 +526,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
@@ -536,7 +536,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
@@ -546,7 +546,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
@@ -556,7 +556,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
@@ -566,7 +566,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
@@ -576,7 +576,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.10
@@ -586,7 +586,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.10
@@ -596,7 +596,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
@@ -606,7 +606,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0