capistrano_multiconfig_parallel 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6134462591dad203c8813ee2541c18ac6130a28
-  data.tar.gz: 1d05c54dac21aaab77ac4b1aaf23aa6bf022ae5d
+  metadata.gz: b20d2ee84ec2ed3ed429a379cfed127acc0aeb88
+  data.tar.gz: b18344f2beaadc2e8471ae5a8b974853e912e59b
 SHA512:
-  metadata.gz: f2219e649e4124fe1e50590114d12206ebb5de565bfa7ef20a48bc142ae0ab27402269d19efac9af8b77136688f3cbdb3b79524fc49e3f518d9e7781847d8bb6
-  data.tar.gz: 76887f9b98ddd6ad97185111d8f83946ff8d72a0ba656bd1fb8c0cfe09d9d710892a5fe260737008efc22df37a56b54374af8327ff5cd2a032ac79daedea9d6c
+  metadata.gz: 609aba7897211c50b8c2877c677b1a94d24f10c8a829317d4a63ba47162603f139b3a848b1a9cdb806c830871ef35fae423df7bc391317973ca7cf0911c93dee
+  data.tar.gz: c0c38bf78cf472833d5dc49f704627ce2c04dd9ac29788c1ff2eb65efa9d685dbb752db470ba82e38866d7376460a850bc0c805aa86247fc1bfbb2a62752c048

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -229,7 +229,7 @@ module CapistranoMulticonfigParallel
       return unless @execute_deploy
       if exit_status.exitstatus != 0
         debug("worker #{job_id} tries to terminate") if debug_enabled?
-        raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task #{@action} failed ")  # force worker to rollback
+        raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, "task  failed with exit status #{exit_status.inspect} ")  # force worker to rollback
       else
         update_machine_state('FINISHED')
         debug("worker #{job_id} notifies manager has finished") if debug_enabled?

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -4,13 +4,15 @@ 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, :job_id, :debug_enabled
 
     finalizer :process_finalizer
       
     def work(cmd, options = {})
       @options = options
       @actor = @options.fetch(:actor, nil)
+      @job_id = @actor.job_id
+      @debug_enabled = @actor.debug_enabled?
       set_worker_log
       EM.run do
         EM.next_tick do
@@ -21,8 +23,8 @@ module CapistranoMulticonfigParallel
         end
       end
       EM.error_handler do|e|
-        puts "Error during event loop for worker #{@actor.job_id}: #{e.inspect}" if @actor.debug_enabled?
-        puts e.backtrace if @actor.debug_enabled?
+        @worker_log.debug "Error during event loop for worker #{@job_id}: #{e.inspect}" if @debug_enabled
+        @worker_log.debug e.backtrace if @debug_enabled
         EM.stop
       end
     end
@@ -47,10 +49,10 @@ module CapistranoMulticonfigParallel
     def check_exit_status
       return unless @exit_status.present?
       if @options[:dry_run]
-        debug("worker #{@actor.job_id} starts execute deploy") if @actor.debug_enabled?
+        debug("worker #{@actor.job_id} starts execute deploy") if @debug_enabled
         @actor.async.execute_deploy
       elsif !@actor.worker_finshed?
-        debug("worker #{@actor.job_id} startsnotify finished") if @actor.debug_enabled?
+        debug("worker #{@actor.job_id} startsnotify finished") if @debug_enabled
         @actor.notify_finished(@exit_status)
       end
     end
@@ -61,6 +63,7 @@ module CapistranoMulticonfigParallel
         target: self,
         environment: options[:environment].present? ? options[:environment] : nil,
         pid_handler: :on_pid,
+        input: :on_input_stdin ,
         stdout_handler: :on_read_stdout,
         stderr_handler: :on_read_stderr,
         watch_handler: :watch_handler,
@@ -85,12 +88,12 @@ module CapistranoMulticonfigParallel
     end
 
     def on_exit(status)
-      debug "Child process for worker #{@actor.job_id} on_exit  disconnected due to error #{status.inspect}" if @actor.debug_enabled?
+        @worker_log.debug "Child process for worker #{@job_id} on_exit  disconnected due to error #{status.inspect}" if @debug_enabled
       @exit_status = status
     end
 
     def async_exception_handler(*data)
-      debug "Child process for worker #{@actor.job_id} async_exception_handler  disconnected due to error #{data.inspect}" if @actor.debug_enabled?
+      @worker_log.debug "Child process for worker #{@job_id} async_exception_handler  disconnected due to error #{data.inspect}" if @debug_enabled
       io_callback('stderr', data)
       @exit_status = 1
     end
@@ -98,7 +101,7 @@ module CapistranoMulticonfigParallel
     def watch_handler(process)
       @process ||= process
     end
-
+    
     def get_question_details(data)
       question = ''
       default = nil
@@ -123,7 +126,7 @@ module CapistranoMulticonfigParallel
 
     def io_callback(io, data)
       @worker_log.debug("#{io.upcase} ---- #{data}")
-      #      user_prompt_needed?(data)
+     # user_prompt_needed?(data)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/{helpers → extensions}/extension_helper.rb

@@ -1,3 +1,5 @@
+require 'celluloid/autostart'
+require_relative "../celluloid/rake_worker"
 module CapistranoMulticonfigParallel
   class ExtensionHelper
     class << self
@@ -8,6 +10,7 @@ module CapistranoMulticonfigParallel
       def job_id
         ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]
       end
+      
 
       def rake_actor_id
         ENV['count_rake'].present? ? "rake_worker_#{job_id}_count" : "rake_worker_#{job_id}"
@@ -34,7 +37,7 @@ module CapistranoMulticonfigParallel
         until Celluloid::Actor[rake_actor_id].task_approved
           Celluloid::Actor[rake_actor_id].wait_execution
         end
-        yield if Celluloid::Actor[rake_actor_id].task_approved
+        yield Celluloid::Actor[rake_actor_id]  if Celluloid::Actor[rake_actor_id].task_approved
       end
     end
   end

data/lib/capistrano_multiconfig_parallel/extensions/rake.rb

@@ -1,4 +1,4 @@
-require_relative '../helpers/extension_helper'
+require_relative './extension_helper'
 Rake::Task.class_eval do
   alias_method :original_execute, :execute
 

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 8
-    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.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -646,9 +646,9 @@ files:
 - lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration.rb
+- lib/capistrano_multiconfig_parallel/extensions/extension_helper.rb
 - lib/capistrano_multiconfig_parallel/extensions/rake.rb
 - lib/capistrano_multiconfig_parallel/helpers/base_manager.rb
-- lib/capistrano_multiconfig_parallel/helpers/extension_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb
 - lib/capistrano_multiconfig_parallel/helpers/single_app_manager.rb
 - lib/capistrano_multiconfig_parallel/helpers/standard_deploy.rb