capistrano_multiconfig_parallel 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 867ce8da69cdf6500d2ee56333c109bc8d0dcf8a
-  data.tar.gz: 14485e413c78e550ca6ce3d68172d247360249be
+  metadata.gz: 2bdac07ad222d4fcad77e8a8ec5f18898262f834
+  data.tar.gz: 212281163ee493733d40eb1af17ecc2a5dfd7c9c
 SHA512:
-  metadata.gz: db431edc0e89fff08132da6b0cf85b39b75260e71a39e5180bcb3d8d190ab2b63913a2c7ac5beb359f9f9bc5926b4cd371ba0a1153e698a37c305b5e295a12bd
-  data.tar.gz: 61657bacfd339847406ffc24dfc0064805567be1f447db96541e138239aba3d26cc06e62a1ae4e3222f27422cadcecfa12feddad4c25f2e00d9d84d56251ed39
+  metadata.gz: e7454e4f6f02a655932e940e50cadc77b6c19d7a551257b2d57d11219589635fec8b694d06b498725868ab7135dbce26f980284c44b9b2b6500ec65caf16118f
+  data.tar.gz: ab3f5c6f1c059582d90994e5c2150a9ab551da7ce4e9f840fb685ba2e3782245d47bcb13b23cd8da786e4d77d07ae15fb9ed5a40c05935f1fd6b9385230f872c

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -25,11 +25,12 @@ module CapistranoMulticonfigParallel
     attr_accessor :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :client, :task_argv, :execute_deploy, :executed_dry_run,
                   :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_termination_condition, :worker_state, :executing_dry_run, :job_argv
     
     def work(job, manager)
       @job = job
       @worker_state = 'started'
+      @executing_dry_run = nil
       @manager = manager
       @job_confirmation_conditions = []
       process_job(job) if job.present?
@@ -74,8 +75,7 @@ module CapistranoMulticonfigParallel
       if  @action_name != 'deploy:rollback' && CapistranoMulticonfigParallel.show_task_progress
         @executed_dry_run = true
         @rake_tasks = []
-        @executing_dry_run = true
-        setup_task_arguments( '--dry-run','count_rake=true' )
+        setup_task_arguments(dry_run_command,'count_rake=true' )
         @child_process = CapistranoMulticonfigParallel::ChildProcess.new
         Actor.current.link @child_process
         debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
@@ -106,7 +106,6 @@ module CapistranoMulticonfigParallel
       setup_task_arguments
       debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
       @child_process.async.work(generate_command, actor: Actor.current, silent: true)
-      @executing_dry_run = false
       @manager.wait_task_confirmations_worker(Actor.current)
     end
 
@@ -130,6 +129,8 @@ module CapistranoMulticonfigParallel
     end
 
     def handle_subscription(message)
+        @executing_dry_run = message['action'] == 'count' ? true : false
+        @manager.jobs[@job_id]['job_argv'] = @job_argv
       if message_is_about_a_task?(message)
         check_gitflow
         save_tasks_to_be_executed(message)
@@ -187,6 +188,14 @@ module CapistranoMulticonfigParallel
       @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
@@ -205,7 +214,7 @@ module CapistranoMulticonfigParallel
       args.each do |arg|
         array_options << arg
       end
-      @manager.jobs[@job_id]['job_argv'] = array_options.clone
+      @job_argv= array_options.clone
       array_options.unshift("#{worker_action}")
        array_options.unshift("#{worker_stage}")
       setup_command_line(*array_options)

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -11,29 +11,24 @@ module CapistranoMulticonfigParallel
 
 
 
-     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 = {})
+     def work(env, options = {})
       @options = options.stringify_keys
       @env = env
-      @action = @subscription_channel.include?('_count') ? 'count' : 'invoke'
+      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']
-      wait_execution until @successfull_subscription == true && defined?(@client)
-      publish_to_worker(task_data)
     end
 
- 
+   def publish_new_work(env, new_options = {})
+      work(env, @options.merge(new_options))
+       publish_to_worker(task_data)
+    end
 
     def wait_execution(name = task_name, time = 0.1)
       #    info "Before waiting #{name}"
@@ -47,6 +42,13 @@ module CapistranoMulticonfigParallel
       # 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|
@@ -80,6 +82,7 @@ module CapistranoMulticonfigParallel
       if @client.succesfull_subscription?(message)
        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? 
         task_approval(message)
       elsif message.present? && message['action'].present? && message['action'] == 'stdin'

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -112,8 +112,13 @@ module CapistranoMulticonfigParallel
         { value: "#{details['state']}" }
       ]
       if CapistranoMulticonfigParallel.show_task_progress 
-        row << { value: worker.rake_tasks.size }
-        row << { value: worker_progress(worker) }
+        if  worker.alive?
+          row << { value: worker.rake_tasks.size }
+          row << { value: worker_progress(details, worker) }
+        else
+          row << { value: 0 }
+          row << { value:  worker_state(worker) }
+        end
       end
       table.add_row(row)
       table.add_separator if @manager.jobs.keys.last.to_i != job_id.to_i
@@ -123,22 +128,21 @@ module CapistranoMulticonfigParallel
       system('cls') || system('clear') || puts("\e[H\e[2J")
     end
 
-    def worker_progress(worker)
-      return worker_state(worker) unless worker.alive?
-      tasks = worker.rake_tasks
-      current_task = worker.machine.state
-      total_tasks = tasks.size
-      task_index = tasks.index(current_task)
+    def worker_dry_running?(worker)
+      worker.alive? && worker.dry_running?
+    end
+    
+    def worker_progress(details, worker)
+      return worker_state(worker) unless worker.alive? 
+      return if worker.executing_dry_run.nil?
+      tasks = worker.alive? ?  worker.rake_tasks : []
+      current_task =  worker_state(worker)
+      total_tasks =  worker_dry_running?(worker) ? nil : tasks.size
+      task_index =  worker_dry_running?(worker) ? 0 : tasks.index(current_task).to_i + 1
       stringio = StringIO.new
-      if worker.executing_dry_run == false
-        #progress = ProgressBar::Base.new(:title => "Tasks",  :output => stringio, :format =>  '%a %B %p%% %t',  :starting_at => task_index.to_i, :total =>  total_tasks, :length => 40)
-        progress =  ProgressBar.create(:format => '%a |%b %i| %p%% Completed', :output => stringio, :starting_at => task_index, :total =>  total_tasks, :length => 40 )
-        progress.refresh
-      else
-        progress =  ProgressBar.create(:format => '%a |%b %i| %p%% Completed', :output => stringio, :length => 40, :total => nil, :unknown_progress_animation_steps => ['==>', '>==', '=>='])
-        progress.increment
-        progress.refresh
-      end
+      progress_bar =  ProgressBar.create(:output => stringio, :starting_at => task_index, :total => total_tasks, :length => 40, title: "JOB #{details['job_id']}:  #{task_index.to_s} of  #{total_tasks}")
+      progress_bar.refresh
+      progress_bar.stop
       stringio.rewind
       result = stringio.read
       result = result.gsub("\r\n", '')

data/lib/capistrano_multiconfig_parallel/extensions/extension_helper.rb

@@ -4,43 +4,65 @@ require_relative './input_stream'
 require_relative './output_stream'
 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 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)
+    
+    attr_accessor :task, :env
+    def initialize(env, task)
+      @env = env
+      @task = task
+    end
+    
+    def work(&block)
+      if  job_id.present?
+        actor_start_working
         actor.wait_execution until actor.task_approved
-        return unless actor.task_approved
-        stringio = StringIO.new
-        CapistranoMulticonfigParallel::OutputStream.hook(stringio)
-        CapistranoMulticonfigParallel::InputStream.hook(actor, stringio)
+        return unless  actor.task_approved
+        actor_execute_block(&block)
+      else
         block.call
-        CapistranoMulticonfigParallel::InputStream.unhook
-        CapistranoMulticonfigParallel::OutputStream.unhook
       end
-
-    
+    end
 
 
+    
+    private 
+    
+     
+    def actor_execute_block(&block)
+      stringio = StringIO.new
+      CapistranoMulticonfigParallel::OutputStream.hook(stringio)
+      CapistranoMulticonfigParallel::InputStream.hook(actor, stringio)
+      block.call
+      CapistranoMulticonfigParallel::InputStream.unhook
+      CapistranoMulticonfigParallel::OutputStream.unhook
+    end
+     
+    def actor_start_working
+      if actor.blank?
+        CapistranoMulticonfigParallel::RakeWorker.supervise_as rake_actor_id
+        actor.work(@env, actor_id: rake_actor_id, job_id: job_id, task: @task)
+      else
+        actor.publish_new_work(@env, task: @task)
+      end
+    end
+     
+    def supervise_actor
+      CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id, 
+        actor_id: rake_actor_id, 
+        job_id: job_id)  if actor.blank?
+    end
+   
+    def actor
+      Celluloid::Actor[rake_actor_id]
+    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
+     
   end
 end

data/lib/capistrano_multiconfig_parallel/extensions/rake.rb

@@ -3,11 +3,8 @@ Rake::Task.class_eval do
   alias_method :original_execute, :execute
 
   def execute(*args)
-    if CapistranoMulticonfigParallel::ExtensionHelper.inside_job?
-      CapistranoMulticonfigParallel::ExtensionHelper.run_the_actor(self) do
-        original_execute(*args)
-     end
-    else
+    rake =  CapistranoMulticonfigParallel::ExtensionHelper.new(ENV, self) 
+    rake.work do
       original_execute(*args)
     end
   end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,7 +7,7 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 10
+    MINOR = 11
     TINY = 0
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - bogdanRada