capistrano_multiconfig_parallel 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2597af7ef8c177ea61d7e535b7ac546d3cdc70
-  data.tar.gz: cfd8fc986a102d2fb9fe9a18975cbdadb3eb9f05
+  metadata.gz: 26035c748d3494c6c5159791823939332b62f001
+  data.tar.gz: 53592e1501a707b02dbf946a7debb71827f8b9f8
 SHA512:
-  metadata.gz: d8c821103168c6b92df533a2eb30205125d8a86b11d220fd4f5b0770ad5a12d9255dec7fa41bf9d5d83ada1f678951cfa8342d2a85a915c96e25153e1ca50ee8
-  data.tar.gz: 5b9a84cc4facd9ac2226ef343b4f46fdf8db19492f14fa178cacb5dc53401ca2be552fee76d23948671e6cf27425df8501f2b476e652dd21519760f643d89a7b
+  metadata.gz: 8b680cf811f4dd24cf7374cb69c18ffb25a1335f307b7172c47e85d086c48198ced14301cb7c188050ec242fcdf3b2c85804dbf030da034f02d03dfe76fc5d0a
+  data.tar.gz: 1a746e0c0116857eed89bdfa92b913171858fe6c2fecdaf42cb6be25f74b2d5d1687d91ef02e22d5112992f7d7c4281a6edce03b2b70a2c47414bbe8668c1102

data/README.md

@@ -17,7 +17,7 @@ IMPORTANT! The whole reason for this gem was for using [Caphub](https://github.c
 
 CAUTION!! PLEASE READ CAREFULLY!! Capistrano is not thread-safe. However in order to work around this problem, each of the task is executing inside a thread that spawns a new process in order to run capistrano tasks The thread monitors the process. This works well, however if the tasks you are executing is working with files, you might get into deadlocks because multiple proceses try to access same resource. Instead of using files , please consider using StringIO instead.
 
-NEW Improvements in version 1.0.3
+NEW Improvements in version 1.0.5
 ---------------------------------
 
 -	added support for Capistrano version 2 (Capistrano 3 was already supported)

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -48,11 +48,7 @@ module CapistranoMulticonfigParallel
     end
 
     def custom_command?
-      if multi_apps?
-        !stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.first)
-      else
-        !stages.include?(@top_level_tasks.second) && stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.second)
-      end
+      custom_commands.include?(@top_level_tasks.first)
     end
 
     def multi_apps?

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated
+    attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated, :stderr_buffer
 
     attr_reader :worker_supervisor, :workers
     trap_exit :worker_died
@@ -33,6 +33,7 @@ module CapistranoMulticonfigParallel
       # Get a handle on the PoolManager
       # http://rubydoc.info/gems/celluloid/Celluloid/PoolManager
       # @workers = workers_pool.actor
+      @stderr_buffer = StringIO.new
       @conditions = []
       @jobs = {}
       @job_to_worker = {}
@@ -188,7 +189,7 @@ module CapistranoMulticonfigParallel
 
     def can_tag_staging?
       @job_manager.can_tag_staging? &&
-        @jobs.find { |_job_id, job| job['env'] == 'production' }.blank?
+        @jobs.find { |_job_id, job| job.stage == 'production' }.blank?
     end
 
     def dispatch_new_job(job, options = {})

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -95,13 +95,9 @@ module CapistranoMulticonfigParallel
     end
 
     def check_child_proces
-      if !defined?(@child_process) || @child_process.nil?
-        @child_process = CapistranoMulticonfigParallel::ChildProcess.new
-        Actor.current.link @child_process
-      else
-        @client.unsubscribe("rake_worker_#{@job_id}_count")
-        @child_process.exit_status = nil
-      end
+      @child_process = CapistranoMulticonfigParallel::ChildProcess.new
+      Actor.current.link @child_process
+      @child_process
     end
 
     def on_close(code, reason)

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -62,10 +62,19 @@ module CapistranoMulticonfigParallel
       return if @exit_status.blank?
       @timer.cancel
       @job.exit_status = @exit_status
+      print_error_if_exist
       log_to_file("worker #{@job_id} startsnotify finished with exit status #{@exit_status.inspect}")
       @actor.async.notify_finished(@exit_status)
     end
 
