capistrano_multiconfig_parallel 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26035c748d3494c6c5159791823939332b62f001
-  data.tar.gz: 53592e1501a707b02dbf946a7debb71827f8b9f8
+  metadata.gz: 3969bb2312c4d58de611a321420226dd9a556bed
+  data.tar.gz: 40b5524432fe09ff8240ad910bd784a67e292e91
 SHA512:
-  metadata.gz: 8b680cf811f4dd24cf7374cb69c18ffb25a1335f307b7172c47e85d086c48198ced14301cb7c188050ec242fcdf3b2c85804dbf030da034f02d03dfe76fc5d0a
-  data.tar.gz: 1a746e0c0116857eed89bdfa92b913171858fe6c2fecdaf42cb6be25f74b2d5d1687d91ef02e22d5112992f7d7c4281a6edce03b2b70a2c47414bbe8668c1102
+  metadata.gz: 401ef05ba36d18fb6ac2871c7a4287267cb65c6539e573d4d97bc409ed81874dace93abfdba6ca1106b523694edd9aedcb2cb86f707dadbea82695940fed4afa
+  data.tar.gz: c63ef76946c39e239266876b5166ff20f17cc0aee213d3fd6dcd864f0384ff7a1bdb48b7713a3f48f5749ad4a04db3702f66040ce6ccaa31701eaa2d7791978c

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -159,7 +159,7 @@ module CapistranoMulticonfigParallel
     end
 
     def worker_environments
-      @jobs.map { |job| job['env'] }
+      @jobs.map(&:stage)
     end
 
     def run

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -15,6 +15,15 @@ module CapistranoMulticonfigParallel
       @config
     end
 
+    def configuration_flags
+      default_internal_config.each_with_object({}) do |array_item, hash|
+        key = array_item[0].to_s
+        value = get_prop_config(key, configuration)
+        hash[key] = value.is_a?(Array) ? value.join(',') : value
+        hash
+      end.except('application_dependencies')
+    end
+
     def enable_logging
       enable_file_logging
       set_celluloid_exception_handling
@@ -24,12 +33,16 @@ module CapistranoMulticonfigParallel
       multi_fetch_argv(original_args.dup)
     end
 
+    def job_id
+      original_args_hash.fetch(CapistranoMulticonfigParallel::ENV_KEY_JOB_ID, nil)
+    end
+
     def capistrano_version
       find_loaded_gem_property('capistrano', 'version')
     end
 
     def capistrano_version_2?
-      verify_gem_version('capistrano', '3.0', operator: '<')
+      verify_gem_version(capistrano_version, '3.0', operator: '<')
     end
 
   private

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -28,7 +28,7 @@ module CapistranoMulticonfigParallel
       stderr_buffer.rewind
       old_data = stderr_buffer.read.dup
       new_data = old_data.to_s + data
-      stderr_buffer.write(new_data) if new_data.include?('aborted!')
+      stderr_buffer.write(new_data) if new_data.include?('aborted!') || new_data.include?('Terminating')
     end
 
     def env_variable

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -32,11 +32,16 @@ module CapistranoMulticonfigParallel
 
     def setup_env_options(options = {})
       array_options = []
+      filtered_keys = options.delete(:filtered_keys) || []
       env_options.each do |key, value|
-        array_options << "#{env_prefix(key)} #{env_key_format(key)}=#{value}" if value.present? && !env_option_filtered?(key, options.fetch(:filtered_keys, []))
+        array_options << "#{env_prefix(key)} #{env_key_format(key)}=#{value}" if value.present? && !env_option_filtered?(key, filtered_keys)
       end
+      setup_remaining_flags(array_options, options)
+    end
+
+    def setup_remaining_flags(array_options, options)
       array_options << trace_flag if app_debug_enabled?
-      array_options
+      array_options.concat(setup_flags_for_job(options))
     end
 
     def setup_command_line(*args)
@@ -45,7 +50,7 @@ module CapistranoMulticonfigParallel
     end
 
     def to_s
-      configuration_options = CapistranoMulticonfigParallel.original_args.select { |arg| arg.include?('--') }
+      configuration_options = CapistranoMulticonfigParallel.configuration_flags
       environment_options = setup_command_line(configuration_options).join(' ')
       "cd #{detect_root} && RAILS_ENV=#{stage}  bundle exec multi_cap #{job_stage} #{capistrano_action}  #{environment_options}"
     end

data/lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb

@@ -6,9 +6,9 @@ module CapistranoMulticonfigParallel
   # class used to handle the rake worker and sets all the hooks before and after running the worker
   class RakeTaskHooks
     include CapistranoMulticonfigParallel::ApplicationHelper
-    attr_accessor :task, :env, :config
-    def initialize(task)
-      @env = CapistranoMulticonfigParallel.original_args_hash
+    attr_accessor :job_id, :task
+    def initialize(task = nil)
+      @job_id = CapistranoMulticonfigParallel.job_id
       @task = task.respond_to?(:fully_qualified_name) ? task.fully_qualified_name : task
     end
 
@@ -76,10 +76,6 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id)
     end
 
-    def job_id
-      @env.fetch(CapistranoMulticonfigParallel::ENV_KEY_JOB_ID, nil)
-    end
-
     def rake_actor_id
       "rake_worker_#{job_id}"
     end

data/lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb

@@ -4,7 +4,7 @@ module CapistranoMulticonfigParallel
   module_function
 
     def filtered_env_keys_format(keys)
-      capistrano_version_2? ? keys.map(&:downcase) : keys
+      keys.map { |key| env_key_format(key) }
     end
 
     def env_prefix(key)
@@ -18,5 +18,13 @@ module CapistranoMulticonfigParallel
     def trace_flag
       capistrano_version_2? ? '--verbose' : '--trace'
     end
+
+    def setup_flags_for_job(options)
+      array_options = []
+      options.each do |key, value|
+        array_options << "--#{key}=#{value}"
+      end
+      array_options
+    end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -76,8 +76,7 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def get_prop_config(prop)
-      config = @check_config
+    def get_prop_config(prop, config = @check_config)
       if prop.include?('.')
         multi_level_prop(config, prop)
       else

data/lib/capistrano_multiconfig_parallel/helpers/gem_helper.rb

@@ -3,13 +3,13 @@ module CapistranoMulticonfigParallel
   module GemHelper
   module_function
 
-    def find_loaded_gem(name)
-      Gem.loaded_specs.values.find { |repo| repo.name == name }
+    def find_loaded_gem(name, property = nil)
+      gem_spec = Gem.loaded_specs.values.find { |repo| repo.name == name }
+      property.present? ? gem_spec.send(property) : gem_spec
     end
 
     def find_loaded_gem_property(gem_name, property = 'version')
-      gem_spec = find_loaded_gem(gem_name)
-      gem_spec.respond_to?(property) ? gem_spec.send(property) : nil
+      find_loaded_gem(gem_name, property)
     end
 
     def fetch_gem_version(gem_name)
@@ -23,11 +23,9 @@ module CapistranoMulticonfigParallel
       version.join('.').to_f
     end
 
-    def verify_gem_version(gem_name, version, options = {})
-      options.stringify_keys!
+    def verify_gem_version(gem_version, version, options = {})
       version = get_parsed_version(version)
-      gem_version = fetch_gem_version(gem_name)
-      gem_version.blank? ? false : gem_version.send(options.fetch('operator', '<='), version)
+      get_parsed_version(gem_version).send(options.fetch('operator', '<='), version)
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -74,7 +74,7 @@ module CapistranoMulticonfigParallel
     end
 
     def fail_capfile_not_found(root)
-      fail "Can't detect Capfile in the  application root".red if pathname_is_root?(root)
+      fail "Can't detect Capfile in the  application root".red if root.blank?
     end
 
     def pwd_parent_dir
@@ -93,11 +93,10 @@ module CapistranoMulticonfigParallel
       root.children.find { |file| check_file(file, filename) }.present? || pathname_is_root?(root)
     end
 
-    def try_detect_capfile
+    def try_detect_file(filename = 'capfile')
       root = pwd_parent_dir
-      root = root.parent until find_file_in_directory(root, 'capfile')
-      fail_capfile_not_found(root)
-      root
+      root = root.parent until find_file_in_directory(root, filename)
+      pathname_is_root?(root) ? nil : root
     end
 
     def detect_root
@@ -106,7 +105,9 @@ module CapistranoMulticonfigParallel
       elsif defined?(::Rails)
         ::Rails.root
       else
-        try_detect_capfile
+        root = try_detect_file
+        fail_capfile_not_found(root)
+        root
       end
     end
 

data/lib/capistrano_multiconfig_parallel/initializers/capistrano2.rb

@@ -5,7 +5,7 @@ if CapistranoMulticonfigParallel.capistrano_version_2?
     alias_method :original_ask, :ask
 
     def ask(question, answer_type = String, &details)
-      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(nil)
+      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new
       rake.print_question?(question) do
         original_ask(question, answer_type, &details)
       end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 6
+    TINY = 7
     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: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap