capistrano_multiconfig_parallel 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abfc7fd19ddbbefdf72d722f3e62c4a57d24bf94
-  data.tar.gz: 9e55346244fcb75801865311e8eb985bb9efa450
+  metadata.gz: 788c14a8757342d82a178672d1fbd0a853159538
+  data.tar.gz: d401ebfc5b7712a78f1cb7cc66e0ffe3cdede58c
 SHA512:
-  metadata.gz: f083274f6b7516ec5429c235c6351379dd8b04ea59a64cb2d7e8507d08d1d653ccef65af130380384aeed2893720312e262e78d00cd3cddaa89aa4bc42b3c6ff
-  data.tar.gz: 2d34999b43aa60438365fa257e49696ef3df378a82ad09c48533d748dee37959f2d1b0aaa882b1e2b4aab23893cec0c4598bfb36f46d00dce59e61e45b80a65b
+  metadata.gz: 0ccc2e45aa9916f7ca7c2d487fab2f915bf9203165e988378fb9d30d07a0cb0d3f8fcfbbdc306d6ceca2398f6edc907ebc2271ce14e1d2a1482810bb05075c89
+  data.tar.gz: 39b87f2d84a6b2d2d38c02a78dcc8eec68f35bc24b90ff0630c92ef8969be7b768977c815960433c75d916c32b80986dbba82367676e7727be6bdff03a29e75d

data/capistrano_multiconfig_parallel.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
   s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.0'
-  s.add_runtime_dependency 'celluloid_pubsub', '~> 0.0', '>= 0.0.20'
+  s.add_runtime_dependency 'celluloid_pubsub', '~> 0.0', '>= 0.0.21'
   s.add_runtime_dependency 'composable_state_machine', '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency 'terminal-table', '~> 1.4', '>= 1.4.5'
   s.add_runtime_dependency 'colorize', '~> 0.7', '>= 0.7'
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport',  '~> 4.0','>= 4.0'
   s.add_runtime_dependency 'configliere', '~> 0.4', '>=0.4'
   s.add_runtime_dependency 'inquirer', '~> 0.2', '>= 0.2'
-   s.add_runtime_dependency 'devnull','~> 0.1', '>= 0.1'
+  s.add_runtime_dependency 'devnull','~> 0.1', '>= 0.1'
 
   s.add_development_dependency 'rspec-rails', '~> 2.0', '>= 2.0'
   s.add_development_dependency 'guard', '~> 2.6', '>= 2.6.1'

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -26,7 +26,7 @@ module CapistranoMulticonfigParallel
                   :rake_tasks, :current_task_number, # tracking tasks
                   :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
                   :job_termination_condition, :worker_state, :executing_dry_run, :job_argv, :dry_run_tasks
-    
+
     def work(job, manager)
       @job = job
       @worker_state = 'started'
@@ -47,15 +47,13 @@ module CapistranoMulticonfigParallel
     def start_task
       @manager.setup_worker_conditions(Actor.current)
       debug("exec worker #{@job_id} starts task with #{@job.inspect}") if debug_enabled?
-      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: @manager.class.debug_websocket?) do |ws|
-        ws.subscribe(@subscription_channel)
-      end
+      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: @manager.class.debug_websocket?, :channel => subscription_channel)
     end
 
     def publish_rake_event(data)
       @client.publish(rake_actor_id(data), data)
     end
-    
+
 
     def rake_actor_id(data)
       data['action'].present? && data['action'] == 'count' ? "rake_worker_#{@job_id}_count" : "rake_worker_#{@job_id}"
@@ -78,7 +76,7 @@ module CapistranoMulticonfigParallel
     def rake_tasks
       @rake_tasks ||= []
     end
-    
+
     def dry_run_tasks
          @dry_run_tasks ||= []
     end
@@ -95,7 +93,7 @@ module CapistranoMulticonfigParallel
 
     def execute_deploy
       @execute_deploy = true
-      debug("invocation chain #{@job_id} is : #{@rake_tasks.inspect}") if debug_enabled? 
+      debug("invocation chain #{@job_id} is : #{@rake_tasks.inspect}") if debug_enabled?
       check_child_proces
       setup_task_arguments
       debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
@@ -142,7 +140,7 @@ module CapistranoMulticonfigParallel
       def message_is_for_stdout?(message)
       message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['action'] == 'stdout'
     end