+    def print_error_if_exist
+      [@job.stderr_buffer].each do |buffer|
+        buffer.rewind
+        data = buffer.read
+        log_output_error(nil, 'stderr', "Child process for worker #{@job_id} died for reason: #{data}") if data.present?
+      end
+    end
+
     def start_async_deploy
       RightScale::RightPopen.popen3_async(
         @cmd,
@@ -93,6 +102,7 @@ module CapistranoMulticonfigParallel
     end
 
     def on_read_stderr(data)
+      @job.save_stderr_error(data)
       io_callback('stderr', data)
     end
 

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -5,7 +5,7 @@ module CapistranoMulticonfigParallel
   class Job
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :options
+    attr_reader :options, :application, :manager
     attr_writer :status, :exit_status
 
     delegate :job_stage,
@@ -15,12 +15,22 @@ module CapistranoMulticonfigParallel
              :setup_command_line,
              to: :command
 
+    delegate :stderr_buffer,
+             to: :manager
+
     def initialize(application, options)
       @options = options.stringify_keys
       @application = application
       @manager = @application.manager
     end
 
+    def save_stderr_error(data)
+      stderr_buffer.rewind
+      old_data = stderr_buffer.read.dup
+      new_data = old_data.to_s + data
+      stderr_buffer.write(new_data) if new_data.include?('aborted!')
+    end
+
     def env_variable
       CapistranoMulticonfigParallel::ENV_KEY_JOB_ID
     end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -33,7 +33,7 @@ module CapistranoMulticonfigParallel
     def setup_env_options(options = {})
       array_options = []
       env_options.each do |key, value|
-        array_options << "#{env_prefix} #{env_key_format(key)}=#{value}" if value.present? && !env_option_filtered?(key, options.fetch(:filtered_keys, []))
+        array_options << "#{env_prefix(key)} #{env_key_format(key)}=#{value}" if value.present? && !env_option_filtered?(key, options.fetch(:filtered_keys, []))
       end
       array_options << trace_flag if app_debug_enabled?
       array_options

data/lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb

@@ -7,10 +7,9 @@ module CapistranoMulticonfigParallel
   class RakeTaskHooks
     include CapistranoMulticonfigParallel::ApplicationHelper
     attr_accessor :task, :env, :config
-    def initialize(env, task, config = nil)
-      @env = env
+    def initialize(task)
+      @env = CapistranoMulticonfigParallel.original_args_hash
       @task = task.respond_to?(:fully_qualified_name) ? task.fully_qualified_name : task
-      @config = config
     end
 
     def automatic_hooks(&block)
@@ -23,12 +22,20 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def actor
-      Celluloid::Actor[rake_actor_id]
+    def print_question?(question)
+      if job_id.present?
+        actor.user_prompt_needed?(question)
+      else
+        yield if block.given?
+      end
     end
 
   private
 
+    def actor
+      Celluloid::Actor[rake_actor_id]
+    end
+
     def output_stream
       CapistranoMulticonfigParallel::OutputStream
     end
@@ -70,7 +77,7 @@ module CapistranoMulticonfigParallel
     end
 
     def job_id
-      capistrano_version_2? ? @config.fetch(CapistranoMulticonfigParallel::ENV_KEY_JOB_ID, nil) : @env[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]
+      @env.fetch(CapistranoMulticonfigParallel::ENV_KEY_JOB_ID, nil)
     end
 
     def rake_actor_id

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -10,14 +10,15 @@ module CapistranoMulticonfigParallel
         before_start
         arguments = multi_fetch_argv(original_args)
         configuration_valid?
-        execute_start(arguments)
+        execute_start(arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID])
       end
 
-      def execute_start(arguments)
-        if arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
+      def execute_start(job_id)
+        if job_id.blank?
           run_the_application
         else
           ARGV.reject! { |arg| arg_is_in_default_config?(arg) }
+          log_to_file("worker #{job_id} runs with ARGV #{ARGV.inspect}", job_id: job_id)
           run_capistrano
         end
       end

data/lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
       capistrano_version_2? ? keys.map(&:downcase) : keys
     end
 
-    def env_prefix
-      capistrano_version_2? ? '-S' : ''
+    def env_prefix(key)
+      key != CapistranoMulticonfigParallel::ENV_KEY_JOB_ID && capistrano_version_2? ? '-S' : ''
     end
 
     def env_key_format(key)

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -67,7 +67,7 @@ module CapistranoMulticonfigParallel
     end
 
     def log_output_error(error, output, message)
-      return if error_filtered?(error)
+      return if message.blank? || error_filtered?(error)
       puts message if output.present?
       terminal_actor.errors.push(message) if terminal_errors?
     end

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -30,7 +30,7 @@ module CapistranoMulticonfigParallel
     end
 
     def default_config_keys
-      default_internal_config.map { |array| array[0].to_s }
+      default_internal_config.map { |array| array[0].to_s }.concat([CapistranoMulticonfigParallel::ENV_KEY_JOB_ID])
     end
 
     def arg_is_in_default_config?(arg)

data/lib/capistrano_multiconfig_parallel/initializers/capistrano2.rb

@@ -4,9 +4,11 @@ if CapistranoMulticonfigParallel.capistrano_version_2?
   HighLine.class_eval do
     alias_method :original_ask, :ask
 
-    def ask(question, _answer_type = String, &_details)
-      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, nil, CapistranoMulticonfigParallel.original_args_hash)
-      rake.actor.user_prompt_needed?(question)
+    def ask(question, answer_type = String, &details)
+      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(nil)
+      rake.print_question?(question) do
+        original_ask(question, answer_type, &details)
+      end
     end
   end
 
@@ -14,7 +16,7 @@ if CapistranoMulticonfigParallel.capistrano_version_2?
     alias_method :original_execute_task, :execute_task
 
     def execute_task(task)
-      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, task, self)
+      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(task)
       rake.automatic_hooks do
         original_execute_task(task)
       end
@@ -25,7 +27,7 @@ if CapistranoMulticonfigParallel.capistrano_version_2?
     alias_method :original_trigger, :trigger
 
     def trigger(event, task = nil)
-      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, task, self)
+      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(task)
       rake.automatic_hooks do
         original_trigger(event, task)
       end

data/lib/capistrano_multiconfig_parallel/initializers/rake.rb

@@ -3,7 +3,7 @@ Rake::Task.class_eval do
   alias_method :original_execute, :execute
 
   def execute(*args)
-    rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, self)
+    rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(self)
     rake.automatic_hooks do
       original_execute(*args)
     end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 5
+    TINY = 6
     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: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap