capistrano_multiconfig_parallel 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b20d2ee84ec2ed3ed429a379cfed127acc0aeb88
-  data.tar.gz: b18344f2beaadc2e8471ae5a8b974853e912e59b
+  metadata.gz: 3dface583820b0494ab0c4243c2daae6dc203a9b
+  data.tar.gz: fba2ef6001a82b06fcc43c7ba4094b2151577bef
 SHA512:
-  metadata.gz: 609aba7897211c50b8c2877c677b1a94d24f10c8a829317d4a63ba47162603f139b3a848b1a9cdb806c830871ef35fae423df7bc391317973ca7cf0911c93dee
-  data.tar.gz: c0c38bf78cf472833d5dc49f704627ce2c04dd9ac29788c1ff2eb65efa9d685dbb752db470ba82e38866d7376460a850bc0c805aa86247fc1bfbb2a62752c048
+  metadata.gz: 569dc97b2f9baff197a34c65514df8714e92c4ef6e908e7c2a545d9538f1453df9fb8d3c9459aac7bc67c70bbb500f2414dc81e89fd7650bba5cd281f461916d
+  data.tar.gz: b312a7d1503ed68d5d2a66cc0ec7a1f33f1aefdfcc85469e89c05754b3591939f5e612d40d7ec59c3defbd1ba4ab7cd50126225d71bfc3d2dbfa408351996149

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -183,7 +183,7 @@ module CapistranoMulticonfigParallel
       message = "Do you want  to continue the deployment and execute #{task.upcase}"
       message += " for JOB #{worker.job_id}" if worker.present?
       message += '?'
-      set :apps_symlink_confirmation, CapistranoMulticonfigParallel.ask_confirm(message, 'Y/N')
+      set :apps_symlink_confirmation, Celluloid::Actor[:terminal_server].show_confirmation(message, 'Y/N')
       until fetch(:apps_symlink_confirmation).present?
         sleep(0.1) # keep current thread alive
       end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -54,10 +54,7 @@ module CapistranoMulticonfigParallel
     def publish_rake_event(data)
       @client.publish(rake_actor_id(data), data)
     end
-
-    def publish_io_event(data)
-      @client.publish("rake_io_#{@job_id}", 'approved' => 'yes', 'action' => 'stdin', 'job_id' => @job_id, 'result' => data)
-    end
+    
 
     def rake_actor_id(data)
       data['action'].present? && data['action'] == 'count' ? "rake_worker_#{@job_id}_count" : "rake_worker_#{@job_id}"
@@ -139,11 +136,18 @@ module CapistranoMulticonfigParallel
         update_machine_state(message['task']) # if message['action'] == 'invoke'
         debug("worker #{@job_id} state is #{@machine.state}") if debug_enabled?
         task_approval(message)
+      elsif message_is_for_stdout?(message)
+       result =   Celluloid::Actor[:terminal_server].show_confirmation(message['question'],message['default'])
+       publish_rake_event(message.merge('action' => "stdin",'result' => result, "client_action" => "stdin"))
       else
         debug("worker #{@job_id} could not handle  #{message}") if debug_enabled?
       end
     end
 
+      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

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -101,32 +101,9 @@ module CapistranoMulticonfigParallel
     def watch_handler(process)
       @process ||= process
     end
-    
-    def get_question_details(data)
-      question = ''
-      default = nil
-      if data =~ /(.*)\?+\s*\:*\s*(\([^)]*\))*/m
-        question = Regexp.last_match(1)
-        default = Regexp.last_match(2)
-      end
-      question.present? ? [question, default] : nil
-    end
-
-    def printing_question?(data)
-      get_question_details(data).present?
-    end
-
-    def user_prompt_needed?(data)
-      return unless printing_question?(data)
-      details = get_question_details(data)
-      default = details.second.present? ? details.second : nil
-      result = CapistranoMulticonfigParallel.ask_confirm(details.first, default)
-      @actor.publish_io_event(result)
-    end
 
     def io_callback(io, data)
       @worker_log.debug("#{io.upcase} ---- #{data}")
-     # user_prompt_needed?(data)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -4,41 +4,49 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
 
-    attr_accessor :env, :client, :job_id, :action, :task, :task_approved, :successfull_subscription, :subscription_channel, :publisher_channel, :stdin_result
+    attr_accessor :env, :client, :job_id, :action, :task, 
+    :task_approved, :successfull_subscription,
+     :subscription_channel, :publisher_channel, :stdin_result,
+     :questions_prompted, :nitialize_options
+
+
+
+     def initialize(options={})
+      @initialize_options = options.stringify_keys
+      @questions_prompted ||=[]
+      @stdin_result = nil
+      @job_id = @initialize_options['job_id']
+      @subscription_channel = @initialize_options['actor_id']
+      @publisher_channel = "worker_#{@job_id}"
+      @task_approved = false
+      @successfull_subscription = false
+      initialize_subscription
+     end
+
 
     def work(env, options = {})
       @options = options.stringify_keys
       @env = env
-      default_settings
-      custom_attributes
-      initialize_subscription
-    end
-
-    def custom_attributes
-      @publisher_channel = "worker_#{@job_id}"
-      @action = @options['actor_id'].include?('_count') ? 'count' : 'invoke'
+      @action = @subscription_channel.include?('_count') ? 'count' : 'invoke'
       @task = @options['task']
+      wait_execution until @successfull_subscription == true && defined?(@client)
+      publish_to_worker(task_data)
     end
 
+ 
+
     def wait_execution(name = task_name, time = 0.1)
-  #    info "Before waiting #{name}"
+      #    info "Before waiting #{name}"
       Actor.current.wait_for(name, time)
-    #  info "After waiting #{name}"
+      #  info "After waiting #{name}"
     end
 
     def wait_for(name, time)
-     # info "waiting for #{time} seconds on #{name}"
+      # info "waiting for #{time} seconds on #{name}"
       sleep time
-     # info "done waiting on #{name} "
+      # info "done waiting on #{name} "
     end
 
-    def default_settings
-      @stdin_result = nil
-      @job_id = @options['job_id']
-      @subscription_channel = @options['actor_id']
-      @task_approved = false
-      @successfull_subscription = false
-    end
 
     def initialize_subscription
       @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: debug_enabled?) do |ws|
@@ -47,7 +55,7 @@ module CapistranoMulticonfigParallel
     end
 
     def debug_enabled?
-      CapistranoMulticonfigParallel::CelluloidManager.debug_websocket?
+       CapistranoMulticonfigParallel::CelluloidManager.debug_websocket?
     end
 
     def task_name
@@ -62,25 +70,20 @@ module CapistranoMulticonfigParallel
       }
     end
 
-    def publish_new_work(env, new_options = {})
-      work(env, @options.merge(new_options))
-      after_publishing_new_work
-    end
-
-    def after_publishing_new_work
-      publish_to_worker(task_data)
-    end
 
     def publish_to_worker(data)
       @client.publish(@publisher_channel, data)
     end
 
     def on_message(message)
-      debug("Rake worker #{@job_id} received after parse #{message}") if debug_enabled?
+      debug("Rake worker #{@job_id} received after parse #{message}") #if debug_enabled?
       if @client.succesfull_subscription?(message)
-        publish_subscription_successfull
-      elsif message.present? && message['client_action'].blank?
+       debug("Rake worker #{@job_id} received  parse #{message}") if debug_enabled?
+       @successfull_subscription = true
+      elsif message.present? && message['task'].present? 
         task_approval(message)
+      elsif message.present? && message['action'].present? && message['action'] == 'stdin'
+        stdin_approval(message)
       else
         warn "unknown action: #{message.inspect}" if debug_enabled?
       end
@@ -91,14 +94,21 @@ module CapistranoMulticonfigParallel
     end
 
     def publish_subscription_successfull
-      debug("Rake worker #{@job_id} received  parse #{message}") if debug_enabled?
-      publish_to_worker(task_data)
-      @successfull_subscription = true
+    
+    end
+    
+    def wait_for_stdin_input
+      until @stdin_result.present?
+        wait_execution
+      end
+      output = @stdin_result.clone
+      Actor.current.stdin_result = nil
+      output
     end
     
     def stdin_approval(message)
-      if @job_id.to_i == message['job_id'].to_i && message['approved'] == 'yes'
-        @stdin_result = message
+      if @job_id.to_i == message['job_id'].to_i && message['result'].present? && message['action'] == 'stdin'
+        @stdin_result = message['result']
       else
         warn "unknown invocation #{message.inspect}" if debug_enabled?
       end
@@ -116,5 +126,41 @@ module CapistranoMulticonfigParallel
       debug("websocket connection closed: #{code.inspect}, #{reason.inspect}") if debug_enabled?
       terminate
     end
+    
+    def get_question_details(data)
+      question = ''
+      default = nil
+      if data =~ /(.*)\?+\s*\:*\s*(\([^)]*\))*/m
+        question = Regexp.last_match(1)
+        default = Regexp.last_match(2)
+      end
+      question.present? ? [question, default] : nil
+    end
+
+    def printing_question?(data)
+      get_question_details(data).present?
+    end
+
+    def has_asked_question?(question)
+      @questions_prompted.include?(question)
+    end
+
+    def user_prompt_needed?(data)
+      return if !printing_question?(data) || has_asked_question?(data)
+      
+        details = get_question_details(data)
+        default = details.second.present? ? details.second : nil
+        publish_to_worker({
+            action: "stdout",
+            question: details.first,
+            default: default.delete('()'),
+            job_id: @job_id
+          })
+        @questions_prompted << data
+       
+     
+    end
+    
+    
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -38,10 +38,17 @@ module CapistranoMulticonfigParallel
       terminate
     end
 