-      
+
     def message_is_about_a_task?(message)
       message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present?
     end
@@ -163,8 +161,8 @@ module CapistranoMulticonfigParallel
 
     def save_tasks_to_be_executed(message)
       debug("worler #{@job_id} current invocation chain : #{rake_tasks.inspect}") if debug_enabled?
-      rake_tasks << message['task'] if rake_tasks.last != message['task'] 
-      dry_run_tasks << message['task'] if dry_running? &&  dry_run_tasks.last != message['task'] 
+      rake_tasks << message['task'] if rake_tasks.last != message['task']
+      dry_run_tasks << message['task'] if dry_running? &&  dry_run_tasks.last != message['task']
     end
 
     def update_machine_state(name)
@@ -181,19 +179,19 @@ module CapistranoMulticonfigParallel
       end
       @task_argv
     end
-    
+
     def dry_run_command
       '--dry-run'
     end
-    
+
     def dry_running?
       @task_argv.include?(dry_run_command) == true
     end
-    
+
     def worker_stage
       @app_name.present? ? "#{@app_name}:#{@env_name}" : "#{@env_name}"
     end
-    
+
     def worker_action
        "#{@action_name}[#{@task_arguments.join(',')}]"
     end
@@ -237,7 +235,7 @@ module CapistranoMulticonfigParallel
       @manager.jobs[@job_id]['worker_action'] = 'finished'
       @manager.workers_terminated.signal('completed')  if @manager.all_workers_finished?
     end
-    
+
     def worker_finshed?
        @manager.jobs[@job_id]['worker_action'] == 'finished'
     end

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -4,7 +4,7 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
 
-    attr_accessor :env, :client, :job_id, :action, :task, 
+    attr_accessor :env, :client, :job_id, :action, :task,
     :task_approved, :successfull_subscription,
      :subscription_channel, :publisher_channel, :stdin_result
 
@@ -50,9 +50,8 @@ module CapistranoMulticonfigParallel
     end
 
     def initialize_subscription
-      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: debug_enabled?) do |ws|
-        ws.subscribe(@subscription_channel)
-      end if !defined?(@client) || @client.nil?
+      return if defined?(@client) && @client.present?
+      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: debug_enabled?, :channel => @subscription_channel )
     end
 
     def debug_enabled?
@@ -82,7 +81,7 @@ module CapistranoMulticonfigParallel
        debug("Rake worker #{@job_id} received  parse #{message}") if debug_enabled?
        @successfull_subscription = true
          publish_to_worker(task_data)
-      elsif message.present? && message['task'].present? 
+      elsif message.present? && message['task'].present?
         task_approval(message)
       elsif message.present? && message['action'].present? && message['action'] == 'stdin'
         stdin_approval(message)
@@ -96,9 +95,9 @@ module CapistranoMulticonfigParallel
     end
 
     def publish_subscription_successfull
-    
+
     end
-    
+
     def wait_for_stdin_input
       until @stdin_result.present?
         wait_execution
@@ -107,7 +106,7 @@ module CapistranoMulticonfigParallel
       Actor.current.stdin_result = nil
       output
     end
-    
+
     def stdin_approval(message)
       if @job_id.to_i == message['job_id'].to_i && message['result'].present? && message['action'] == 'stdin'
         @stdin_result = message['result']
@@ -128,7 +127,7 @@ module CapistranoMulticonfigParallel
       debug("websocket connection closed: #{code.inspect}, #{reason.inspect}") if debug_enabled?
       terminate
     end
-    
+
     def get_question_details(data)
       question = ''
       default = nil
@@ -142,10 +141,10 @@ module CapistranoMulticonfigParallel
     def printing_question?(data)
       get_question_details(data).present?
     end
- 
+
     def user_prompt_needed?(data)
       return if !printing_question?(data) || @action != "invoke"
-      
+
         details = get_question_details(data)
         default = details.second.present? ? details.second : nil
         publish_to_worker({
@@ -155,9 +154,9 @@ module CapistranoMulticonfigParallel
             job_id: @job_id
           })
        wait_for_stdin_input
-     
+
     end
-    
-    
+
+
   end
 end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 12
-    TINY = 1
+    TINY = 2
     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.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -39,7 +39,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.21
 - !ruby/object:Gem::Dependency
   name: composable_state_machine
   requirement: !ruby/object:Gem::Requirement