capistrano_multiconfig_parallel 0.30.6 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df399cd1c424694a1dd7c4176d54b021ce8c2b0
-  data.tar.gz: c5b901a8017de673c10b3289ab609cdbc960f5c6
+  metadata.gz: d75fa1db22835b3a4dffbca4b1a77ea7d57b64a5
+  data.tar.gz: 711d8a286c0254a78d6cb99b2adc937df6aa1ac5
 SHA512:
-  metadata.gz: f974b28eef0800c861e8e81894aa1992320dffb3e5d15b9e0cee2b210930d71e219fcc1903bb11a40729934da6d8bd671b21ddafbb4e9c3bf58e594475c83438
-  data.tar.gz: c1a8f2b5d7b6291699965f87033e12d65c298880beae41fb665e6d81321697670f08e2be9211c0180c566f1fef03bce4b2946b097cd6111e3617e1018b3c89ee
+  metadata.gz: fda9e4e843d9d791dd00085ba53e1dbf5389cf3bbd635e5ca3a7ff4929b5f706f68cc67cbc38927578bab519b134bb94c512814938979216d56c62589287f9e0
+  data.tar.gz: dc2908a3203bf541c69eaa786f752a261b485067dc11aad375a8fe688ca6aa40404e1d43134831af12f0fbc2890dc7f642eb58202bb14a914c86779f6d7b1657

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -8,15 +8,13 @@ module CapistranoMulticonfigParallel
     include Capistrano::DSL
     include Capistrano::Multiconfig::DSL
 
-    attr_reader :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage, :job_count
-    attr_writer :job_count
+    attr_reader :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
 
     def initialize
       Celluloid.boot
       CapistranoMulticonfigParallel.enable_logging
       @stage_apps = multi_apps? ? stages.map { |stage| stage.split(':').reverse[1] }.uniq : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
-      @job_count = 0
       @jobs = []
     end
 
@@ -197,7 +195,7 @@ module CapistranoMulticonfigParallel
     def run_async_jobs
       return unless @jobs.present?
       @jobs.pmap do |job|
-        @manager.async.delegate(job)
+        @manager.async.delegate_job(job)
       end
       unless can_tag_staging?
         until @manager.registration_complete
@@ -230,11 +228,10 @@ module CapistranoMulticonfigParallel
 
       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_count += 1
       job = CapistranoMulticonfigParallel::Job.new(Actor.current, options.merge(
                                                                     action: custom_command? && env_options['ACTION'].present? ? env_options['ACTION'] : options['action'],
-                                                                    env_options: job_env_options,
-                                                                    count: @job_count
+                                                                    env_options: job_env_options
+
       ))
       @jobs << job
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -40,7 +40,7 @@ module CapistranoMulticonfigParallel
 
     # call to send an actor
     # a job
-    def delegate(job)
+    def delegate_job(job)
       @jobs[job.id] = job
       # debug(@jobs)
       # start work and send it to the background
@@ -54,7 +54,7 @@ module CapistranoMulticonfigParallel
       @worker_to_job[worker.mailbox.address] = job
       log_to_file("worker #{worker.job_id} registed into manager")
       Actor.current.link worker
-      worker.async.start_task if !syncronized_confirmation? || job.failed? || job.rolling_back?
+      worker.async.start_task if !syncronized_confirmation? || job.rolling_back?
       return unless syncronized_confirmation?
       @registration_complete = true if @job_manager.jobs.size == @jobs.size
     end
@@ -193,10 +193,9 @@ module CapistranoMulticonfigParallel
       return unless job.is_a?(CapistranoMulticonfigParallel::Job)
       options.stringify_keys! if options.present?
       env_opts = options['skip_env_options'].present? ? {} : @job_manager.get_app_additional_env_options(job.app, job.stage)
-      @job_manager.job_count += 1
-      new_job_options = job.options.merge('env_options' => job.env_options.merge(env_opts), 'count' => @job_manager.job_count)
+      new_job_options = job.options.except!('id', 'status', 'exit_status').merge('env_options' => job.env_options.merge(env_opts))
       new_job = CapistranoMulticonfigParallel::Job.new(@job_manager, new_job_options.merge(options))
-      async.delegate(new_job) unless job.worker_died?
+      async.delegate_job(new_job) unless job.rolling_back?
     end
 
     # lookup status of job by asking actor running it
@@ -216,11 +215,11 @@ module CapistranoMulticonfigParallel
 
     def worker_died(worker, reason)
       job = @worker_to_job[worker.mailbox.address]
-      return true if job.blank? || job.worker_died? || job.action != 'deploy'
+      return true if job.blank? || job.rolling_back? || job.action != 'deploy'
       mailbox = worker.mailbox
       @worker_to_job.delete(mailbox.address)
       log_to_file("RESTARTING: worker job #{job.inspect} with mailbox #{mailbox.inspect} and #{mailbox.address.inspect} died  for reason:  #{reason}")