+
+    def show_confirmation(message, default)
+      exclusive do
+        CapistranoMulticonfigParallel.ask_confirm(message, default)
+      end
+    end
+    
     def message_valid?(message)
       message[:type].present? && message[:type] == 'output' || message[:type] == 'event'
     end
-
+    
     def show_terminal_screen(table)
       return unless table.rows.present?
       terminal_clear

data/lib/capistrano_multiconfig_parallel/extensions/extension_helper.rb

@@ -16,29 +16,28 @@ module CapistranoMulticonfigParallel
         ENV['count_rake'].present? ? "rake_worker_#{job_id}_count" : "rake_worker_#{job_id}"
       end
 
-      def stdin_result
-        Celluloid::Actor[rake_actor_id].stdin_result
-      end
+      def actor
+       CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id,
+        actor_id: rake_actor_id,
+        job_id: job_id) if Celluloid::Actor[rake_actor_id].blank?
+       Celluloid::Actor[rake_actor_id]
+     end
+
+     def run_the_actor(task, &block)
+      actor.work(ENV, task: task)
+      actor.wait_execution until actor.task_approved
+      return unless actor.task_approved
+      CapistranoMulticonfigParallel::InputStream.hook(actor)
+      CapistranoMulticonfigParallel::OutputStream.hook(actor)
+      block.call
+      CapistranoMulticonfigParallel::InputStream.unhook
+      CapistranoMulticonfigParallel::OutputStream.unhook
+    end
+
+    
+
 
-      def run_stdin_actor
-        Celluloid::Actor[rake_actor_id].wait_execution('stdin') until stdin_result
-        output = stdin_result.dup
-        Celluloid::Actor[rake_actor_id].stdin_result = nil
-        output
-      end
 
-      def run_the_actor(task)
-        if Celluloid::Actor[rake_actor_id].blank?
-          CapistranoMulticonfigParallel::RakeWorker.supervise_as rake_actor_id
-          Celluloid::Actor[rake_actor_id].work(ENV, actor_id: rake_actor_id, job_id: job_id, task: task)
-        else
-          Celluloid::Actor[rake_actor_id].publish_new_work(ENV, task: task)
-        end
-        until Celluloid::Actor[rake_actor_id].task_approved
-          Celluloid::Actor[rake_actor_id].wait_execution
-        end
-        yield Celluloid::Actor[rake_actor_id]  if Celluloid::Actor[rake_actor_id].task_approved
-      end
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/extensions/input_stream.rb

@@ -0,0 +1,32 @@
+module CapistranoMulticonfigParallel
+  class InputStream
+    def self.hook(actor)
+      $stdin = new($stdin, actor)
+    end
+
+    def self.unhook
+      $stdin.finish if $stdin.is_a? CapistranoMulticonfigParallel::InputStream
+      $stdin = STDIN
+    end
+
+    attr_accessor :real, :actor
+
+    def initialize(real_stdin, actor)
+      self.real = real_stdin
+      self.actor = actor
+    end
+
+    def gets(*args)
+      @actor.wait_for_stdin_input
+    end
+
+    def finish
+     
+    end
+
+    def method_missing(name, *args, &block)
+      @real.send name, *args, &block
+    end
+  end
+end
+

data/lib/capistrano_multiconfig_parallel/extensions/output_stream.rb

@@ -0,0 +1,38 @@
+module CapistranoMulticonfigParallel
+  class OutputStream
+    def self.hook(actor)
+      $stdout = new($stdout, actor)
+    end
+
+    def self.unhook
+      $stdout.finish if $stdout.is_a? CapistranoMulticonfigParallel::OutputStream
+      $stdout = STDOUT
+    end
+
+    attr_accessor :real, :actor, :strings
+
+    def initialize(real_stdout, actor)
+      self.real= real_stdout
+      self.actor = actor
+      self.strings = []
+    end
+
+    def write(*args)
+      @real.write(*args) 
+      @real.flush
+      @actor.user_prompt_needed?(args.join(' ')) 
+    end
+
+
+
+
+   def finish
+
+   end
+
+   def method_missing(name, *args, &block)
+    @real.send name, *args, &block
+  end
+end
+end
+

data/lib/capistrano_multiconfig_parallel/extensions/rake.rb

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

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 8
-    TINY = 3
+    MINOR = 9
+    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.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -647,6 +647,8 @@ files:
 - 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/input_stream.rb
+- lib/capistrano_multiconfig_parallel/extensions/output_stream.rb
 - lib/capistrano_multiconfig_parallel/extensions/rake.rb
 - lib/capistrano_multiconfig_parallel/helpers/base_manager.rb
 - lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb