capistrano_multiconfig_parallel 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69b1623c9bafea21ddff2b588f08bee7b214408a
-  data.tar.gz: 2e9cb754af33f0f6808b9821b97b2e96d65998ad
+  metadata.gz: 3ccbcbb8b3f6f253696e7c0f5c4da3a6c86406e9
+  data.tar.gz: 42654d0b3a82c272c861d9db8ec1a06ed8cddedd
 SHA512:
-  metadata.gz: d492ad626da0730b60f0dd1214ed43e64872d3237fcdf9195290608834e009de3c36989fbfe7d128af13ddb13de6d0ac4a5d13bd20bd50e9bb661b13c67c8975
-  data.tar.gz: cea9979e1f32025ebf7a9bd2692085a5060670a1ca5bbd530d45d4add7d618ef8a959f0c65b1fd73386039f9aebeee6e2f0e7e421bf4afd84b52f324e15cbb39
+  metadata.gz: c16fa1a27b1f804f35b16384a99a98137a70d1624d3d862c426b0f2ee812e9e8c9da9f7dcd0b49cddc7cd614b859df3f13d9c2e5cd2908e6c1627e99c2e7bd3e
+  data.tar.gz: 7174e0d08f121447676b29423e990331ac5cd72e169de126d5511552331499c34d60d0e06c97f99769e4cee26c86b97ce7847768d796a07b9799e71a9642710d

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -25,10 +25,20 @@ module CapistranoMulticonfigParallel
       File.expand_path(File.dirname(__dir__))
     end
 
+    def check_terminal_tty
+      $stdin.sync = true if $stdin.isatty
+      $stdout.sync = true if $stdout.isatty
+    end
+
     def ask_confirm(message, default)
-      Ask.input message, default: default
-      rescue
-        return nil
+      `stty -raw echo`
+      check_terminal_tty
+      result = Ask.input message, default: default
+      $stdout.flush
+      `stty -raw echo`
+      return result
+    rescue
+      return nil
     end
 
     def log_directory

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -111,12 +111,13 @@ module CapistranoMulticonfigParallel
     def apply_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
     end
+
     def syncronization_required?
       CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true'
     end
-  
+
     def syncronized_confirmation?
-      ( syncronization_required? && !@job_manager.executes_deploy_stages?) ||
+      (syncronization_required? && !@job_manager.executes_deploy_stages?) ||
         (syncronization_required? && @job_manager.executes_deploy_stages? && !@job_manager.can_tag_staging? && @job_manager.confirmation_applies_to_all_workers?)
     end
 
@@ -223,9 +224,9 @@ module CapistranoMulticonfigParallel
     end
 
     def filtered_env_keys
-      ["STAGES", "ACTION"]
+      %w(STAGES ACTION)
     end
-    
+
     def process_job(job)
       env_options = {}
       job['env_options'].each do |key, value|

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -55,6 +55,10 @@ module CapistranoMulticonfigParallel
       @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}"
     end
@@ -189,6 +193,7 @@ module CapistranoMulticonfigParallel
         array_options << "#{key}=#{value}" if value.present?
       end
       array_options << '--trace' if debug_enabled?
+      array_options << '--multi_debug=true' if debug_enabled?
       setup_command_line(*array_options)
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -94,8 +94,31 @@ module CapistranoMulticonfigParallel
       @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,45 +4,70 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
 
-    attr_accessor :env, :client, :job_id, :action, :task, :task_approved, :successfull_subscription, :subscription_channel, :publisher_channel
+    attr_accessor :env, :client, :job_id, :action, :task, :task_approved, :successfull_subscription, :subscription_channel, :publisher_channel, :stdin_result
 
-    def work(env, task, options = {})
+    def work(env, options = {})
       @options = options.stringify_keys
       @env = env
