capistrano_multiconfig_parallel 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2699a6ed6f5e38540aa4bbbfc86c17842febbc9c
-  data.tar.gz: cd6b4acefa3ac596d711b6dab2c450f47f93a8f9
+  metadata.gz: 4d23166b1840bdc3b08aba70bc46a988b93fa9d3
+  data.tar.gz: 1810d6abd23e17df7aae1519894651152ba950e5
 SHA512:
-  metadata.gz: 9210b7536d87f6d17ba7f0f99a120947728dfd239074d99eb0e46f9a61f8b7c8cd99ae4a2f16f207e138f40a190697d55d2ead9ae595f3050b18398e59524ce4
-  data.tar.gz: ba98002b12565a804aff218cc24cc958a4af662eb86dbe684a1c416bf8032c78bb3544eeaa867a6653310b3604d0b64caea539daf52e8b2a398bdec05fe30948
+  metadata.gz: a74d2fed08ad4a5bfa2d7bbaa8b86be79d9c184feacd927538529087aebca29f2de1ff4773ab860c94b6dd204a4d91da2cd3592672124e8007f0c151aded3eb0
+  data.tar.gz: f4be5d8432d06f49bc9dfaab76e9e0fb67ecabcfea3ffd12bfc44e7e8cd0de6f77bd1e63a4f94e14dc54693292414d4e4388bc915b7d7c67cb31025b4ba4bcc9

data/.codeclimate.yml

@@ -1,7 +1,7 @@
 ---
 engines:
   bundler-audit:
-    enabled: true
+    enabled: false
   csslint:
     enabled: true
   eslint:

data/README.md

@@ -21,13 +21,19 @@ NEW Improvements started in version 2.0.0.alpha ( currently gem is in stable ver
 -------------------------------------------------------------------------------------
 
 -	Code for handling websocket events when a task is invoked was moved to a new gem [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel)
--	You can now deploy applications from anywhere on your computer without having to add this gem to the Gemfile, however you need to add the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) gem to your Gemfile, if you want to use this .
--	And only create anywhere on your computer a YAML file as described in section **[2.2) Deploying multiple applications from a central location](#22-deploying-multiple-applications-from-a-central-location)**
--	If you don't add the **capistrano_sentinel** to each of your applications, the executable of this gem will automatically create a new file "Gemfile.multi_cap" in the root of each of the applications that you are deploying, where the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) gem will be included and will use that Gemfile when doing deploys.
--	The Capfile file of each of the applications that you are deploying will also be automatically changed to require [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) if you haven't done so yet if the gem is part of the Gemfile, but was not required.
--	If the **capistrano_sentinel** gem is not part of the Gemfile, a new file will be created "Capfile.multi_cap" in order to require the gem upon execution of jobs.
--	When the command will finish , the files created will be removed.
--	If you are using RVM and there is a .rvmrc file in your project root directory and bash is available , the script will use bash emulator in order to properly load RVM gemsets because .rvmrc files need trusting
+
+-	You can now deploy applications from anywhere on your computer **without having to add THIS gem to the Gemfiles of those applications**, however we recommend you to add the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) gem to those Gemfiles for better stability. **The applications though must contain proper configuration for capistrano as you would normally do!!!**
+
+-	If [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) is included in one of the applications you are deploying, but you forget to require it, this gem will automatically patch the Capfile to require the gem. Otherwise the Capfile is not changed.
+
+-	However this will work even if you don't add the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) to your Gemfile, because the new version will automatically create three files "Gemfile.multi_cap", "Gemfile.multi_cap.lock" and "Capfile.multi_cap" where the dependency to **capistrano_sentinel** will be added and those new files will be used when deploying. This new Gemfile and the new Capfile will be clones of the original files, but will only add as dependency the **capistrano_sentinel** gem which is used to produce websocket events before a capistrano task is executed. And this gem will consume them and act depending on configuration.
+
+-	After installing this gem locally on your system, you can just create anywhere on your computer a YAML file as described in section **[2.2) Deploying multiple applications from a central location](#22-deploying-multiple-applications-from-a-central-location)** ( we suggest using the home directory) and then you can start deploying applications without adding new dependencies to those applications.
+
+-	When the command will finish , the files created will be removed. ("Gemfile.multi_cap", "Gemfile.multi_cap.lock" and "Capfile.multi_cap") if they exist in the application root directory.
+
+-	If you are using RVM and there is a .rvmrc file in your project root directory and bash is available , the script will use bash emulator in order to properly load RVM gemsets because .rvmrc files need trusting. **If you use .rvmrc files please make sure you have the `bash` executable available in your PATH**
+
 -	**Dont use BUNDLE EXEC command when running the executable for this gem unless you are using version 1 or this gem is part of the Gemfile of the application you are using. Otherwise just use the `multi_cap` executable without any prefix ( Unless this gem is part of your gemfile, in which case the BUNDLE EXEC prefix is needed )**
 
 If you are using a older version than 2.0 please refer to this [README for version 1.7.2 or lower](https://github.com/bogdanRada/capistrano_multiconfig_parallel/blob/master/V1_README.md)
@@ -48,7 +54,8 @@ Requirements
 10.	[configliere >= 0.4](https://github.com/infochimps-platform/configliere)
 11.	[inquirer >= 0.2](https://github.com/arlimus/inquirer.rb)
 12.	[devnull >= 0.1](https://github.com/arlimus/inquirer.rb)
-13.	[capistrano_sentinel >= 1.6](http://github.com/bogdanRada/capistrano_sentinel)
+13.	[capistrano_sentinel >= 0.0.16](http://github.com/bogdanRada/capistrano_sentinel)
+14.	[ruby-progressbar >= 1.8.1](https://github.com/jfelchner/ruby-progressbar)
 
 Compatibility
 -------------
@@ -76,8 +83,10 @@ Add the following to your Capfile after requiring **capistrano** and **capistran
 
 Install locally on your system the capistrano_multiconfig_parallel gem using this command :
 
+**Please check first what is the last release here: [Release Details](https://github.com/bogdanRada/capistrano_multiconfig_parallel/releases) and use that version instead of the one below**
+
 ```ruby
-  gem install capistrano_multiconfig_parallel -v 2.0.0
+  gem install capistrano_multiconfig_parallel -v 2.0.1
 ```
 
 Please read [Release Details](https://github.com/bogdanRada/capistrano_multiconfig_parallel/releases) if you are upgrading. We break backward compatibility between large ticks but you can expect it to be specified at release notes.

data/capistrano_multiconfig_parallel.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'inquirer', '~> 0.2', '>= 0.2'
   s.add_runtime_dependency 'devnull','~> 0.1', '>= 0.1'
   s.add_runtime_dependency 'capistrano_sentinel',  '>= 0.0', '>= 0.0.16'
-  s.add_runtime_dependency 'ruby-progressbar', '~> 1.8', '>= 1.8.1'
+  s.add_runtime_dependency 'powerbar', '~> 1.0', '>= 1.0.17'
 
   s.add_development_dependency 'rake', '>= 10.4', '>= 10.4'
   s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -20,7 +20,7 @@ require 'configliere'
 require 'devnull'
 require 'inquirer'
 require "capistrano_sentinel"
-require 'ruby-progressbar'
+require 'powerbar'
 
 require 'etc'
 require 'logger'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -2,9 +2,24 @@ require_relative './helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # finds app dependencies, shows menu and delegates jobs to celluloid manager
   class Application
-    include CapistranoMulticonfigParallel::ApplicationHelper
-
-    attr_reader :stage_apps, :top_level_tasks, :jobs, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage,:patched_job_paths
+    include CapistranoMulticonfigParallel::BaseActorHelper
+
+    attr_reader :stage_apps,
+      :top_level_tasks,
+      :jobs,
+      :condition,
+      :manager,
+      :dependency_tracker,
+      :application,
+      :stage,
+      :name,
+      :args,
+      :argv,
+      :default_stage,
+      :patched_job_paths,
+      :bundler_workers_store,
+      :checked_job_paths
+      
     attr_writer :patched_job_paths
 
     def initialize
@@ -12,7 +27,7 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel.enable_logging
       @stage_apps = multi_apps? ? app_names_from_stages : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
-      @bundler_workers = []
+      @bundler_workers_store = {}
       @jobs = []
       @checked_job_paths = []
       @patched_job_paths = [] # for deploy
@@ -93,10 +108,20 @@ module CapistranoMulticonfigParallel
     end
 
     def check_before_starting
-      @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(self)
+      @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(Actor.current)
       @default_stage = configuration.development_stages.present? ? configuration.development_stages.first : 'development'
       @condition = Celluloid::Condition.new
-      @manager = CapistranoMulticonfigParallel::CelluloidManager.new(self)
+      @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
+      start_bundler_supervision_if_needed
+    end
+
+    def start_bundler_supervision_if_needed
+      return if configuration.check_app_bundler_dependencies.to_s.downcase != 'true'
+      @bundler_worker_supervisor = setup_supervision_group
+      @mutex = Mutex.new
+      @bundler_workers = setup_pool_of_actor(@bundler_worker_supervisor, actor_name: :bundler_workers, type: CapistranoMulticonfigParallel::BundlerWorker, size: 10)
+      Actor.current.link @bundler_workers
+      setup_actor_supervision(@bundler_worker_supervisor, actor_name: :bundler_terminal_server, type: CapistranoMulticonfigParallel::BundlerTerminalTable, args: [@manager, Actor.current, configuration.fetch(:terminal, {})])
     end
 
     def collect_jobs(options = {}, &_block)
@@ -166,7 +191,7 @@ module CapistranoMulticonfigParallel
         collect_jobs(options)
       end
       if configuration.check_app_bundler_dependencies.to_s.downcase == 'true'
-        sleep(0.1) until @jobs.size == @bundler_workers.size
+        sleep(0.1) until @jobs.size == @bundler_workers_store.size
       end
       process_jobs
     end
@@ -223,7 +248,7 @@ module CapistranoMulticonfigParallel
       env_options = options['env_options']
       job_env_options = custom_command? ? env_options.except(action_key) : env_options
 
-      job = CapistranoMulticonfigParallel::Job.new(self, options.merge(
+      job = CapistranoMulticonfigParallel::Job.new(Actor.current, options.merge(
       action: custom_command? && env_options[action_key].present? ? env_options[action_key] : options['action'],
       env_options: job_env_options,
       path:  job_path(options)
@@ -238,14 +263,13 @@ module CapistranoMulticonfigParallel
         unless job.capistrano_sentinel_needs_updating?
           raise "Please consider upgrading the gem #{job.capistrano_sentinel_name} to version #{job.loaded_capistrano_sentinel_version} from #{job.job_capistrano_sentinel_version} in #{job.job_path} "
         end
+        log_to_file("bundler callback called with #{job.inspect}")
         job.application.jobs << job unless job.application.job_can_tag_staging?(job)
       }
       if configuration.check_app_bundler_dependencies.to_s.downcase == 'true' && job.job_gemfile.present?
         if !@checked_job_paths.include?(job.job_path)
           @checked_job_paths << job.job_path
-          bundler_worker = CapistranoMulticonfigParallel::BundlerWorker.new
-          @bundler_workers << {job: job, worker: bundler_worker }
-          bundler_worker.work(job, &bundler_callback) # make sure we have installed the dependencies first for this application
+          @bundler_workers.work(job, &bundler_callback) # make sure we have installed the dependencies first for this application
         end
       else
         bundler_callback.call(job)

data/lib/capistrano_multiconfig_parallel/celluloid/bundler_terminal_table.rb

@@ -0,0 +1,42 @@
+module CapistranoMulticonfigParallel
+  class BundlerTerminalTable < CapistranoMulticonfigParallel::TerminalTable
+
+    def self.topic
+      'bundler_terminal'
+    end
+
+    def default_heaadings
+      ['Job UUID', 'App', 'Action', 'Current Status']
+    end
+
+    def run
+      subscribe(CapistranoMulticonfigParallel::BundlerTerminalTable.topic, :notify_bundler_install_status)
+    end
+
+    def notify_bundler_install_status(_channel, _message)
+      table = Terminal::Table.new(title: 'Bundler Check Status Table', headings: default_heaadings)
+      jobs = setup_table_jobs(table)
+      display_table_on_terminal(table, jobs)
+    end
+
+    def fetch_table_size(jobs)
+      job_rows = jobs.sum { |job, _bundler_worker| job.row_size }
+      (job_rows + 2)**2
+    end
+
+
+    def setup_table_jobs(table)
+      jobs = managers_alive? ? @job_manager.bundler_workers_store.dup : []
+      jobs.each do |job, bundler_worker|
+        table.add_row(job.bundler_check_terminal_row)
+        table.add_separator if jobs.keys.last != job
+      end
+      jobs
+    end
+
+    def managers_alive?
+      @job_manager.alive?
+    end
+
+  end
+end

data/lib/capistrano_multiconfig_parallel/celluloid/bundler_worker.rb

@@ -17,18 +17,39 @@ module CapistranoMulticonfigParallel
 
     def work(job, &callback)
       @job = job
+      @callback = callback
+      @job.application.bundler_workers_store[job] = Actor.current
       @job_id = job.id
       @runner_status = nil
       @log_prefix = 'bundler'
       @checked_bundler_deps = []
       @total_dependencies = bundler_dependencies.size
       @show_bundler = true
-      progress_bar
       async.check_missing_deps
     end
 
     def progress_bar
-      @progress_bar ||= ProgressBar.create(:title => "Checking app #{File.basename(@job.job_path)} bundler dependencies ", :starting_at => 0, :total => @total_dependencies.to_i, length: 160, :format => '%a |%b>>%i| %p%% %t | Processed: %c from %C gem dependencies')
+      if defined?(@progress_bar)
+        @progress_bar
+      else
+        @progress_bar ||= PowerBar.new
+        @progress_bar.define_singleton_method :terminal_width do
+          40
+        end
+        @progress_bar.settings.tty.finite.template.main = \
+        "${<msg>} ${<bar> } ${<percent>%}" # + "${<rate>/s} ${<elapsed>}${ ETA: <eta>}"
+        @progress_bar.settings.tty.finite.template.padchar = "#{@progress_bar.settings.tty.finite.template.padchar}"
+        @progress_bar.settings.tty.finite.template.barchar = "#{@progress_bar.settings.tty.finite.template.barchar}"
+        @progress_bar.settings.tty.finite.template.exit = "\e[?25h\e[0mFINISHED"  # clean up after us
+        @progress_bar.settings.tty.finite.template.close = "\e[?25h\e[0mFINISHED \n" # clean up after us
+        @progress_bar.settings.tty.finite.output = Proc.new{ |data|
+          if data.present? && data.include?("Error") || data.include?("Installing")
+            @job.bundler_check_status = data.include?("Error") ? data.to_s.red : data.to_s.green
+            send_msg(CapistranoMulticonfigParallel::BundlerTerminalTable.topic, type: 'event', data: data.to_s.uncolorize )
+          end
+        }
+        @progress_bar
+      end
     end
 
     def bundler_dependencies
@@ -42,13 +63,15 @@ module CapistranoMulticonfigParallel
       @show_bundler = false if  data.to_s.include?("The Gemfile's dependencies are satisfied") || data.to_s.include?("Bundle complete")
       gem_spec = bundler_dependencies.find{|spec| data.include?(spec.name) }
       if data.include?("Error") && @show_bundler == true && gem_spec.present?
+        @checked_bundler_deps << [gem_spec.name]
+        progress_bar.show(:msg => "Error installing #{gem_spec.name} (#{@checked_bundler_deps.size} from #{@total_dependencies.to_i} deps)", :done => @checked_bundler_deps.size, :total => @total_dependencies.to_i)
         error_message = "Bundler worker #{@job_id} task  failed for #{gem_spec.inspect}"
         raise(CapistranoMulticonfigParallel::TaskFailed.new(error_message), error_message)
       elsif  @show_bundler == true && gem_spec.present?
-        @checked_bundler_deps = [gem_spec.name]
-        progress_bar.increment
+        @checked_bundler_deps << [gem_spec.name]
+        progress_bar.show(:msg => "Installing #{gem_spec.name} (#{@checked_bundler_deps.size} from #{@total_dependencies.to_i} deps)", :done => @checked_bundler_deps.size, :total => @total_dependencies.to_i)
       elsif @show_bundler == false
-        progress_bar.finish
+        progress_bar.close if defined?(@progress_bar)
       end
     end
 
@@ -66,14 +89,20 @@ module CapistranoMulticonfigParallel
     def notify_finished(exit_status, runner_status)
       @runner_status = runner_status
       @exit_status = exit_status
-      progress_bar.finish
+      progress_bar.close if defined?(@progress_bar)
       if exit_status == 0
-        callback.call(@job)
+        @callback.call(@job)
       else
         error_message = "Bundler worker #{@job_id} task  failed with exit status #{exit_status.inspect}"
         raise(CapistranoMulticonfigParallel::TaskFailed.new(error_message), error_message)
       end
     end
 
+    def send_msg(channel, message = nil)
+      message = message.present? && message.is_a?(Hash) ? { job_id: @job_id }.merge(message) : { job_id: @job_id, message: message }
+      log_to_file("worker #{@job_id} triest to send to #{channel} #{message}")
+      publish channel, message
+    end
+
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -23,6 +23,7 @@ module CapistranoMulticonfigParallel
       @terminal_rows = nil
       @cursor = CapistranoMulticonfigParallel::Cursor.new
       @errors = []
+      @notifications = 0
       @options = options.is_a?(Hash) ? options.stringify_keys : options
       @job_manager = job_manager
       @screen_erased = false
@@ -43,7 +44,10 @@ module CapistranoMulticonfigParallel
     def notify_time_change(_channel, message)
       table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_heaadings)
       jobs = setup_table_jobs(table)
+      @cursor.erase_screen if @notifications.to_i.zero? && @job_manager.checked_job_paths.size > 0 && jobs.find{|job_id, job| job.bundler_check_status.present? }.present?
+      @notifications=@notifications+1
       display_table_on_terminal(table, jobs)
+      signal_complete
     end
 
     def rescue_exception(ex)
@@ -68,7 +72,6 @@ module CapistranoMulticonfigParallel
         )
       )
       print_errors
-      signal_complete
     end
 
     def print_errors
@@ -91,7 +94,7 @@ module CapistranoMulticonfigParallel
     end
 
     def managers_alive?
-       @manager.alive?
+      @job_manager.alive? && @manager.alive?
     end
 
     def signal_complete

data/lib/capistrano_multiconfig_parallel/classes/cursor.rb

@@ -14,8 +14,6 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    private
-
     def move_to_home!(row = 0, column = 1)
       erase_screen
       position_cursor(row, column)

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -11,7 +11,7 @@ module CapistranoMulticonfigParallel
     end
 
     def fetch_apps_needed_for_deployment(application, action)
-      return [[], {}] unless @job_manager.send(:multi_apps?)
+      return [[], {}] unless @job_manager.multi_apps?
       if @job_manager.custom_command?
         show_interactive_menu(action)
       else

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -5,8 +5,8 @@ module CapistranoMulticonfigParallel
   class Job
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :options, :application, :manager, :bundler_status
-    attr_writer :status, :exit_status,  :bundler_status, :new_jobs_dispatched, :will_dispatch_new_job
+    attr_reader :options, :application, :manager, :bundler_status, :bundler_check_status
+    attr_writer :status, :exit_status,  :bundler_status, :new_jobs_dispatched, :will_dispatch_new_job, :bundler_check_status
 
     delegate :stderr_buffer,
     to: :manager
@@ -43,7 +43,9 @@ module CapistranoMulticonfigParallel
     end
 
     def terminal_row
-      if bundler_status
+      if bundler_check_status
+        bundler_check_terminal_row
+      elsif bundler_status
         bundler_terminal_row
       else
         [
@@ -56,6 +58,14 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def bundler_check_terminal_row
+      [
+        { value: id.to_s },
+        { value: wrap_string(File.basename(job.job_path)) },
+        { value: "bundle check || bundle install" },
+        { value: bundler_check_status.to_s }
+      ]
+    end
 
     def bundler_terminal_row
       [
@@ -99,6 +109,7 @@ module CapistranoMulticonfigParallel
       { name: 'status', default: :unstarted },
       { name: 'exit_status', default: nil },
       { name: 'bundler_status', default: nil },
+      { name: 'bundler_check_status', default: nil },
       { name: 'new_jobs_dispatched', default: [] },
       { name: 'will_dispatch_new_job', default: nil },
     ].each do |hash|

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -9,7 +9,7 @@ module CapistranoMulticonfigParallel
 
     MAJOR = 2
     MINOR = 0
-    TINY = 1
+    TINY = 3
     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: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -259,25 +259,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.16
 - !ruby/object:Gem::Dependency
-  name: ruby-progressbar
+  name: powerbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.0.17
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -504,6 +504,7 @@ files:
 - lib/capistrano_multiconfig_parallel/all.rb
 - lib/capistrano_multiconfig_parallel/application.rb
 - lib/capistrano_multiconfig_parallel/base.rb
+- lib/capistrano_multiconfig_parallel/celluloid/bundler_terminal_table.rb
 - lib/capistrano_multiconfig_parallel/celluloid/bundler_worker.rb
 - lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb
 - lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb