capistrano_multiconfig_parallel 0.21.8 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0b5a6c4d757da56822db1d3841df24d849005f
-  data.tar.gz: 47e706d3ca497fcce259094b026baeda873fa173
+  metadata.gz: 89e48073b8b6708baeb5b39f98744f373ab3abab
+  data.tar.gz: 1052b93deab26bec15a3ba72c30c9f690c41a605
 SHA512:
-  metadata.gz: 156d0a858b5cac59ae2e393ec367f010b47efff8d212826eee6e5c45ea1446ab780f9200a1e7a728b36b0a2d8df71885e1d49f801c8996dd0939982407e85f16
-  data.tar.gz: e10b68c1ac518825a070dd221d77ab8c80a02c2e74ec5ca42e09431d87bda94ef32864e2a805a88bad2b626ded2cd44ab99e92c0b1cad657c957b579d990a907
+  metadata.gz: 3da4fd7ec16bc1d1a089c5d1ebf681250c3e65c711945114374ebe9c4c1e2567de44554582e152c3ff4b8f2661cd9d0d86ba31058876ea91cc6b5741bd2c255d
+  data.tar.gz: 76ac0e57d3c78760b9f710207c54efcc6356f5beef76479d3f1636f17105cc9b31c2cd2167cb9d57471b3fef3ef62603086ae4feea61066932e22ad09ea7c209

data/capistrano_multiconfig_parallel.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'eventmachine', '~> 1.0', '>= 1.0.3'
   s.add_runtime_dependency 'right_popen', '~> 1.1', '>= 1.1.3'
   s.add_runtime_dependency 'capistrano','~> 3.0','>= 3.0'
+  s.add_runtime_dependency 'capistrano-multiconfig','~> 3.0','>= 3.0.8'
   s.add_runtime_dependency 'activesupport',  '~> 4.0','>= 4.0'
   s.add_runtime_dependency 'configliere', '~> 0.4', '>=0.4'
   s.add_runtime_dependency 'inquirer', '~> 0.2', '>= 0.2'

data/lib/capistrano_multiconfig_parallel.rb

@@ -1 +1 @@
-require_relative './capistrano_multiconfig_parallel/version'
+require 'capistrano_multiconfig_parallel/all'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -1,35 +1,37 @@
 require 'rubygems'
 require 'bundler'
 require 'bundler/setup'
-require 'rake'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/concern'
+
 require 'celluloid/autostart'
 require 'celluloid/pmap'
+
 require 'composable_state_machine'
 require 'eventmachine'
 require 'right_popen'
 require 'colorize'
-require 'logger'
 require 'terminal-table'
-
 require 'celluloid_pubsub'
-require 'capistrano/all'
-require 'fileutils'
-
 require 'configliere'
-require 'pp'
 require 'devnull'
 require 'inquirer'
+
+require 'logger'
+require 'fileutils'
+require 'pp'
 require 'yaml'
 require 'stringio'
+
+# capistrano requirements
+require 'rake'
+require 'capistrano/all'
+
 # fix error with not files that can not be found
 Gem.find_files('composable_state_machine/**/*.rb').each { |path| require path }
 
-Gem.find_files('capistrano_multiconfig_parallel/classes/**/*.rb').each { |path| require path }
-Gem.find_files('capistrano_multiconfig_parallel/helpers/**/*.rb').each { |path| require path }
-Gem.find_files('capistrano_multiconfig_parallel/celluloid/**/*.rb').each { |path| require path }
+Gem.find_files('capistrano_multiconfig_parallel/**/*.rb').each { |path| require path }
 
 require_relative './version'
 require_relative './base'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -6,12 +6,11 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :stages, :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
+    attr_reader :stage_apps, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
 
     def initialize
       Celluloid.boot
-      @stages = fetch_stages
-      @stage_apps = multi_apps? ? @stages.map { |stage| stage.split(':').reverse[1] }.uniq : []
+      @stage_apps = multi_apps? ? stages.map { |stage| stage.split(':').reverse[1] }.uniq : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
       @jobs = []
     end
@@ -55,14 +54,14 @@ module CapistranoMulticonfigParallel
 
     def custom_command?
       if multi_apps?
-        !@stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.first)
+        !stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.first)
       else
-        !@stages.include?(@top_level_tasks.second) && @stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.second)
+        !stages.include?(@top_level_tasks.second) && stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.second)
       end
     end
 
     def multi_apps?
-      @stages.find { |stage| stage.include?(':') }.present?
+      stages.find { |stage| stage.include?(':') }.present?
     end
 
     def initialize_data
@@ -220,8 +219,8 @@ module CapistranoMulticonfigParallel
       job_env_options = custom_command? && env_options['ACTION'].present? ? env_options.except('ACTION') : env_options
 
       job = CapistranoMulticonfigParallel::Job.new(Actor.current, options.merge(
-                                                     action: custom_command? && env_options['ACTION'].present? ? env_options['ACTION'] : options['action'],
-                                                     env_options: job_env_options
+                                                                    action: custom_command? && env_options['ACTION'].present? ? env_options['ACTION'] : options['action'],
+                                                                    env_options: job_env_options
       ))
       @jobs << job
     end

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -27,8 +27,8 @@ module CapistranoMulticonfigParallel
         end
       end
       EM.error_handler do|e|
-        log_to_file("Error during event loop for worker #{@job_id}: #{e.inspect}", @job_id)
-        log_to_file(e.backtrace, @job_id)
+        log_to_file("Error during event loop for worker #{@job_id}: #{e.inspect}", job_id: @job_id)
+        log_to_file(e.backtrace, job_id: @job_id)
         EM.stop
       end
     end