-      @job_id = find_job_id
-      @subscription_channel = @options['rake_actor_id']
-      @publisher_channel = "worker_#{find_job_id}"
-      @action = @options['rake_actor_id'].include?('_count') ? 'count' : 'invoke'
-      @task = task
+      default_settings
+      custom_attributes
+      initialize_subscription
+    end
+
+    def custom_attributes
+      @publisher_channel = "worker_#{@job_id}"
+      @action = @options['actor_id'].include?('_count') ? 'count' : 'invoke'
+      @task = @options['task']
+    end
+
+    def wait_execution(name = task_name, time = 0.1)
+      info "Before waiting #{name}"
+      Actor.current.wait_for(name, time)
+      info "After waiting #{name}"
+    end
+
+    def wait_for(name, time)
+      info "waiting for #{time} seconds on #{name}"
+      sleep time
+      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
-      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: CapistranoMulticonfigParallel::CelluloidManager.debug_websocket?) do |ws|
+    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?
     end
 
     def debug_enabled?
-      @client.debug_enabled?
+      CapistranoMulticonfigParallel::CelluloidManager.debug_websocket?
     end
 
     def task_name
       @task.name
     end
 
-    def find_job_id
-      @env[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]
-    end
-
     def task_data
       {
         action: @action,
         task: task_name,
-        job_id: find_job_id
+        job_id: @job_id
       }
     end
 
-    def publish_new_work(env, task)
-      work(env, task, rake_actor_id: @options['rake_actor_id'])
+    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
 
@@ -51,7 +76,7 @@ module CapistranoMulticonfigParallel
     end
 
     def on_message(message)
