capistrano_multiconfig_parallel 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22d640f28ad6af906f0e2bf0eccb2b193ce54509
-  data.tar.gz: 2ef7c6f96deb52a5239befc1dec1c51ccbe90bd8
+  metadata.gz: 867ce8da69cdf6500d2ee56333c109bc8d0dcf8a
+  data.tar.gz: 14485e413c78e550ca6ce3d68172d247360249be
 SHA512:
-  metadata.gz: 0f91d957896b8d407c25172acbc3dc62493fac265d9e42d8958eb4c02d6f0eead3cb5a28697b23153c6b81edce21edb83ee0f73cbdabf88b3d0185ce20b985a1
-  data.tar.gz: a1d6dba2bdd7821e65dd0e20e38d9ac3fa2955e10454e0e804b329c2057a316ce3ba6977ae0fcce5b90cddd2c9fd96982481fd86a6c9971d3ccc70040fd5360c
+  metadata.gz: db431edc0e89fff08132da6b0cf85b39b75260e71a39e5180bcb3d8d190ab2b63913a2c7ac5beb359f9f9bc5926b4cd371ba0a1153e698a37c305b5e295a12bd
+  data.tar.gz: 61657bacfd339847406ffc24dfc0064805567be1f447db96541e138239aba3d26cc06e62a1ae4e3222f27422cadcecfa12feddad4c25f2e00d9d84d56251ed39

data/capistrano_multiconfig_parallel.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'celluloid_pubsub', '~> 0.0', '>= 0.0.15'
   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 'formatador', '~> 0.2', '>= 0.2.5'
+  s.add_runtime_dependency 'ruby-progressbar', '~> 1.7', '>= 1.7.5'
   s.add_runtime_dependency 'colorize', '~> 0.7', '>= 0.7'
   s.add_runtime_dependency 'eventmachine', '~> 1.0', '>= 1.0.3'
   s.add_runtime_dependency 'right_popen', '~> 1.1', '>= 1.1.3'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -8,7 +8,7 @@ require 'active_support/concern'
 require 'celluloid/autostart'
 require 'celluloid/pmap'
 require 'composable_state_machine'
-require 'formatador'
+require 'ruby-progressbar'
 require 'eventmachine'
 require 'right_popen'
 require 'colorize'

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -247,6 +247,7 @@ module CapistranoMulticonfigParallel
         'action_name' => job['action'],
         'env_options' => env_options,
         'task_arguments' => job['task_arguments'],
+        'job_argv' => job.fetch("job_argv", []),
         'processed' => true
        }   
       end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -25,7 +25,7 @@ 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
+                  :job_termination_condition, :worker_state, :executing_dry_run
     
     def work(job, manager)
       @job = job
@@ -71,12 +71,11 @@ module CapistranoMulticonfigParallel
     end
 
     def execute_after_succesfull_subscription
-      setup_task_arguments
-      if (@action_name == 'deploy' || @action_name == 'deploy:rollback') && CapistranoMulticonfigParallel.show_task_progress
+      if  @action_name != 'deploy:rollback' && CapistranoMulticonfigParallel.show_task_progress
         @executed_dry_run = true
         @rake_tasks = []
-        @task_argv << '--dry-run'
-        @task_argv << 'count_rake=true'
+        @executing_dry_run = true
+        setup_task_arguments( '--dry-run','count_rake=true' )
         @child_process = CapistranoMulticonfigParallel::ChildProcess.new
         Actor.current.link @child_process
         debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
@@ -107,6 +106,7 @@ 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
 
@@ -168,9 +168,8 @@ module CapistranoMulticonfigParallel
 
     def save_tasks_to_be_executed(message)
       return unless message['action'] == 'count'
-      debug("worler #{@job_id} current invocation chain : #{@rake_tasks.inspect}") if debug_enabled?
-      @rake_tasks = [] if @rake_tasks.blank?
-      @rake_tasks << message['task'] if @rake_tasks.last != message['task']
+      debug("worler #{@job_id} current invocation chain : #{rake_tasks.inspect}") if debug_enabled?
+      rake_tasks << message['task'] if rake_tasks.last != message['task']
     end
 
     def update_machine_state(name)
@@ -187,17 +186,28 @@ module CapistranoMulticonfigParallel
       end
       @task_argv
     end
+    
+    def worker_stage
+      @app_name.present? ? "#{@app_name}:#{@env_name}" : "#{@env_name}"
+    end
+    
+    def worker_action
+       "#{@action_name}[#{@task_arguments.join(',')}]"
+    end
 
-    def setup_task_arguments
+    def setup_task_arguments(*args)
       #   stage = "#{@app_name}:#{@env_name} #{@action_name}"
-      stage = @app_name.present? ? "#{@app_name}:#{@env_name}" : "#{@env_name}"
-      array_options = ["#{stage}"]
-      array_options << "#{@action_name}[#{@task_arguments.join(',')}]"
+      array_options = []
       @env_options.each do |key, value|
         array_options << "#{key}=#{value}" if value.present?
-      end
+        end
       array_options << '--trace' if debug_enabled?
-      array_options << '--multi_debug=true' if debug_enabled?
+      args.each do |arg|
+        array_options << arg
+      end
+      @manager.jobs[@job_id]['job_argv'] = array_options.clone
+      array_options.unshift("#{worker_action}")
+       array_options.unshift("#{worker_stage}")
       setup_command_line(*array_options)
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -71,12 +71,12 @@ module CapistranoMulticonfigParallel
 
     def worker_env_options(processed_job)
       worker_optons = ''
-      processed_job['env_options'].each do |key, value|
-        worker_optons << "#{key}=#{value}\n"
+      processed_job['job_argv'].each do |elem|
+        worker_optons << "#{elem}\n"
       end
       worker_optons
     end
-
+    
     def worker_action(processed_job)
       processed_job['task_arguments'].present? ? "#{processed_job['action_name']}[#{processed_job['task_arguments'].join(',')}]" : processed_job['action_name']
     end
@@ -85,10 +85,9 @@ module CapistranoMulticonfigParallel
       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)
+    def get_worker_details(job_id, worker)
       job = @manager.jobs[job_id]
       processed_job = @manager.process_job(job)
-      worker = @manager.get_worker_for_job(job_id)
       
       {
         'job_id' => job_id,
@@ -103,15 +102,16 @@ module CapistranoMulticonfigParallel
     end
 
     def add_job_to_table(table, job_id)
-      details = get_worker_details(job_id)
+      worker = @manager.get_worker_for_job(job_id)
+      details = get_worker_details(job_id, worker)
+      
       row = [{ value: job_id.to_s },
         { value: details['full_stage'] },
         { value: details['action_name'] },
         { value: details['env_options'] },
         { value: "#{details['state']}" }
       ]
-      if CapistranoMulticonfigParallel.show_task_progress
-        worker = @manager.get_worker_for_job(job_id)
+      if CapistranoMulticonfigParallel.show_task_progress 
         row << { value: worker.rake_tasks.size }
         row << { value: worker_progress(worker) }
       end
@@ -129,10 +129,18 @@ module CapistranoMulticonfigParallel
       current_task = worker.machine.state
       total_tasks = tasks.size
       task_index = tasks.index(current_task)
-      progress = Formatador::ProgressBar.new(total_tasks, color: 'green', start: task_index.to_i)
-      result = CapistranoMulticonfigParallel::Helper.capture(:stdout) do
+      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
+      stringio.rewind
+      result = stringio.read
       result = result.gsub("\r\n", '')
       result = result.gsub("\n", '')
       result = result.gsub('|', '#')

data/lib/capistrano_multiconfig_parallel/extensions/extension_helper.rb

@@ -1,5 +1,7 @@
 require 'celluloid/autostart'
 require_relative "../celluloid/rake_worker"
+require_relative './input_stream'
+require_relative './output_stream'
 module CapistranoMulticonfigParallel
   class ExtensionHelper
     class << self

data/lib/capistrano_multiconfig_parallel/extensions/rake.rb

@@ -1,14 +1,12 @@
 require_relative './extension_helper'
-require_relative './input_stream'
-require_relative './output_stream'
 Rake::Task.class_eval do
   alias_method :original_execute, :execute
 
-  def execute(args = nil)
+  def execute(*args)
     if CapistranoMulticonfigParallel::ExtensionHelper.inside_job?
       CapistranoMulticonfigParallel::ExtensionHelper.run_the_actor(self) do
         original_execute(*args)
-      end
+     end
     else
       original_execute(*args)
     end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 9
-    TINY = 2
+    MINOR = 10
+    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.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -91,25 +91,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
-  name: formatador
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -656,7 +656,6 @@ files:
 - lib/capistrano_multiconfig_parallel/helpers/standard_deploy.rb
 - lib/capistrano_multiconfig_parallel/initializers/conf.rb
 - lib/capistrano_multiconfig_parallel/initializers/default.yml
-- lib/capistrano_multiconfig_parallel/initializers/helper.rb
 - lib/capistrano_multiconfig_parallel/multi_app_helpers/dependency_tracker.rb
 - lib/capistrano_multiconfig_parallel/multi_app_helpers/interactive_menu.rb
 - lib/capistrano_multiconfig_parallel/version.rb

data/lib/capistrano_multiconfig_parallel/initializers/helper.rb

@@ -1,22 +0,0 @@
-module CapistranoMulticonfigParallel
-  # class used to find application dependencies
-  class Helper
-    # rubocop:disable Lint/Eval
-    def self.capture(stream)
-      stream = stream.to_s
-      captured_stream = Tempfile.new(stream)
-      stream_io = eval("$#{stream}")
-      origin_stream = stream_io.dup
-      stream_io.reopen(captured_stream)
-
-      yield
-
-      stream_io.rewind
-      return captured_stream.read
-    ensure
-      captured_stream.close
-      captured_stream.unlink
-      stream_io.reopen(origin_stream)
-    end
-  end
-end