capistrano_multiconfig_parallel 0.32.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2058afba53f3625fe0253f9ea80bcfcd83928f
-  data.tar.gz: 6d568cea8e8d7e5501166d5e0fe3f2a8c5fd4baa
+  metadata.gz: d913f859f09d3474f80d0ebc9df04c6207dbad68
+  data.tar.gz: 0fa7d2ff36d4f718ace5e149e7dec0939fd8479b
 SHA512:
-  metadata.gz: e18832aa02656f2de014326cc40c3cc7b9107c2c9e32b0c9c8edc9a542054f55d8fe9cf86f2a545006f733adcc4656af66ee76285b70d6f433ddf10748eb7861
-  data.tar.gz: c3b95a15ab8d3a962d1013918d082b6bd76ddb074d9bdf3d51d9c4dd6c8216223ecfafc937412ca0bfe575d79207d416c1843e2a5640023ce2c902b641b6914f
+  metadata.gz: 53e7738c4d3b8ff65dc9a2e2758af6880562c6e9482a54de930368d27ec16bfc5e416232aea4e4392d5f918f728bfb0f7011e9c5ae657580cba2f4991abe28fb
+  data.tar.gz: 2f064bbc1b8d6ef2ed23132b8d67ca33bc94964cb2ba2381fbb3dc7e0345d5d5dd32c0d2d05efebe8518eee2c953994cde511a1a9345e66ede2ec74b1ae7feb7

data/README.md

@@ -17,6 +17,13 @@ IMPORTANT! The whole reason for this gem was for using [Caphub](https://github.c
 
 CAUTION!! PLEASE READ CAREFULLY!! Capistrano is not thread-safe. However in order to work around this problem, each of the task is executing inside a thread that spawns a new process in order to run capistrano tasks The thread monitors the process. This works well, however if the tasks you are executing is working with files, you might get into deadlocks because multiple proceses try to access same resource. Instead of using files , please consider using StringIO instead.
 
+NEW Improvements in version 1.0.0
+---------------------------------
+
+-	added support for Capistrano version 2
+-	a lot of refactoring and bug fixes
+-	removed Branch variable ( this needs to be passed when asked for additional env options for each job!!!).
+
 Requirements
 ------------
 
@@ -29,11 +36,12 @@ Requirements
 7.	[colorize >= 0.7](https://github.com/fazibear/colorize)
 8.	[eventmachine >= 1.0.3](https://github.com/eventmachine/eventmachine)
 9.	[right_popen >= 1.1.3](https://github.com/rightscale/right_popen)
-10.	[capistrano >= 3.0](https://github.com/capistrano/capistrano/)
+10.	[capistrano >= 2.0](https://github.com/capistrano/capistrano/)
 11.	[configliere >= 0.4](https://github.com/infochimps-platform/configliere)
 12.	[inquirer >= 0.2](https://github.com/arlimus/inquirer.rb)
 13.	[devnull >= 0.1](https://github.com/arlimus/inquirer.rb)
 14.	[rack >= 1.6](http://rack.github.io/)
+15.	[rake >= 10.4](https://github.com/ruby/rake)
 
 Compatibility
 -------------
@@ -157,13 +165,13 @@ development_stages:
 #<development_stage> - the name of one of the stages you previously configured
 #<task_name> - the capistrano task that you want to execute ( example: 'deploy' )
 
-bundle exec multi_cap  <development_stage> <task_name>   BOX=<box_name>,<box_name>
+bundle exec multi_cap  <development_stage> <task_name>   BOX=<box_name>,<box_name>  
 
 ```
 
-If a branch is specified using **BRANCH=name** it will deploy same branch to all sandboxes The branch environment variable is then passed to the capistrano task
+For Capistrano 2 please use **-S box=<box_name>,<box_name>**
 
-Also the script will ask if there are any other environment variables that user might want to pass to each of the sandboxes separately.
+The script will ask if there are any other environment variables that user might want to pass to each of the sandboxes separately.
 
 ### 1.2) Deploying the application to multiple stages ( Using the customized command "deploy_multi_stages")
 
@@ -174,9 +182,7 @@ bundle exec multi_cap deploy_multi_stages  STAGES=development, staging, producti
 
 NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=task_name** either when you specify the STAGES, or can be done individually for each task when prompted about additional ENV options
 
-If a branch is specified using **BRANCH=name** it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
-
-Also the script will ask if there are any other environment variables that user might want to pass to each of the stages separately.
+The script will ask if there are any other environment variables that user might want to pass to each of the stages separately.
 
 If you use **capistrano-gitflow**, the workers will first deploy to all the other stages and only after staging is tagged , will trigger a new worker to start deploying to production
 
@@ -228,7 +234,7 @@ Demo:
 
 NOTE: IF you want to execute a different command on all stages, you can specify environment variable **ACTION=task_name** either when you specify the STAGES, or can be done individually for each task when prompted about additional ENV options
 
-If a branch is specified using **BRANCH=branch_name** it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task If you want different branches , capistrano will ask for additional ENV options for each stage, and can be specified then for each stage
+The script will ask for additional ENV options for each stage.
 
 If you use **capistrano-gitflow**, the workers will first deploy to all the other stages and only after staging is tagged , will trigger a new worker to start deploying to production
 

data/capistrano_multiconfig_parallel.gemspec

@@ -25,12 +25,13 @@ Gem::Specification.new do |s|
   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'
-  s.add_runtime_dependency 'capistrano','~> 3.0','>= 3.0'
+  s.add_runtime_dependency 'capistrano','>= 2.0','>= 2.0'
   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'
   s.add_runtime_dependency 'devnull','~> 0.1', '>= 0.1'
   s.add_runtime_dependency 'rack', '~> 1.6', '>= 1.6'
+  s.add_runtime_dependency 'rake', '~> 10.4', '>= 10.4'
 
   s.add_development_dependency 'rspec-rails', '~> 3.3', '>= 3.3'
   s.add_development_dependency 'guard', '~> 2.13', '>= 2.13'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -28,15 +28,18 @@ require 'io/console'
 
 # 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 }
 
-%w(classes helpers celluloid initializers).each do |folder_name|
+%w(helpers classes celluloid core_ext).each do |folder_name|
   Gem.find_files("capistrano_multiconfig_parallel/#{folder_name}/**/*.rb").each { |path| require path }
 end
 
 require_relative './version'
 require_relative './base'
 require_relative './application'
+
+%w(initializers).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

@@ -5,7 +5,7 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :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, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
 
     def initialize
       Celluloid.boot
@@ -47,12 +47,6 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def backup_the_branch
-      return if custom_command? || @argv['BRANCH'].blank?
-      @branch_backup = @argv['BRANCH'].to_s
-      @argv['BRANCH'] = nil
-    end
-
     def custom_command?
       if multi_apps?
         !stages.include?(@top_level_tasks.first) && custom_commands.include?(@top_level_tasks.first)
@@ -91,8 +85,12 @@ module CapistranoMulticonfigParallel
       @top_level_tasks.push(Rake.application.default_task_name) if @top_level_tasks.blank?
     end
 
+    def action_key
+      capistrano_version_2? ? 'action' : 'ACTION'
+    end
+
     def verify_options_custom_command(options)
-      options[:action] = @argv['ACTION'].present? ? @argv['ACTION'] : 'deploy'
+      options[:action] = @argv[action_key].present? ? @argv[action_key] : 'deploy'
       options
     end
 
@@ -107,7 +105,6 @@ module CapistranoMulticonfigParallel
       options = prepare_options(options)
       options = options.stringify_keys
       apps = @dependency_tracker.fetch_apps_needed_for_deployment(options['app'], options['action'])
-      backup_the_branch if multi_apps?
       deploy_multiple_apps(apps, options)
       deploy_app(options) if !custom_command? || !multi_apps?
     end
@@ -126,8 +123,12 @@ module CapistranoMulticonfigParallel
       find_loaded_gem('capistrano-gitflow').present?
     end
 
+    def stages_key
+      capistrano_version_2? ? 'stages' : 'STAGES'
+    end
+
     def fetch_multi_stages
-      custom_stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
+      custom_stages = @argv[stages_key].blank? ? '' : @argv[stages_key]
       custom_stages = strip_characters_from_string(custom_stages).split(',').compact if custom_stages.present?
       custom_stages = custom_stages.present? ? custom_stages : [@default_stage]
       custom_stages
@@ -147,9 +148,7 @@ module CapistranoMulticonfigParallel
 
     def deploy_app(options = {})
       options = options.stringify_keys
-      branch = @branch_backup.present? ? @branch_backup : @argv['BRANCH'].to_s
       call_task_deploy_app({
-        branch: branch,
         app: options['app'],
         action: options['action']
       }.reverse_merge(options))
@@ -178,12 +177,17 @@ module CapistranoMulticonfigParallel
       process_jobs
     end
 
+    def boxes_key
+      capistrano_version_2? ? 'box' : 'BOX'
+    end
+
     def call_task_deploy_app(options = {})
       options = options.stringify_keys
-      main_box_name = @argv['BOX'].blank? ? '' : @argv['BOX']
+      main_box_name = @argv[boxes_key].blank? ? '' : @argv[boxes_key]
+      boxes = strip_characters_from_string(main_box_name).split(',').compact
       stage = options.fetch('stage', @default_stage)
-      if configuration.development_stages.include?(stage) && main_box_name.present? && /^[a-z0-9,]+/.match(main_box_name)
-        execute_on_multiple_boxes(main_box_name, options)
+      if configuration.development_stages.include?(stage) && boxes.present?
+        execute_on_multiple_boxes(boxes, options)
       else
         prepare_job(options)
       end
@@ -212,21 +216,19 @@ module CapistranoMulticonfigParallel
       terminate
     end
 
-    # rubocop:disable CyclomaticComplexity
     def prepare_job(options)
       options = options.stringify_keys
-      branch_name = options.fetch('branch', {})
       app = options.fetch('app', '')
-      box = options['env_options']['BOX']
+      box = options['env_options'][boxes_key]
       message = box.present? ? "BOX #{box}:" : "stage #{options['stage']}:"
       env_opts = get_app_additional_env_options(app, message)
 
       options['env_options'] = options['env_options'].reverse_merge(env_opts)
 
-      env_options = branch_name.present? ? { 'BRANCH' => branch_name }.merge(options['env_options']) : options['env_options']
-      job_env_options = custom_command? && env_options['ACTION'].present? ? env_options.except('ACTION') : env_options
+      env_options = options['env_options']
+      job_env_options = custom_command? ? env_options.except(action_key) : env_options
       job = CapistranoMulticonfigParallel::Job.new(Actor.current, options.merge(
-                                                                    action: custom_command? && env_options['ACTION'].present? ? env_options['ACTION'] : options['action'],
+                                                                    action: custom_command? && env_options[action_key].present? ? env_options[action_key] : options['action'],
                                                                     env_options: job_env_options
 
       ))
@@ -253,10 +255,9 @@ module CapistranoMulticonfigParallel
       options
     end
 
-    def execute_on_multiple_boxes(main_box_name, options)
-      boxes = strip_characters_from_string(main_box_name).split(',').compact
+    def execute_on_multiple_boxes(boxes, options)
       boxes.each do |box_name|
-        options['env_options']['BOX'] = box_name
+        options['env_options'][boxes_key] = box_name
         prepare_job(options)
       end
     end

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -6,15 +6,28 @@ module CapistranoMulticonfigParallel
   GITFLOW_VERIFY_UPTODATE_TASK = 'gitflow:verify_up_to_date'
 
   class << self
-    attr_accessor :logger, :original_args
+    attr_accessor :logger, :original_args, :config, :config_keys
     include CapistranoMulticonfigParallel::Configuration
-    include CapistranoMulticonfigParallel::CoreHelper
+    include CapistranoMulticonfigParallel::GemHelper
+
+    def configuration
+      @config ||= fetch_configuration
+      @config
+    end
 
     def enable_logging
       enable_file_logging
       set_celluloid_exception_handling
     end
 
+    def capistrano_version
+      find_loaded_gem_property('capistrano', 'version')
+    end
+
+    def capistrano_version_2?
+      verify_gem_version('capistrano', '3.0', operator: '<')
+    end
+
   private
 
     def set_celluloid_exception_handling
@@ -22,7 +35,7 @@ module CapistranoMulticonfigParallel
       Celluloid.task_class = Celluloid::TaskThread
       Celluloid.exception_handler do |ex|
         unless ex.is_a?(Interrupt)
-        rescue_error(ex, 'stderr')
+          rescue_error(ex, 'stderr')
         end
       end
     end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -16,10 +16,12 @@ module CapistranoMulticonfigParallel
     trap_exit :worker_died
 
     def initialize(job_manager)
-      # start SupervisionGroup
-      @worker_supervisor = Celluloid::SupervisionGroup.run!
       @job_manager = job_manager
       @registration_complete = false
+      return if configuration.multi_secvential.to_s.downcase == 'true'
+      # start SupervisionGroup
+      @worker_supervisor = Celluloid::SupervisionGroup.run!
+
       # Get a handle on the SupervisionGroup::Member
       @mutex = Mutex.new
       # http://rubydoc.info/gems/celluloid/Celluloid/SupervisionGroup/Member

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -80,7 +80,7 @@ module CapistranoMulticonfigParallel
       elsif msg_for_stdin?(message)
         stdin_approval(message)
       else
-        show_warning "unknown action: #{message.inspect}"
+        show_warning "unknown message: #{message.inspect}"
       end
     end
 
@@ -103,16 +103,16 @@ module CapistranoMulticonfigParallel
       if @job_id == message['job_id']
         @stdin_result = message.fetch('result', '')
       else
-        show_warning "unknown invocation #{message.inspect}"
+        show_warning "unknown stdin_approval #{message.inspect}"
       end
     end
 
     def task_approval(message)
       return unless msg_for_task?(message)
-      if @job_id == message['job_id'] && message['task'] == task_name && message['approved'] == 'yes'
+      if @job_id == message['job_id'] && message['task'].to_s == task_name.to_s && message['approved'] == 'yes'
         @task_approved = true
       else
-        show_warning "unknown invocation #{message.inspect}"
+        show_warning "unknown task_approval #{message.inspect} #{task_data}"
       end
     end
 

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -57,7 +57,7 @@ module CapistranoMulticonfigParallel
 
     def worker_state
       default = status.to_s.upcase.red
-      worker.alive? ? worker.worker_state : default
+      worker.present? && worker.alive? ? worker.worker_state : default
     end
 
     def id

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -14,7 +14,7 @@ module CapistranoMulticonfigParallel
     end
 
     def filtered_env_keys
-      %w(STAGES ACTION)
+      filtered_env_keys_format(%w(STAGES ACTION))
     end
 
     def job_stage
@@ -27,15 +27,15 @@ module CapistranoMulticonfigParallel
     end
 
     def env_option_filtered?(key, filtered_keys_array = [])
-      filtered_env_keys.include?(key) || filtered_keys_array.include?(key.to_s)
+      filtered_env_keys.include?(env_key_format(key)) || filtered_keys_array.include?(key.to_s)
     end
 
     def setup_env_options(options = {})
       array_options = []
       env_options.each do |key, value|
-        array_options << "#{key}=#{value}" if value.present? && !env_option_filtered?(key, options.fetch(:filtered_keys, []))
+        array_options << "#{env_prefix} #{env_key_format(key)}=#{value}" if value.present? && !env_option_filtered?(key, options.fetch(:filtered_keys, []))
       end
-      array_options << '--trace' if app_debug_enabled?
+      array_options << trace_flag if app_debug_enabled?
       array_options
     end
 
@@ -45,8 +45,9 @@ module CapistranoMulticonfigParallel
     end
 
     def to_s
-      environment_options = setup_command_line.join(' ')
-      "cd #{detect_root} && RAILS_ENV=#{@stage}  bundle exec multi_cap #{job_stage} #{capistrano_action}  #{environment_options}"
+      configuration_options = CapistranoMulticonfigParallel.original_args.select { |arg| arg.include?('--') }
+      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
 
     def to_json
@@ -54,8 +55,7 @@ module CapistranoMulticonfigParallel
     end
 
     def execute_standard_deploy(action = nil)
-      command = build_capistrano_task(action)
-      run_shell_command(command)
+      run_shell_command(to_s)
     rescue => ex
       rescue_error(ex, 'stderr')
       execute_standard_deploy('deploy:rollback') if action.blank? && @name == 'deploy'

data/lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb

@@ -1,17 +1,20 @@
 require_relative '../celluloid/rake_worker'
 require_relative './input_stream'
 require_relative './output_stream'
+require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class used to handle the rake worker and sets all the hooks before and after running the worker
   class RakeTaskHooks
-    attr_accessor :task, :env
-    def initialize(env, task)
+    include CapistranoMulticonfigParallel::ApplicationHelper
+    attr_accessor :task, :env, :config
+    def initialize(env, task, config = nil)
       @env = env
       @task = task
+      @config = config
     end
 
     def automatic_hooks(&block)
-      if job_id.present?
+      if configuration.multi_secvential.to_s.downcase == 'false' && job_id.present? && @task.present?
         actor_start_working
         actor.wait_execution until actor.task_approved
         actor_execute_block(&block)
@@ -66,7 +69,7 @@ module CapistranoMulticonfigParallel
     end
 
     def job_id
-      @env[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]
+      capistrano_version_2? ? @config.fetch(CapistranoMulticonfigParallel::ENV_KEY_JOB_ID, nil) : @env[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]
     end
 
     def rake_actor_id

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -9,6 +9,7 @@ module CapistranoMulticonfigParallel
       def start
         before_start
         arguments = multi_fetch_argv(original_args)
+        configuration_valid?
         execute_start(arguments)
       end
 
@@ -16,6 +17,17 @@ module CapistranoMulticonfigParallel
         if arguments[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
           run_the_application
         else
+          ARGV.reject! { |arg| configuration.keys.map(&:to_s).include?(arg.split('=')[0].tr('--', '')) }
+          run_capistrano
+        end
+      end
+
+      def run_capistrano
+        if capistrano_version_2?
+          require 'capistrano/cli'
+          Capistrano::CLI.execute
+        else
+          require 'capistrano/all'
           Capistrano::Application.new.run
         end
       end
@@ -27,7 +39,6 @@ module CapistranoMulticonfigParallel
 
       def run_the_application
         execute_with_rescue('stderr') do
-          configuration_valid?
           CapistranoMulticonfigParallel::Application.new.start
         end
       end

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -1,16 +1,24 @@
 require_relative './core_helper'
 require_relative './internal_helper'
 require_relative './stages_helper'
+require_relative './gem_helper'
+require_relative './parse_helper'
+require_relative './capistrano_helper'
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module ApplicationHelper
     include CapistranoMulticonfigParallel::InternalHelper
     include CapistranoMulticonfigParallel::CoreHelper
+    include CapistranoMulticonfigParallel::ParseHelper
     include CapistranoMulticonfigParallel::StagesHelper
+    include CapistranoMulticonfigParallel::GemHelper
+    include CapistranoMulticonfigParallel::CapistranoHelper
 
     delegate :logger,
              :configuration,
              :configuration_valid?,
+             :capistrano_version_2?,
+             :capistrano_version,
              :original_args,
              to: :CapistranoMulticonfigParallel
 
@@ -40,10 +48,6 @@ module CapistranoMulticonfigParallel
       string.scan(/.{#{options.fetch('length', 80)}}|.+/).map(&:strip).join(options.fetch('character', $INPUT_RECORD_SEPARATOR))
     end
 
-    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
@@ -62,44 +66,6 @@ module CapistranoMulticonfigParallel
       result.present? && result.downcase == 'y'
     end
 
-    def check_numeric(num)
-      /^[0-9]+/.match(num.to_s)
-    end
-
-    def verify_empty_options(options)
-      if options.is_a?(Hash)
-        options.reject { |_key, value| value.blank? }
-      elsif options.is_a?(Array)
-        options.reject(&:blank?)
-      else
-        options
-      end
-    end
-
-    def verify_array_of_strings(value)
-      value.reject(&:blank?)
-      warn_array_without_strings(value)
-    end
-
-    def warn_array_without_strings(value)
-      raise ArgumentError, 'the array must contain only task names' if value.find { |row| !row.is_a?(String) }
-    end
-
-    def check_hash_set(hash, props)
-      !Set.new(props).subset?(hash.keys.to_set) || hash.values.find(&:blank?).present?
-    end
-
-    def value_is_array?(value)
-      value.present? && value.is_a?(Array)
-    end
-
-    def strip_characters_from_string(value)
-      return '' if value.blank?
-      value = value.delete("\r\n").delete("\n")
-      value = value.gsub(/\s+/, ' ').strip
-      value
-    end
-
     def regex_last_match(number)
       Regexp.last_match(number)
     end

data/lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb

@@ -0,0 +1,22 @@
+module CapistranoMulticonfigParallel
+  # helper methods used for capistrano actions
+  module CapistranoHelper
+  module_function
+
+    def filtered_env_keys_format(keys)
+      capistrano_version_2? ? keys.map(&:downcase) : keys
+    end
+
+    def env_prefix
+      capistrano_version_2? ? '-S' : ''
+    end
+
+    def env_key_format(key)
+      capistrano_version_2? ? key.downcase : key
+    end
+
+    def trace_flag
+      capistrano_version_2? ? '--debug' : '--trace'
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -1,96 +1,95 @@
-require_relative './application_helper'
+require_relative './core_helper'
+require_relative './internal_helper'
+require_relative './parse_helper'
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module Configuration
-    extend ActiveSupport::Concern
+    include CapistranoMulticonfigParallel::CoreHelper
+    include CapistranoMulticonfigParallel::InternalHelper
+    include CapistranoMulticonfigParallel::ParseHelper
 
-    included do
-      include CapistranoMulticonfigParallel::ApplicationHelper
-      attr_reader :configuration
-
-      def configuration
-        @config ||= fetch_configuration
-        @config
-      end
-
-      def fetch_configuration
-        @fetched_config = Configliere::Param.new
-        setup_default_config
-        setup_configuration
-      end
+    def fetch_configuration
+      @fetched_config = Configliere::Param.new
+      setup_default_config
+      setup_configuration
+    end
 
-      def setup_default_config
-        default_internal_config.each do |array_param|
-          @fetched_config.define array_param[0], array_param[1].symbolize_keys
-        end
+    def setup_default_config
+      default_internal_config.each do |array_param|
+        @fetched_config.define array_param[0], array_param[1].symbolize_keys
       end
+    end
 
-      def setup_configuration
-        @fetched_config.read config_file if File.file?(config_file)
-        @fetched_config.use :commandline
+    def setup_configuration
+      @fetched_config.read config_file if File.file?(config_file)
+      @fetched_config.use :commandline
 
-        @fetched_config.use :config_block
-        validate_configuration
-      end
+      @fetched_config.use :config_block
+      validate_configuration
+    end
 
-      def validate_configuration
-        @fetched_config.finally do |config|
-          @check_config = config.stringify_keys
-          check_configuration
-        end
-        @fetched_config.process_argv!
-        @fetched_config.resolve!
+    def validate_configuration
+      @fetched_config.finally do |config|
+        check_configuration(config)
       end
+      @fetched_config.process_argv!
+      @fetched_config.resolve!
+      @fetched_config
+    end
 
-      def verify_application_dependencies(value, props)
-        return unless value.is_a?(Array)
-        value.reject { |val| val.blank? || !val.is_a?(Hash) }
-        wrong = check_array_of_hash(value, props.map(&:to_sym))
-        raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
-      end
+    def verify_application_dependencies(value, props)
+      return unless value.is_a?(Array)
+      value.reject { |val| val.blank? || !val.is_a?(Hash) }
+      wrong = check_array_of_hash(value, props.map(&:to_sym))
+      raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
+    end
 
-      def check_array_of_hash(value, props)
-        value.find do|hash|
-          check_hash_set(hash, props)
-        end
+    def check_array_of_hash(value, props)
+      value.find do|hash|
+        check_hash_set(hash, props)
       end
+    end
 
-      def check_boolean(prop)
-        value = get_prop_config(prop)
-        raise ArgumentError, "the property `#{prop}` must be boolean" unless %w(true false).include?(value.to_s.downcase)
+    def check_boolean(prop)
+      value = get_prop_config(prop)
+      if %w(true false).include?(value.to_s.downcase)
+        true
+      else
+        raise ArgumentError, "the property `#{prop}` must be boolean"
       end
+    end
 
-      def configuration_valid?
-        configuration
-      end
+    def configuration_valid?
+      configuration
+    end
 
-      def check_boolean_props(props)
-        props.each do |prop|
-          @check_config.send("#{prop}=", get_prop_config(prop)) if check_boolean(prop)
-        end
+    def check_boolean_props(props)
+      props.each do |prop|
+        @check_config[prop] = get_prop_config(prop) if check_boolean(prop)
       end
+    end
 
-      def check_array_props(props)
-        props.each do |prop|
-          value = get_prop_config(prop)
-          @check_config.send("#{prop}=", value) if value_is_array?(value) && verify_array_of_strings(value)
-        end
+    def check_array_props(props)
+      props.each do |prop|
+        value = get_prop_config(prop)
+        @check_config[prop] = value if value_is_array?(value) && verify_array_of_strings(value)
       end
+    end
 
-      def get_prop_config(prop)
-        config = @check_config
-        if prop.include?('.')
-          multi_level_prop(config, prop)
-        else
-          config[prop]
-        end
+    def get_prop_config(prop)
+      config = @check_config
+      if prop.include?('.')
+        multi_level_prop(config, prop)
+      else
+        config[prop]
       end
+    end
 
-      def check_configuration
-        check_boolean_props(%w(multi_debug multi_secvential websocket_server.enable_debug websocket_server.use_redis terminal.clear_screen))
-        check_array_props(%w(task_confirmations development_stages apply_stage_confirmation))
-        verify_application_dependencies(@check_config['application_dependencies'], %w(app priority dependencies))
-      end
+    def check_configuration(config)
+      @check_config = config.stringify_keys
+      check_boolean_props(%w(multi_debug multi_secvential websocket_server.enable_debug websocket_server.use_redis terminal.clear_screen))
+      check_array_props(%w(task_confirmations development_stages apply_stage_confirmation))
+      verify_application_dependencies(@check_config['application_dependencies'], %w(app priority dependencies))
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -52,10 +52,14 @@ module CapistranoMulticonfigParallel
       Celluloid::Actor[:terminal_server]
     end
 
+    def terminal_errors?
+      terminal_actor.present? && terminal_actor.alive? && terminal_actor.errors.is_a?(Array)
+    end
+
     def log_output_error(error, output, message)
       return if error_filtered?(error)
       puts message if output.present?
-      terminal_actor.errors.push(message) if terminal_actor.alive?
+      terminal_actor.errors.push(message) if terminal_errors?
     end
 
     def format_error(exception)

data/lib/capistrano_multiconfig_parallel/helpers/gem_helper.rb

@@ -0,0 +1,33 @@
+module CapistranoMulticonfigParallel
+  # helper used to determine gem versions
+  module GemHelper
+  module_function
+
+    def find_loaded_gem(name)
+      Gem.loaded_specs.values.find { |repo| repo.name == name }
+    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
+    end
+
+    def fetch_gem_version(gem_name)
+      version = find_loaded_gem_property(gem_name)
+      version.blank? ? nil : get_parsed_version(version)
+    end
+
+    def get_parsed_version(version)
+      version = version.to_s.split('.')
+      version.pop until version.size == 2
+      version.join('.').to_f
+    end
+
+    def verify_gem_version(gem_name, version, options = {})
+      options.stringify_keys!
+      version = get_parsed_version(version)
+      gem_version = fetch_gem_version(gem_name)
+      gem_version.blank? ? false : gem_version.send(options.fetch('operator', '<='), version)
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/helpers/parse_helper.rb

@@ -0,0 +1,44 @@
+module CapistranoMulticonfigParallel
+  # module used for parsing numbers, strings , arrays and hashes
+  module ParseHelper
+  module_function
+
+    def check_numeric(num)
+      /^[0-9]+/.match(num.to_s)
+    end
+
+    def verify_empty_options(options)
+      if options.is_a?(Hash)
+        options.reject { |_key, value| value.blank? }
+      elsif options.is_a?(Array)
+        options.reject(&:blank?)
+      else
+        options
+      end
+    end
+
+    def verify_array_of_strings(value)
+      value = verify_empty_options(value)
+      value.find { |row| !row.is_a?(String) }.present? ? warn_array_without_strings(value) : true
+    end
+
+    def warn_array_without_strings(value)
+      raise ArgumentError, "the array #{value} must contain only task names"
+    end
+
+    def check_hash_set(hash, props)
+      !Set.new(props).subset?(hash.keys.to_set) || hash.values.find(&:blank?).present?
+    end
+
+    def value_is_array?(value)
+      value.present? && value.is_a?(Array)
+    end
+
+    def strip_characters_from_string(value)
+      return '' if value.blank?
+      value = value.delete("\r\n").delete("\n")
+      value = value.gsub(/\s+/, ' ').strip
+      value
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/initializers/capistrano2.rb

@@ -0,0 +1,24 @@
+if CapistranoMulticonfigParallel.capistrano_version_2?
+  require 'capistrano/cli'
+  Capistrano::Configuration::Execution.class_eval do
+    alias_method :original_execute_task, :execute_task
+
+    def execute_task(task)
+      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, task, self)
+      rake.automatic_hooks do
+        original_execute_task(task)
+      end
+    end
+  end
+
+  Capistrano::Configuration::Callbacks.class_eval do
+    alias_method :original_trigger, :trigger
+
+    def trigger(event, task = nil)
+      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, task, self)
+      rake.automatic_hooks do
+        original_trigger(event, task)
+      end
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -6,8 +6,8 @@ module CapistranoMulticonfigParallel
 
   # module used for generating the version
   module VERSION
-    MAJOR = 0
-    MINOR = 32
+    MAJOR = 1
+    MINOR = 0
     TINY = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 1.0.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -174,22 +174,16 @@ dependencies:
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   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'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +284,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -659,10 +673,14 @@ files:
 - lib/capistrano_multiconfig_parallel/cli.rb
 - lib/capistrano_multiconfig_parallel/configuration/default.yml
 - lib/capistrano_multiconfig_parallel/helpers/application_helper.rb
+- lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/configuration.rb
 - lib/capistrano_multiconfig_parallel/helpers/core_helper.rb
+- lib/capistrano_multiconfig_parallel/helpers/gem_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb
+- lib/capistrano_multiconfig_parallel/helpers/parse_helper.rb
 - lib/capistrano_multiconfig_parallel/helpers/stages_helper.rb
+- lib/capistrano_multiconfig_parallel/initializers/capistrano2.rb
 - lib/capistrano_multiconfig_parallel/initializers/rake.rb
 - lib/capistrano_multiconfig_parallel/initializers/websocket.rb
 - lib/capistrano_multiconfig_parallel/version.rb