-      debug("Rake worker #{find_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?
@@ -61,12 +86,24 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def msg_for_stdin?(message)
+      message['action'] == 'stdin'
+    end
+
     def publish_subscription_successfull
-      debug("Rake worker #{find_job_id} received  parse #{message}") if debug_enabled?
+      debug("Rake worker #{@job_id} received  parse #{message}") if debug_enabled?
       publish_to_worker(task_data)
       @successfull_subscription = true
     end
 
+    def stdin_approval(message)
+      if @job_id.to_i == message['job_id'].to_i && message['approved'] == 'yes'
+        @stdin_result = message
+      else
+        warn "unknown invocation #{message.inspect}" if debug_enabled?
+      end
+    end
+
     def task_approval(message)
       if @job_id.to_i == message['job_id'].to_i && message['task'] == task_name && message['approved'] == 'yes'
         @task_approved = true

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -72,6 +72,10 @@ module CapistranoMulticonfigParallel
       processed_job['task_arguments'].present? ? "#{processed_job['action_name']}[#{processed_job['task_arguments'].join(',')}]" : processed_job['action_name']
     end
 
+    def worker_stage(processed_job)
+      processed_job['app_name'].present? ? "#{processed_job['app_name']}\n#{processed_job['env_name']}" : "#{processed_job['env_name']}"
+    end
+
     def get_worker_details(job_id)
       job = @manager.jobs[job_id]
       processed_job = @manager.process_job(job)
@@ -81,6 +85,7 @@ module CapistranoMulticonfigParallel
         'job_id' => job_id,
         'app_name' => processed_job['app_name'],
         'env_name' => processed_job['env_name'],
+        'full_stage' => worker_stage(processed_job),
         'action_name' => worker_action(processed_job),
         'env_options' => worker_env_options(processed_job),
         'task_arguments' => job['task_arguments'],
@@ -91,7 +96,7 @@ module CapistranoMulticonfigParallel
     def add_job_to_table(table, job_id)
       details = get_worker_details(job_id)
       row = [{ value: job_id.to_s },
-             { value: "#{details['app_name']}\n#{details['env_name']}" },
+             { value: details['full_stage'] },
              { value: details['action_name'] },
              { value: details['env_options'] },
              { value: "#{details['state']}" }

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -4,20 +4,15 @@ module CapistranoMulticonfigParallel
   # this is the class that will be invoked from terminal , and willl use the invoke task as the primary function.
   class CLI
     def self.start
-      if $stdin.isatty
-        $stdin.sync = true
-      end
-      if $stdout.isatty
-        $stdout.sync = true
-      end
+      CapistranoMulticonfigParallel.check_terminal_tty
       CapistranoMulticonfigParallel.original_args = ARGV.dup
       CapistranoMulticonfigParallel::Application.new.run
-    rescue Interrupt
-      `stty icanon echo`
-      $stderr.puts 'Command cancelled.'
-    rescue => error
-      $stderr.puts error
-      exit(1)
+   rescue Interrupt
+     `stty icanon echo`
+     $stderr.puts 'Command cancelled.'
+   rescue => error
+     $stderr.puts error
+     exit(1)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -35,11 +35,11 @@ module CapistranoMulticonfigParallel
         File.join(CapistranoMulticonfigParallel.detect_root.to_s, 'config', 'multi_cap.yml')
       end
 
-        def internal_config_directory
-           File.join(CapistranoMulticonfigParallel.root.to_s, 'capistrano_multiconfig_parallel', 'initializers')
-        end
-      
-        def command_line_params
+      def internal_config_directory
+        File.join(CapistranoMulticonfigParallel.root.to_s, 'capistrano_multiconfig_parallel', 'initializers')
+      end
+
+      def command_line_params
         [
           {
             name: 'multi_debug',
@@ -126,7 +126,7 @@ module CapistranoMulticonfigParallel
             default: default_config[:application_dependencies]
           }
         ]
-        end
+      end
 
       def capistrano_options
         command_line_params.map do |param|

data/lib/capistrano_multiconfig_parallel/extensions/rake.rb

@@ -1,28 +1,14 @@
+require_relative '../helpers/extension_helper'
 Rake::Task.class_eval do
   alias_method :original_execute, :execute
 
   def execute(args = nil)
-    job_id = ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]
-    if job_id.present?
-      run_the_actor(job_id) do
+    if CapistranoMulticonfigParallel::ExtensionHelper.inside_job?
+      CapistranoMulticonfigParallel::ExtensionHelper.run_the_actor(self) do
         original_execute(*args)
       end
     else
       original_execute(*args)
     end
   end
-
-  def run_the_actor(job_id)
-    rake_actor_id = ENV['count_rake'].present? ? "rake_worker_#{job_id}_count" : "rake_worker_#{job_id}"
-    if Celluloid::Actor[rake_actor_id].blank?
-      CapistranoMulticonfigParallel::RakeWorker.supervise_as rake_actor_id
-      Celluloid::Actor[rake_actor_id].work(ENV, self, rake_actor_id: rake_actor_id)
-    else
-      Celluloid::Actor[rake_actor_id].publish_new_work(ENV, self)
-    end
-    until Celluloid::Actor[rake_actor_id].task_approved
-      sleep(0.1) # keep current thread alive
-    end
-    yield if Celluloid::Actor[rake_actor_id].task_approved
-  end
 end

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -1,4 +1,5 @@
 require_relative './standard_deploy'
+require_relative '../celluloid/celluloid_manager'
 module CapistranoMulticonfigParallel
   # finds app dependencies, shows menu and delegates jobs to celluloid manager
   # rubocop:disable ClassLength
@@ -88,8 +89,8 @@ module CapistranoMulticonfigParallel
 
     def tag_staging_exists? # check exists task from capistrano-gitflow
       check_giflow_tasks(
-        CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK, 
-        CapistranoMulticonfigParallel::GITFLOW_CALCULATE_TAG_TASK, 
+        CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK,
+        CapistranoMulticonfigParallel::GITFLOW_CALCULATE_TAG_TASK,
         CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK
       )
     rescue
@@ -97,14 +98,14 @@ module CapistranoMulticonfigParallel
     end
 
     def check_giflow_tasks(*tasks)
-      tasks.all? {|t| Rake::Task[t].present?  }
+      tasks.all? { |t| Rake::Task[t].present? }
     end
 
     def fetch_multi_stages
       stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
-      stages = parse_inputted_value(value: stages).split(',').compact if stages.present?
-     stages = stages.present? ? stages : [@default_stage]
-     return stages
+      stages = parse_inputted_value('value' => stages).split(',').compact if stages.present?
+      stages = stages.present? ? stages : [@default_stage]
+      stages
     end
 
     def wants_deploy_production?
@@ -139,7 +140,7 @@ module CapistranoMulticonfigParallel
     end
 
     def worker_environments
-       @jobs.map { |job| job['env'] }
+      @jobs.map { |job| job['env'] }
     end
 
     def confirmation_applies_to_all_workers?
@@ -189,7 +190,7 @@ module CapistranoMulticonfigParallel
       message = box.present? ? "BOX #{box}:" : "stage #{options['stage']}:"
       env_opts = get_app_additional_env_options(app, message)
 
-      options['env_options'] = options['env_options'].reverse_merge(env_opts.except('BOX'))
+      options['env_options'] = options['env_options'].reverse_merge(env_opts)
 
       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
@@ -197,7 +198,7 @@ module CapistranoMulticonfigParallel
       job = {
         app: app,
         env: options['stage'],
-        action: custom_command? && env_options['ACTION'].present?  ? env_options['ACTION'] : options['action'],
+        action: custom_command? && env_options['ACTION'].present? ? env_options['ACTION'] : options['action'],
         task_arguments: options['task_arguments'],
         env_options: job_env_options
       }
@@ -236,7 +237,7 @@ module CapistranoMulticonfigParallel
     def fetch_app_additional_env_options
       options = {}
       return options if fetch(:app_additional_env_options).blank?
-      env_options = parse_inputted_value(key: :app_additional_env_options)
+      env_options = parse_inputted_value('key' => :app_additional_env_options)
       env_options = env_options.split(' ')
       options = multi_fetch_argv(env_options)
       options.stringify_keys!
@@ -254,7 +255,7 @@ module CapistranoMulticonfigParallel
     end
 
     def execute_on_multiple_boxes(main_box_name, options)
-      boxes = parse_inputted_value(value: main_box_name).split(',').compact
+      boxes = parse_inputted_value('value' => main_box_name).split(',').compact
       boxes.each do |box_name|
         options['env_options']['BOX'] = box_name
         prepare_job(options)

data/lib/capistrano_multiconfig_parallel/helpers/extension_helper.rb

@@ -0,0 +1,41 @@
+module CapistranoMulticonfigParallel
+  class ExtensionHelper
+    class << self
+      def inside_job?
+        job_id.present?
+      end
+
+      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}"
+      end
+
+      def stdin_result
+        Celluloid::Actor[rake_actor_id].stdin_result
+      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 if Celluloid::Actor[rake_actor_id].task_approved
+      end
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/multi_app_helpers/dependency_tracker.rb

@@ -19,7 +19,6 @@ module CapistranoMulticonfigParallel
       applications << 'all_frameworks'
       interactive_menu = CapistranoMulticonfigParallel::InteractiveMenu.new
       applications_selected = interactive_menu.show_all_websites_interactive_menu(applications)
-
       applications_selected = applications_selected.gsub("\r\n", '') if applications_selected.present?
       applications_selected = applications_selected.gsub("\n", '') if applications_selected.present?
       applications_selected = applications_selected.split(',') if applications_selected.present?
@@ -69,7 +68,7 @@ module CapistranoMulticonfigParallel
     end
 
     def show_frameworks_used(applications_to_deploy, all_frameworks, action)
-      return [] if applications_to_deploy.blank? || applications_to_deploy.size <= 1
+      return [] if applications_to_deploy.blank? || applications_to_deploy.size < 1
       puts 'The following frameworks will be used:'
       app_names = []
       if all_frameworks.present?

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 7
-    TINY = 7
+    MINOR = 8
+    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.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -648,6 +648,7 @@ files:
 - lib/capistrano_multiconfig_parallel/configuration.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