@@ -93,7 +93,7 @@ module CapistranoMulticonfigParallel
     end
 
     def io_callback(io, data)
-      log_to_file("#{io.upcase} ---- #{data}", @job_id)
+      log_to_file("#{io.upcase} ---- #{data}", job_id: @job_id)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -25,7 +25,7 @@ module CapistranoMulticonfigParallel
 
     def notify_time_change(_topic, _message)
       table = Terminal::Table.new(title: 'Deployment Status Table', headings: ['Job ID', 'Job UUID', 'App/Stage', 'Action', 'ENV Variables', 'Current Task'])
-      jobs = @manager.alive? ? @manager.jobs : []
+      jobs = @manager.alive? ? @manager.jobs.dup : []
       setup_table_jobs(table, jobs)
       display_table_on_terminal(table)
     end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -9,11 +9,11 @@ module CapistranoMulticonfigParallel
     attr_writer :status, :exit_status
 
     delegate :job_stage,
-    :capistrano_action,
-    :build_capistrano_task,
-    :execute_standard_deploy,
-    :setup_command_line_standard,
-    to: :command
+             :capistrano_action,
+             :build_capistrano_task,
+             :execute_standard_deploy,
+             :setup_command_line_standard,
+             to: :command
 
     def initialize(application, options)
       @options = options
@@ -35,7 +35,7 @@ module CapistranoMulticonfigParallel
         { value: id.to_s },
         { value: job_stage },
         { value: capistrano_action },
-        { value: setup_command_line_standard(filtered_keys: [CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]).join("\n") },
+        { value: setup_command_line_standard(filtered_keys: [env_variable]).join("\n") },
         { value: worker_state }
       ]
     end

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -1,5 +1,4 @@
 require_relative './all'
-Gem.find_files('capistrano_multiconfig_parallel/initializers/**/*.rb').each { |path| require path }
 module CapistranoMulticonfigParallel
   # this is the class that will be invoked from terminal , and willl use the invoke task as the primary function.
   class CLI

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -16,6 +16,10 @@ module CapistranoMulticonfigParallel
 
   module_function
 
+    def find_loaded_gem(name)
+      Gem.loaded_specs.values.find { |repo| repo.name == name }
+    end
+
     def percent_of(index, total)
       index.to_f / total.to_f * 100.0
     end

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -16,10 +16,6 @@ module CapistranoMulticonfigParallel
       $stdout.sync = true if $stdout.isatty
     end
 
-    def find_loaded_gem(name)
-      Gem.loaded_specs.values.find { |repo| repo.name == name }
-    end
-
     def ask_stdout_confirmation(message, default)
       result = Ask.input message, default: default
       $stdout.flush
@@ -54,18 +50,25 @@ module CapistranoMulticonfigParallel
       return if error_filtered?(error)
       message = format_error(error)
       puts(message) if output.present?
-      log_to_file(message)
+      log_to_file(message, log_method: 'fatal')
     end
 
-    def format_error(error)
-      JSON.pretty_generate(class_name: error.class,
-                           message: error.respond_to?(:message) ? error.message : error.inspect,
-                           backtrace: error.respond_to?(:backtrace) ? error.backtrace.join("\n\n") : '')
+    def format_error(exception)
+      message = "\n#{exception.class} (#{exception.respond_to?(:message) ? exception.message : exception.inspect}):\n"
+      message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
+      message << '  ' << exception.backtrace.join("\n  ") if exception.respond_to?(:backtrace)
+      message
     end
 
-    def log_to_file(message, job_id = nil)
-      worker_log = job_id.present? ? find_worker_log(job_id) : logger
-      worker_log.debug(message) if worker_log.present? && app_debug_enabled?
+    def log_to_file(message, options = {})
+      worker_log = options.fetch(:job_id, '').present? ? find_worker_log(options[:job_id]) : logger
+      print_to_log_file(worker_log, options.merge(message: message)) if worker_log.present? && app_debug_enabled?
+    end
+
+    def print_to_log_file(worker_log, options = {})
+      ActiveSupport::Deprecation.silence do
+        worker_log.send(options.fetch(:log_method, 'debug'), "#{options.fetch(:message, '')}\n")
+      end
     end
 
     def find_worker_log(job_id)

data/lib/capistrano_multiconfig_parallel/helpers/stages_helper.rb

@@ -1,11 +1,12 @@
 module CapistranoMulticonfigParallel
   # module used to fetch the stages (code taken from https://github.com/railsware/capistrano-multiconfig)
   # TODO: find a way to do this without copying code. Can't currently use gem specification to require that gem
-  # because that is only compatible with capistrano version 3
+  # because seems to not work properly after capistrano/all is required. It seems to only work in Capfile if is required.
+  # Still investigating how to make that work.
   module StagesHelper
   module_function
 
-    def fetch_stages
+    def stages
       fetch_stages_paths do |paths|
         checks_paths(paths)
       end
@@ -25,7 +26,7 @@ module CapistranoMulticonfigParallel
     end
 
     def stages_paths
-      stages_root = 'config/deploy'
+      stages_root = File.expand_path(File.join(detect_root, 'config/deploy'))
       Dir["#{stages_root}/**/*.rb"].map do |file|
         file.slice(stages_root.size + 1..-4).tr('/', ':')
       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 = 21
-    TINY = 8
+    MINOR = 22
+    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.21.8
+  version: 0.22.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -170,6 +170,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-multiconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.8
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement