capistrano_multiconfig_parallel 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951c2c37ab7dc5e1ebc9356c94eeefabd2a46783
-  data.tar.gz: 821cafc97c35075c5488980d8e6d0a44d182e72e
+  metadata.gz: 7c4eed71b6e4d4a89cd378fe8db3a8a3e9bf30e7
+  data.tar.gz: 8affa031ae36f442a83d350a4188db99904661a5
 SHA512:
-  metadata.gz: 6dc69605ba2600684c094956e624d2e84f34bbf2c4901f36c8ec7f279f811e92f03df4faea20da40b9a8b7eb8f8e18d354c5ef0b106ff7d09aa420b68fe3538b
-  data.tar.gz: 00e88e2b05782487fd1e44019762ff2ab80a2a56261d00eb310e371a4549a4df9a6c1355884185c6e9fdb9c632caa304c4ac1a0a4f810c72407085bee04b2334
+  metadata.gz: fb874d06f84ca5c37c524484cb3973e595c8048b028e1edecd953d63f6d2b30f173ab2d3fdb8817dfc4afc8951d8e5dd6854e7afe0655c9025405589cfffacb5
+  data.tar.gz: 672d7a3c8d23749206bae3dee35e633a5c3ad8b790b0607ecd33c9b834e8c9513f0db17034d5a2bd7f6fc08c5a2aee1495e7c389fe2b5f2bf4722f77f41ed590

data/README.md

@@ -32,7 +32,7 @@ NEW Improvements started in version 2.0.0.alpha ( currently gem is in stable ver
 
 -	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**
+-	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** . Please consider switching to .ruby-version and .ruby-gemset files instead which are faster and don't require trusting. You can read more about it here [RVM Workflow](https://rvm.io/workflow/projects)
 
 -	**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 )**
 
@@ -44,7 +44,7 @@ Requirements
 
 1.	[celluloid >= 0.16](https://github.com/celluloid/celluloid)
 2.	[celluloid-pmap >= 0.2.2](https://github.com/jwo/celluloid-pmap)
-3.	[celluloid_pubsub >= 0.8.3](https://github.com/bogdanRada/celluloid_pubsub)
+3.	[celluloid_pubsub >= 0.8.4](https://github.com/bogdanRada/celluloid_pubsub)
 4.	[composable_state_machine >= 1.0.2](https://github.com/swoop-inc/composable_state_machine)
 5.	[terminal-table >= 1.5.2](https://github.com/tj/terminal-table)
 6.	[colorize >= 0.7](https://github.com/fazibear/colorize)
@@ -54,17 +54,17 @@ 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 >= 0.0.16](http://github.com/bogdanRada/capistrano_sentinel)
+13.	[capistrano_sentinel >= 0.0.17](http://github.com/bogdanRada/capistrano_sentinel)
 14.	[powerbar >= 1.0.17](https://github.com/busyloop/powerbar)
 
 Compatibility
 -------------
 
-Rails >3.0 only. [MRI 1.9.x or 2.x](http://www.ruby-lang.org)
+[MRI >= 2.2](http://www.ruby-lang.org) due to activesupport dependency. We will accept further compatibilty for **MRI > 2.0 and <= 2.2** pull-requests but no upcoming versions will be tested against it.
 
-Ruby 1.8 is not officially supported. We will accept further compatibilty pull-requests but no upcoming versions will be tested against it.
+Ruby 1.8, 1.9 are not officially supported.
 
-Rubinius and Jruby support temporarily dropped due to Rails 4 incompatibility.
+Rubinius and Jruby support dropped.
 
 Installation Instructions
 -------------------------

data/capistrano_multiconfig_parallel.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(/^(spec)/)
   s.require_paths = ['lib']
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.required_ruby_version = '>= 2.0'
+  s.required_ruby_version = '>= 2.2'
 
   s.add_runtime_dependency 'celluloid', '>= 0.16', '>= 0.16'
   s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.2'
-  s.add_runtime_dependency 'celluloid_pubsub', '~> 0.8', '>= 0.8.3'
+  s.add_runtime_dependency 'celluloid_pubsub', '~> 0.8', '>= 0.8.4'
   s.add_runtime_dependency 'composable_state_machine', '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency 'terminal-table', '~> 1.5', '>= 1.5.2'
   s.add_runtime_dependency 'colorize', '~>  0.7', '>= 0.7'
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'configliere', '~> 0.4', '>=0.4'
   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 'capistrano_sentinel',  '>= 0.0', '>= 0.0.17'
   s.add_runtime_dependency 'powerbar', '~> 1.0', '>= 1.0.17'
 
   s.add_development_dependency 'rake', '>= 10.4', '>= 10.4'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -4,13 +4,14 @@ require 'bundler/setup'
 
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/concern'
+require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/enumerable'
 
-require_relative './helpers/base_actor_helper'
 require 'celluloid/pmap'
 require 'celluloid_pubsub'
-
 require 'composable_state_machine'
 require 'eventmachine'
 require 'right_popen'
@@ -29,10 +30,13 @@ require 'pp'
 require 'yaml'
 require 'stringio'
 require 'io/console'
+require 'forwardable'
 
 # fix error with not files that can not be found
  Gem.find_files('composable_state_machine/**/*.rb').each { |path| require path }
 
+require_relative './helpers/base_actor_helper'
+
 %w(helpers classes celluloid).each do |folder_name|
   Gem.find_files("capistrano_multiconfig_parallel/#{folder_name}/**/*.rb").each { |path| require path }
 end

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -82,7 +82,7 @@ module CapistranoMulticonfigParallel
       @application = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[1]
       @stage = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[0]
       @stage = @stage.present? ? @stage : @default_stage
-      @name, @args = parse_task_string(@top_level_tasks.second)
+      @name, @args = parse_task_string(@top_level_tasks[1])
     end
 
     def collect_command_line_tasks(args) # :nodoc:

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -3,15 +3,13 @@ require_relative '../helpers/base_actor_helper'
 module CapistranoMulticonfigParallel
   # class used to display the progress of each worker on terminal screen using a table
   class TerminalTable
-  include CapistranoMulticonfigParallel::BaseActorHelper
+    extend Forwardable
+    include CapistranoMulticonfigParallel::BaseActorHelper
 
     attr_reader :options, :errors, :manager, :position, :job_manager, :terminal_rows, :screen_erased
 
-    delegate :workers_terminated,
-             to: :manager
-
-    delegate :condition,
-             to: :job_manager
+    def_delegators :@manager, :workers_terminated
+    def_delegators :@job_manager, :condition
 
     def self.topic
       'sshkit_terminal'
@@ -64,12 +62,12 @@ module CapistranoMulticonfigParallel
     def display_table_on_terminal(table, jobs)
       table_size = fetch_table_size(jobs)
       @position, @terminal_rows, @screen_erased = @cursor.display_on_screen(
-        "#{table}",
-        @options.merge(
-          position: @position,
-          table_size: table_size,
-          screen_erased: @screen_erased
-        )
+      "#{table}",
+      @options.merge(
+      position: @position,
+      table_size: table_size,
+      screen_erased: @screen_erased
+      )
       )
       print_errors
     end
@@ -94,7 +92,7 @@ module CapistranoMulticonfigParallel
     end
 
     def managers_alive?
-       @manager.alive?
+      @manager.alive?
     end
 
     def signal_complete

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -25,7 +25,8 @@ module CapistranoMulticonfigParallel
       return [[], {}] if configuration.application_dependencies.blank? || application.blank?
       applications = get_applications_to_deploy(action, [application.camelcase])
       applications = applications.present? ? applications : []
-      app_options = applications.find { |hash| hash['app'] == application }.try(:dup)
+      app_options = applications.find { |hash| hash['app'] == application }
+      app_options = app_options.present? ? app_options.dup : app_options
       applications.delete_if { |hash| hash['app'] == application }
       [applications, (app_options || {})]
     end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -3,13 +3,14 @@ require_relative './job_command'
 module CapistranoMulticonfigParallel
   # class used for defining the job class
   class Job
+    extend Forwardable
     include CapistranoMulticonfigParallel::ApplicationHelper
 
     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
+    def_delegators :@manager, :stderr_buffer
+
 
     def initialize(application, options)
       @options = options.stringify_keys

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -3,11 +3,12 @@ require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class used to find application dependencies
   class JobCommand
-    include FileUtils
+    extend Forwardable
     include CapistranoMulticonfigParallel::ApplicationHelper
 
     attr_reader :job, :job_capistrano_version, :legacy_capistrano, :tempfile, :job_final_gemfile, :job_final_capfile
-    delegate :id, :app, :stage, :action, :task_arguments, :env_options, :path, to: :job
+
+    def_delegators :@job, :id, :app, :stage, :action, :task_arguments, :env_options, :path
 
     def initialize(job)
       @job = job

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -14,106 +14,110 @@ module CapistranoMulticonfigParallel
     include CapistranoMulticonfigParallel::GemHelper
     include CapistranoMulticonfigParallel::CapistranoHelper
 
-    delegate :logger,
-    :configuration,
-    :configuration_valid?,
-    :original_args,
-    to: :CapistranoMulticonfigParallel
+    [
+      :logger,
+      :configuration,
+      :configuration_valid?,
+      :original_args
+    ].each do |method_name|
+        define_method(method_name) do
+          CapistranoMulticonfigParallel.send(method_name)
+        end
+      end
 
+      module_function
 
-    module_function
+      def truncate(string, truncate_at, options = {})
+        return string.dup unless string.length > truncate_at
 
-    def truncate(string, truncate_at, options = {})
-      return string.dup unless string.length > truncate_at
+        options[:omission] ||= '...'
+        length_with_room_for_omission = truncate_at - options[:omission].length
+        stop =        if options[:separator]
+          string.rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission
+        else
+          length_with_room_for_omission
+        end
 
-      options[:omission] ||= '...'
-      length_with_room_for_omission = truncate_at - options[:omission].length
-      stop =        if options[:separator]
-        string.rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission
-      else
-        length_with_room_for_omission
+        "#{string[0...stop]}#{options[:omission]}"
       end
 
-      "#{string[0...stop]}#{options[:omission]}"
-    end
-
-    # Method that is used to parse a string as JSON , if it fails will return nil
-    # @see JSON#parse
-    # @param [string] res The string that will be parsed as JSON
-    # @return [Hash, nil] Returns Hash object if the json parse succeeds or nil otherwise
-    def parse_json(res)
-      return if res.blank?
-      JSON.parse(res)
-    rescue JSON::ParserError
-      nil
-    end
+      # Method that is used to parse a string as JSON , if it fails will return nil
+      # @see JSON#parse
+      # @param [string] res The string that will be parsed as JSON
+      # @return [Hash, nil] Returns Hash object if the json parse succeeds or nil otherwise
+      def parse_json(res)
+        return if res.blank?
+        JSON.parse(res)
+      rescue JSON::ParserError
+        nil
+      end
 
-    def msg_for_stdin?(message)
-      message['action'] == 'stdin'
-    end
+      def msg_for_stdin?(message)
+        message['action'] == 'stdin'
+      end
 
-    def message_is_for_stdout?(message)
-      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['action'] == 'stdout'
-    end
+      def message_is_for_stdout?(message)
+        message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['action'] == 'stdout'
+      end
 
-    def message_is_about_a_task?(message)
-      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present? && message['action'] == 'invoke'
-    end
+      def message_is_about_a_task?(message)
+        message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present? && message['action'] == 'invoke'
+      end
 
-    def message_from_bundler?(message)
-      message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present? && message['action'] == 'bundle_install'
-    end
+      def message_from_bundler?(message)
+        message.present? && message.is_a?(Hash) && message['action'].present? && message['job_id'].present? && message['task'].present? && message['action'] == 'bundle_install'
+      end
 
-    def get_question_details(data)
-      matches = /(.*)\?*\s*\:*\s*(\([^)]*\))*/m.match(data).captures
-      [matches[0], matches[1]]
-    end
+      def get_question_details(data)
+        matches = /(.*)\?*\s*\:*\s*(\([^)]*\))*/m.match(data).captures
+        [matches[0], matches[1]]
+      end
 
-    def setup_command_line_standard(*args)
-      options = args.extract_options!
-      [args.select(&:present?), options]
-    end
+      def setup_command_line_standard(*args)
+        options = args.extract_options!
+        [args.select(&:present?), options]
+      end
 
-    def wrap_string(string, options = {})
-      options.stringify_keys!
-      string.scan(/.{#{options.fetch('length', 80)}}|.+/).map(&:strip).join(options.fetch('character', $INPUT_RECORD_SEPARATOR))
-    end
+      def wrap_string(string, options = {})
+        options.stringify_keys!
+        string.scan(/.{#{options.fetch('length', 80)}}|.+/).map(&:strip).join(options.fetch('character', $INPUT_RECORD_SEPARATOR))
+      end
 
-    def percent_of(index, total)
-      index.to_f / total.to_f * 100.0
-    end
+      def percent_of(index, total)
+        index.to_f / total.to_f * 100.0
+      end
 
-    def action_confirmed?(result)
-      result.present? && result.downcase == 'y'
-    end
+      def action_confirmed?(result)
+        result.present? && result.downcase == 'y'
+      end
 
-    def regex_last_match(number)
-      Regexp.last_match(number)
-    end
+      def regex_last_match(number)
+        Regexp.last_match(number)
+      end
 
-    def parse_task_string(string) # :nodoc:
-      name, remaining_args = fetch_parsed_string(string)
-      name.present? ? find_remaining_args(name, remaining_args) : [string, []]
-    end
+      def parse_task_string(string) # :nodoc:
+        name, remaining_args = fetch_parsed_string(string)
+        name.present? ? find_remaining_args(name, remaining_args) : [string, []]
+      end
 
-    def fetch_parsed_string(string)
-      /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
-      [regex_last_match(1), regex_last_match(2)]
-    end
+      def fetch_parsed_string(string)
+        /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
+        [regex_last_match(1), regex_last_match(2)]
+      end
 
-    def fetch_remaining_arguments(args, remaining_args)
-      /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
-      args << regex_last_match(1).gsub(/\\(.)/, '\1')
-      regex_last_match(2)
-    end
+      def fetch_remaining_arguments(args, remaining_args)
+        /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
+        args << regex_last_match(1).gsub(/\\(.)/, '\1')
+        regex_last_match(2)
+      end
 
-    def find_remaining_args(name, remaining_args)
-      args = []
-      loop do
-        remaining_args = fetch_remaining_arguments(args, remaining_args)
-        break if remaining_args.blank?
+      def find_remaining_args(name, remaining_args)
+        args = []
+        loop do
+          remaining_args = fetch_remaining_arguments(args, remaining_args)
+          break if remaining_args.blank?
+        end
+        [name, args]
       end
-      [name, args]
     end
   end
-end

data/lib/capistrano_multiconfig_parallel/helpers/base_actor_helper.rb

@@ -34,9 +34,14 @@ module CapistranoMulticonfigParallel
     end
 
     module InstanceMethods
-      delegate :version_less_than_seventeen?,
-      to: :'CapistranoMulticonfigParallel::BaseActorHelper::ClassMethods'
-
+      
+      [
+        :version_less_than_seventeen?,
+      ].each do |method_name|
+        define_method(method_name) do
+          CapistranoMulticonfigParallel::BaseActorHelper::ClassMethods.send(method_name)
+        end
+      end
 
       def setup_actor_supervision_details(class_name, options)
         arguments = (options[:args].is_a?(Array) ? options[:args] : [options[:args]]).compact
@@ -44,7 +49,7 @@ module CapistranoMulticonfigParallel
           [options[:actor_name], options[:type], *arguments]
         else
           #supervises_opts = options[:supervises].present? ? { supervises: options[:supervises] } : {}
-         { as: options[:actor_name], type: options[:type], args: arguments, size: options.fetch(:size, nil) }
+          { as: options[:actor_name], type: options[:type], args: arguments, size: options.fetch(:size, nil) }
         end
       end
 

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -89,9 +89,7 @@ module CapistranoMulticonfigParallel
     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
+      worker_log.send(options.fetch(:log_method, 'debug'), "#{options.fetch(:message, '')}\n")
     end
 
     def find_worker_log(job_id, prefix = nil)

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -3,22 +3,6 @@ module CapistranoMulticonfigParallel
   module InternalHelper
     module_function
 
-    def get_current_gem_name
-      searcher = if Gem::Specification.respond_to? :find
-        # ruby 2.0
-        Gem::Specification
-      elsif Gem.respond_to? :searcher
-        # ruby 1.8/1.9
-        Gem.searcher.init_gemspecs
-      end
-      spec = unless searcher.nil?
-        searcher.find do |spec|
-          File.fnmatch(File.join(spec.full_gem_path,'*'), __FILE__)
-        end
-      end
-      spec.name if spec.present?
-    end
-
   def get_current_gem_name
       searcher = if Gem::Specification.respond_to? :find
         # ruby 2.0
@@ -90,7 +74,7 @@ module CapistranoMulticonfigParallel
 
     def find_config_type(type)
       type = type.to_s
-      %w(boolean filename string).include?(type) ? type.delete(':').to_sym : type.constantize
+      %w(boolean filename string).include?(type) ? type.delete(':').to_sym : type.to_s.constantize
     end
 
     def find_env_multi_cap_root

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -9,7 +9,7 @@ module CapistranoMulticonfigParallel
 
     MAJOR = 2
     MINOR = 0
-    TINY = 8
+    TINY = 9
     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.8
+  version: 2.0.9
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -53,7 +53,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: composable_state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +247,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
 - !ruby/object:Gem::Dependency
   name: powerbar
   requirement: !ruby/object:Gem::Requirement
@@ -545,7 +545,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -553,7 +553,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: CapistranoMulticonfigParallel is a simple ruby implementation that allows