-      dispatch_new_job(job, skip_env_options: true, action: 'deploy:rollback', status: 'worker_died')
+      dispatch_new_job(job, skip_env_options: true, action: 'deploy:rollback')
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -89,8 +89,9 @@ module CapistranoMulticonfigParallel
     def execute_deploy
       log_to_file("invocation chain #{@job_id} is : #{@rake_tasks.inspect}")
       check_child_proces
-      log_to_file("worker #{@job_id} executes: #{@job.build_capistrano_task}")
-      @child_process.async.work(@job, @job.build_capistrano_task, actor: Actor.current, silent: true)
+      command = job.command.to_s
+      log_to_file("worker #{@job_id} executes: #{command}")
+      @child_process.async.work(@job, command, actor: Actor.current, silent: true)
     end
 
     def check_child_proces

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -28,7 +28,7 @@ module CapistranoMulticonfigParallel
     end
 
     def default_heaadings
-      ['Job ID', 'Job UUID', 'App/Stage', 'Action', 'ENV Variables', 'Current Task']
+      ['Job UUID', 'App/Stage', 'Action', 'ENV Variables', 'Current Status']
     end
 
     def run

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -35,7 +35,6 @@ module CapistranoMulticonfigParallel
 
     def terminal_row
       [
-        { value: count.to_s },
         { value: id.to_s },
         { value: wrap_string(job_stage) },
         { value: wrap_string(capistrano_action) },
@@ -51,10 +50,13 @@ module CapistranoMulticonfigParallel
       (longest_hash[:value].size.to_f / 80.0).ceil
     end
 
+    def worker
+      return unless @manager.alive?
+      @manager.get_worker_for_job(id)
+    end
+
     def worker_state
       default = status.to_s.upcase.red
-      return default unless @manager.alive?
-      worker = @manager.get_worker_for_job(id)
       worker.alive? ? worker.worker_state : default
     end
 
@@ -69,8 +71,7 @@ module CapistranoMulticonfigParallel
       { name: 'task_arguments', default: [] },
       { name: 'env_options', default: {} },
       { name: 'status', default: :unstarted },
-      { name: 'exit_status', default: nil },
-      { name: 'count', default: nil }
+      { name: 'exit_status', default: nil }
     ].each do |hash|
       define_method hash[:name] do
         value = @options.fetch(hash[:name], hash[:default])
@@ -93,7 +94,7 @@ module CapistranoMulticonfigParallel
     end
 
     def crashed?
-      failed? || dead? || worker_died? || exit_status.present?
+      worker_died? || failed? || dead? || exit_status.present?
     end
 
     def dead?
@@ -101,7 +102,15 @@ module CapistranoMulticonfigParallel
     end
 
     def worker_died?
-      status.present? && status.to_s.downcase == 'worker_died'
+      !worker.alive?
+    end
+
+    def to_json
+      hash = {}
+      %w(id app stage action task_arguments env_options status exit_status).each do |key|
+        hash[key] = send(key)
+      end
+      hash
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -21,9 +21,9 @@ module CapistranoMulticonfigParallel
       app.present? ? "#{app}:#{stage}" : "#{stage}"
     end
 
-    def capistrano_action(rake_action = action)
+    def capistrano_action
       argv = task_arguments.present? ? "[#{task_arguments}]" : ''
-      "#{rake_action}#{argv}"
+      "#{action}#{argv}"
     end
 
     def env_option_filtered?(key, filtered_keys_array = [])
@@ -44,10 +44,13 @@ module CapistranoMulticonfigParallel
       setup_env_options(options).concat(new_arguments)
     end
 
-    def build_capistrano_task(rake_action = nil, *args)
-      rake_action = rake_action.present? ? rake_action : action
-      environment_options = setup_command_line(*args).join(' ')
-      "cd #{detect_root} && RAILS_ENV=#{@stage}  bundle exec multi_cap #{job_stage} #{capistrano_action(rake_action)}  #{environment_options}"
+    def to_s
+      environment_options = setup_command_line.join(' ')
+      "cd #{detect_root} && RAILS_ENV=#{@stage}  bundle exec multi_cap #{job_stage} #{capistrano_action}  #{environment_options}"
+    end
+
+    def to_json
+      { command: to_s }
     end
 
     def execute_standard_deploy(action = nil)

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -92,7 +92,7 @@ module CapistranoMulticonfigParallel
     end
 
     def strip_characters_from_string(value)
-      return unless value.present?
+      return '' if value.blank?
       value = value.delete("\r\n").delete("\n")
       value = value.gsub(/\s+/, ' ').strip
       value

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 30
-    TINY = 6
+    MINOR = 31
+    TINY = 0
     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.30.6
+  version: 0.31.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap