capistrano_multiconfig_parallel 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b653b45d5d3f58d974343ae030e98ff377e5ef
-  data.tar.gz: f750a49d6e43cbdb14b814ab720f99702b3b2e92
+  metadata.gz: 6e3ee4bdf3fef14756626f8c3aa37346af35061f
+  data.tar.gz: a7977209db28f942efd3cd5782b0f4b418bc3d3e
 SHA512:
-  metadata.gz: 7911b3e0870cd261a9d68d67580d7c5810db76835457fb0e6efc95e8056675388e0d3c4a0f9b33e73feb9d223a11db18bf3323bcefba9a97104f13392c0e7558
-  data.tar.gz: d906087062964a83e84f326a7a2f224243905185d6ce668a2e00f6ce70ec48613131bc9e57aafbf3eabbfd2f1569a36a6a94388209b6f8afd2f3d4b91deac0ed
+  metadata.gz: 29010db137366388494ad4cf1a877d16451bb72ce6d2ca3b7077029f36801c944254549c4ab7f9b6d64e873a9cc11339c9c30972e888b7bd99c887fb212db151
+  data.tar.gz: 3401ec88ed79515d49d5c8fa20b17790b5ac79fb5aceb8b732877332ce698da0007000eec67f3a3b4fe1d727d76dccf5df899ed0df9921094b2f1e12a4bbdc81

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -223,7 +223,7 @@ module CapistranoMulticonfigParallel
 
     def dispatch_new_job(job)
       original_env = job['env_options']
-      env_opts = @job_manager.get_app_additional_env_options(job['app_name'], job['stage'])
+      env_opts = @job_manager.get_app_additional_env_options(job['app_name'], job['env'])
       job['env_options'] = original_env.merge(env_opts)
       async.delegate(job)
     end
@@ -274,13 +274,12 @@ module CapistranoMulticonfigParallel
     end
 
     def worker_died(worker, reason)
-      debug("worker with mailbox #{worker.mailbox.inspect} died  for reason:  #{reason}") if self.class.debug_enabled?
       job = @worker_to_job[worker.mailbox.address]
-      debug job.inspect  if self.class.debug_enabled?
+      debug("worker job #{job} with mailbox #{worker.mailbox.inspect} died  for reason:  #{reason}") if self.class.debug_enabled?
       @worker_to_job.delete(worker.mailbox.address)
-      debug "restarting #{job} on new worker" if self.class.debug_enabled?
       return if job.blank? || job_failed?(job)
       return unless job['action_name'] == 'deploy'
+      debug "restarting #{job} on new worker" if self.class.debug_enabled?
       job = job.merge(:action => 'deploy:rollback', 'worker_action' => 'worker_died')
       delegate(job)
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -124,7 +124,7 @@ module CapistranoMulticonfigParallel
     end
 
     def check_gitflow
-      return if !@env_name == 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK)
+      return if dry_running? ||  @env_name != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
       @manager.dispatch_new_job(@job.merge('env' => 'production'))
     end
 
@@ -154,7 +154,7 @@ module CapistranoMulticonfigParallel
     end
 
     def executed_task?(task)
-      @rake_tasks.present? && @rake_tasks[task].present?
+      rake_tasks.present? && rake_tasks.index(task.to_s).present?
     end
 
     def task_approval(message)
@@ -168,7 +168,6 @@ module CapistranoMulticonfigParallel
     end
 
     def save_tasks_to_be_executed(message)
-      return unless message['action'] == 'count'
       debug("worler #{@job_id} current invocation chain : #{rake_tasks.inspect}") if debug_enabled?
       rake_tasks << message['task'] if rake_tasks.last != message['task']
     end
@@ -249,7 +248,6 @@ module CapistranoMulticonfigParallel
     end
 
     def notify_finished(exit_status)
-      return unless @execute_deploy
       if exit_status.exitstatus != 0
         debug("worker #{job_id} tries to terminate") if debug_enabled?
         raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task  failed with exit status #{exit_status.inspect} ")  # force worker to rollback

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -48,7 +48,7 @@ module CapistranoMulticonfigParallel
     
     def check_exit_status
       return unless @exit_status.present?
-      if @options[:dry_run]
+      if @exit_status.exitstatus == 0 &&  @options[:dry_run]
         debug("worker #{@actor.job_id} starts execute deploy") if @debug_enabled
         @actor.async.execute_deploy
       elsif !@actor.worker_finshed?

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -142,9 +142,9 @@ module CapistranoMulticonfigParallel
     def printing_question?(data)
       get_question_details(data).present?
     end
-
+ 
     def user_prompt_needed?(data)
-      return unless printing_question?(data)
+      return if !printing_question?(data) || @action != "invoke"
       
         details = get_question_details(data)
         default = details.second.present? ? details.second : nil

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -140,7 +140,7 @@ module CapistranoMulticonfigParallel
       total_tasks =  worker_dry_running?(worker) ? nil : tasks.size
       task_index =  worker_dry_running?(worker) ? 0 : tasks.index(current_task.to_s).to_i + 1
       percent = percent_of(task_index, total_tasks)
-      result  =   worker_dry_running?(worker) ? "Please wait.. building the progress bars"  : "Progress [#{sprintf('%.2f', percent)}%]  (#{task_index} of #{total_tasks})"
+      result  =   worker_dry_running?(worker) ? "Please wait.. building the progress bars"  : "Progress [#{sprintf('%.2f', percent)}%]  (executed #{task_index} of #{total_tasks})"
       if worker.alive?
         worker.crashed? ? result.red : result.green
       else

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 11
-    TINY = 2
+    TINY = 3
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap