capistrano_multiconfig_parallel 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3969bb2312c4d58de611a321420226dd9a556bed
-  data.tar.gz: 40b5524432fe09ff8240ad910bd784a67e292e91
+  metadata.gz: 50bc1ddfa761688a5fd56d8eaf83da2e9a632056
+  data.tar.gz: f3a60a12be7b53b63947b199154c6fc20c40c729
 SHA512:
-  metadata.gz: 401ef05ba36d18fb6ac2871c7a4287267cb65c6539e573d4d97bc409ed81874dace93abfdba6ca1106b523694edd9aedcb2cb86f707dadbea82695940fed4afa
-  data.tar.gz: c63ef76946c39e239266876b5166ff20f17cc0aee213d3fd6dcd864f0384ff7a1bdb48b7713a3f48f5749ad4a04db3702f66040ce6ccaa31701eaa2d7791978c
+  metadata.gz: a253a2b2d5e22482b69b9ff2aa7f4a8051cddaacffe45a60e580e16e5d6a25460557d00dee87fbebbcc4af261264102d4e83771afab11949a4281802d161339b
+  data.tar.gz: 95db1686f2850e55b7650e4caec8757aabdc3b79834de84220909ec2b92897eff153a26aedbb4c6d2597dfb538380d0be0f792874bbedde4b67cfda961e56b45

data/README.md

@@ -17,6 +17,12 @@ 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.1.0
+---------------------------------
+
+-	a lot of refactoring and bug fixes
+-	added posibility to run the deployments from a single directory and is described at section **[2.2) Deploying multiple applications from a central location](#22-deploying-multiple-applications-from-a-central-location)**
+
 NEW Improvements in version 1.0.5
 ---------------------------------
 
@@ -169,11 +175,11 @@ bundle exec multi_cap  <development_stage> <task_name>   BOX=<box_name>,<box_nam
 
 ```
 
-For Capistrano 2 please use **-S box=<box_name>,<box_name>**
+For Capistrano 2 application, the jobs will receive **-S box=<box_name>,<box_name>**, although you will use **BOX** when running the command. This so that i can maintain compatibility between versions
 
 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")
+### 2.1) Deploying the application to multiple stages ( Using the customized command "deploy_multi_stages")
 
 ```shell
 
@@ -221,7 +227,7 @@ bundle exec multi_cap foo2:development deploy
 
 Will ask user if he wants to deploy the apps "foo" and "bar" , since they appear in the dependencies list for the application "foo2"
 
-### 1.2) Deploying multiple application to multiple stages ( Using the customized command "deploy_multi_stages")
+### 2.1) Deploying multiple application to multiple stages ( Using the customized command "deploy_multi_stages")
 
 ```shell
 
@@ -238,6 +244,49 @@ 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
 
+### 2.2) [Deploying multiple applications from a central location](#deploy-from-central-location)
+
+This works like described in section **[2) Multiple applications](#2-multiple-apps--like-caphub-)** ), but now the **application_dependencies** Array can also have a **path** key inside each item that should point to the DocumentRoot of that application, and the configuration now accepts two new arguments **config_dir** ( this should point to the directory where the file **multi_cap.yml** resides) and **log_dir**( this can be used if you want your logs created in different directory)
+
+This will only work if all applications listed in the configuration file have the gem **capistrano_multiconfig_parallel** as part of their Gemfile.
+
+Example of configuration: - create a directory anywhere (e.g.**mkdir /tmp/app**\) - create a Gemfile and add only this two lines:
+
+```ruby
+source 'http://rubygems.org'
+
+gem 'capistrano_multiconfig_parallel'
+```
+
+Then create a file called **multi_cap.yml** in the root folder and create a configuration like this.
+
+```yaml
+   ---
+   application_dependencies:
+       - app: foo'
+         priority: 1
+         path: /some/path/to/foo
+         dependencies: []
+       - app: bar
+         priority: 1
+         path: /some/path/to/bar
+         dependencies:
+           - foo
+       - app: foo2
+         priority: 1
+         path: /some/path/to/foo2
+         dependencies:
+           - foo
+           - bar
+   ---
+```
+
+and then you can run like you would normally do
+
+```shell
+bundle exec multi_cap foo2:development deploy
+```
+
 Known Limitations
 -----------------
 

data/capistrano_multiconfig_parallel.gemspec

@@ -34,8 +34,6 @@ Gem::Specification.new do |s|
   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'
-  s.add_development_dependency 'guard-rspec', '~> 4.6', '>= 4.6'
   s.add_development_dependency 'simplecov', '~> 0.10', '>= 0.10'
   s.add_development_dependency 'simplecov-summary', '~> 0.0.4', '>= 0.0.4'
   s.add_development_dependency 'mocha', '~> 1.1', '>= 1.1'
@@ -49,5 +47,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'redcarpet', '~> 3.3', '>= 3.3'
   s.add_development_dependency 'github-markup', '~> 1.3', '>= 1.3.3'
   s.add_development_dependency 'inch', '~> 0.6', '>= 0.6'
-  s.add_development_dependency 'guard-inch', '~> 0.1', '>= 0.1.0'
 end

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
     def initialize
       Celluloid.boot
       CapistranoMulticonfigParallel.enable_logging
-      @stage_apps = multi_apps? ? stages.map { |stage| stage.split(':').reverse[1] }.uniq : []
+      @stage_apps = multi_apps? ? app_names_from_stages : []
       collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
       @jobs = []
     end
@@ -33,7 +33,6 @@ module CapistranoMulticonfigParallel
     def run_custom_command(options)
       custom_stages = fetch_multi_stages
       return if custom_stages.blank?
-      custom_stages = check_multi_stages(custom_stages)
       custom_stages.each do |stage|
         collect_jobs(options.merge('stage' => stage))
       end
@@ -43,7 +42,7 @@ module CapistranoMulticonfigParallel
       options = options.stringify_keys
       return unless applications.present?
       applications.each do |app|
-        deploy_app(options.merge('app' => app['app']))
+        deploy_app(options.merge('app' => app['app'], 'path' => app.fetch('path', nil)))
       end
     end
 
@@ -51,12 +50,8 @@ module CapistranoMulticonfigParallel
       custom_commands.include?(@top_level_tasks.first)
     end
 
-    def multi_apps?
-      stages.find { |stage| stage.include?(':') }.present?
-    end
-
     def verify_valid_data
-      return  if  @top_level_tasks != ['default']
+      return if @top_level_tasks != ['default']
       puts 'Invalid execution, please call something such as `multi_cap production deploy`, where production is a stage you have defined'.red
       exit(false)
     end
@@ -82,7 +77,7 @@ module CapistranoMulticonfigParallel
     end
 
     def action_key
-      capistrano_version_2? ? 'action' : 'ACTION'
+      'ACTION'
     end
 
     def verify_options_custom_command(options)
@@ -100,9 +95,9 @@ module CapistranoMulticonfigParallel
     def collect_jobs(options = {}, &_block)
       options = prepare_options(options)
       options = options.stringify_keys
-      apps = @dependency_tracker.fetch_apps_needed_for_deployment(options['app'], options['action'])
+      apps, app_options = @dependency_tracker.fetch_apps_needed_for_deployment(options['app'], options['action'])
       deploy_multiple_apps(apps, options)
-      deploy_app(options) if !custom_command? || !multi_apps?
+      deploy_app(options.merge(app_options)) if !custom_command? || !multi_apps?
     end
 
     def process_jobs
@@ -116,11 +111,11 @@ module CapistranoMulticonfigParallel
     end
 
     def tag_staging_exists? # check exists task from capistrano-gitflow
-      find_loaded_gem('capistrano-gitflow').present?
+      @jobs.find(&:gitflow).present?
     end
 
     def stages_key
-      capistrano_version_2? ? 'stages' : 'STAGES'
+      'STAGES'
     end
 
     def fetch_multi_stages
@@ -135,11 +130,7 @@ module CapistranoMulticonfigParallel
     end
 
     def can_tag_staging?
-      wants_deploy_production? && tag_staging_exists? && fetch_multi_stages.include?('staging')
-    end
-
-    def check_multi_stages(custom_stages)
-      can_tag_staging? ? custom_stages.reject { |u| u == 'production' } : custom_stages
+      wants_deploy_production? && fetch_multi_stages.include?('staging')
     end
 
     def deploy_app(options = {})
@@ -158,10 +149,6 @@ module CapistranoMulticonfigParallel
       fetch_app_additional_env_options(app_additional_env_options)
     end
 
-    def worker_environments
-      @jobs.map(&:stage)
-    end
-
     def run
       options = {}
       if custom_command?
@@ -174,7 +161,7 @@ module CapistranoMulticonfigParallel
     end
 
     def boxes_key
-      capistrano_version_2? ? 'box' : 'BOX'
+      'BOX'
     end
 
     def call_task_deploy_app(options = {})
@@ -194,7 +181,7 @@ module CapistranoMulticonfigParallel
       @jobs.pmap do |job|
         @manager.async.delegate_job(job)
       end
-      unless can_tag_staging?
+      unless can_tag_staging? && tag_staging_exists?
         until @manager.registration_complete
           sleep(0.1) # keep current thread alive
         end
@@ -225,10 +212,15 @@ module CapistranoMulticonfigParallel
       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_key].present? ? env_options[action_key] : options['action'],
-                                                                    env_options: job_env_options
+                                                                    env_options: job_env_options,
+                                                                    path: options.fetch('path', nil)
 
       ))
-      @jobs << job
+      @jobs << job unless job_can_tag_staging?(job)
+    end
+
+    def job_can_tag_staging?(job)
+      can_tag_staging? && job.stage == 'production' && job.gitflow.present?
     end
 
     def prepare_options(options)

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -30,7 +30,7 @@ module CapistranoMulticonfigParallel
     end
 
     def original_args_hash
-      multi_fetch_argv(original_args.dup)
+      multi_fetch_argv((original_args || ARGV).dup)
     end
 
     def job_id

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -74,11 +74,16 @@ module CapistranoMulticonfigParallel
         end
         wait_task_confirmations
       end
+      terminal_show
       condition = @workers_terminated.wait
       until condition.present?
         sleep(0.1) # keep current thread alive
       end
       log_to_file("all jobs have completed #{condition}")
+      terminal_show
+    end
+
+    def terminal_show
       Celluloid::Actor[:terminal_server].async.notify_time_change(CapistranoMulticonfigParallel::TerminalTable.topic, type: 'output') if Celluloid::Actor[:terminal_server].alive?
     end
 
@@ -88,7 +93,7 @@ module CapistranoMulticonfigParallel
     end
 
     def syncronized_confirmation?
-      !@job_manager.can_tag_staging?
+      !can_tag_staging?
     end
 
     def apply_confirmation_for_job(job)
@@ -188,7 +193,7 @@ module CapistranoMulticonfigParallel
     end
 
     def can_tag_staging?
-      @job_manager.can_tag_staging? &&
+      @job_manager.can_tag_staging? && @job_manager.tag_staging_exists? &&
         @jobs.find { |_job_id, job| job.stage == 'production' }.blank?
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb

@@ -45,7 +45,7 @@ module CapistranoMulticonfigParallel
   private
 
     def actor_notify_state_change(current_state, event, new_state)
-      @actor.send_msg(CapistranoMulticonfigParallel::TerminalTable.topic, type: 'event', message: "Going from #{current_state} to #{new_state}  due to a #{event} event")
+      @actor.send_msg(CapistranoMulticonfigParallel::TerminalTable.topic, type: 'event', new_state: new_state, message: "Going from #{current_state} to #{new_state}  due to a #{event} event")
     end
   end
 end

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.multi_apps?
+      return [[], {}] unless @job_manager.multi_apps?
       if @job_manager.custom_command?
         show_interactive_menu(action)
       else
@@ -22,14 +22,17 @@ module CapistranoMulticonfigParallel
   private
 
     def fetch_application_dependencies(application, action)
-      return [] if configuration.application_dependencies.blank? || application.blank?
+      return [[], {}] if configuration.application_dependencies.blank? || application.blank?
       applications = get_applications_to_deploy(action, [application.camelcase])
+      app_options = applications.find { |hash| hash['app'] == application }.dup
       applications.delete_if { |hash| hash['app'] == application }
+      [applications, app_options]
     end
 
     def show_interactive_menu(action)
       apps_selected = CapistranoMulticonfigParallel::InteractiveMenu.new(available_apps).fetch_menu
-      get_applications_to_deploy(action, apps_selected)
+      apps = get_applications_to_deploy(action, apps_selected)
+      [apps, {}]
     end
 
     def application_dependencies
@@ -103,7 +106,7 @@ module CapistranoMulticonfigParallel
       if action_confirmed?(apps_deploy_confirmation)
         return applications_to_deploy
       else
-        return []
+        return applications_to_deploy
       end
     end
   end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -10,9 +10,9 @@ module CapistranoMulticonfigParallel
 
     delegate :job_stage,
              :capistrano_action,
-             :build_capistrano_task,
              :execute_standard_deploy,
              :setup_command_line,
+             :gitflow,
              to: :command
 
     delegate :stderr_buffer,
@@ -25,10 +25,11 @@ module CapistranoMulticonfigParallel
     end
 
     def save_stderr_error(data)
+      return unless @manager.alive?
       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!') || new_data.include?('Terminating')
+      stderr_buffer.write(new_data) if ['aborted!', 'Terminating', 'Error'].any? { |word| new_data.include?(word) }
     end
 
     def env_variable
@@ -68,7 +69,7 @@ module CapistranoMulticonfigParallel
     def worker_state
       worker_obj = worker
       default = status.to_s.upcase.red
-      worker_obj.present? && worker_obj.alive? ? worker_obj.worker_state : default
+      worker_obj.alive? ? worker_obj.worker_state : default
     end
 
     def id
@@ -81,6 +82,7 @@ module CapistranoMulticonfigParallel
       { name: 'action', default: '' },
       { name: 'task_arguments', default: [] },
       { name: 'env_options', default: {} },
+      { name: 'path', default: nil },
       { name: 'status', default: :unstarted },
       { name: 'exit_status', default: nil }
     ].each do |hash|

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -6,19 +6,29 @@ module CapistranoMulticonfigParallel
     include FileUtils
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :job
-    delegate :app, :stage, :action, :task_arguments, :env_options, to: :job
+    attr_reader :job, :job_capistrano_version, :legacy_capistrano
+    delegate :app, :stage, :action, :task_arguments, :env_options, :path, to: :job
 
     def initialize(job)
       @job = job
+      @legacy_capistrano = legacy_capistrano? ? true : false
     end
 
     def filtered_env_keys
-      filtered_env_keys_format(%w(STAGES ACTION))
+      %w(STAGES ACTION)
+    end
+
+    def bundle_gemfile_env
+      "BUNDLE_GEMFILE=#{job_path}/Gemfile"
+    end
+
+    def gitflow
+      gitflow = `#{command_prefix} && #{bundle_gemfile_env} bundle show capistrano-gitflow`
+      @gitflow ||= gitflow.include?('Could not find') ? false : true
     end
 
     def job_stage
-      app.present? ? "#{app}:#{stage}" : "#{stage}"
+      multi_apps?(job_path) && app.present? ? "#{app}:#{stage}" : "#{stage}"
     end
 
     def capistrano_action
@@ -34,13 +44,13 @@ module CapistranoMulticonfigParallel
       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, filtered_keys)
+        array_options << "#{env_prefix(key, @legacy_capistrano)} #{env_key_format(key, @legacy_capistrano)}=#{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 << trace_flag(@legacy_capistrano) if app_debug_enabled?
       array_options.concat(setup_flags_for_job(options))
     end
 
@@ -49,10 +59,28 @@ module CapistranoMulticonfigParallel
       setup_env_options(options).concat(new_arguments)
     end
 
+    def job_capistrano_version
+      @job_capistrano_version ||= `#{command_prefix} && #{bundle_gemfile_env} bundle show capistrano | grep  -Po  'capistrano-([0-9.]+)' | grep  -Po  '([0-9.]+)'`
+      @job_capistrano_version = strip_characters_from_string(@job_capistrano_version)
+    end
+
+    def legacy_capistrano?
+      verify_gem_version(job_capistrano_version, '3.0', operator: '<')
+    end
+
+    def job_path
+      path || detect_root
+    end
+
+    def command_prefix
+      bundle_install = path.present? ? "&& #{bundle_gemfile_env} bundle install" : ''
+      "cd #{job_path} #{bundle_install}"
+    end
+
     def to_s
-      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}"
+      config_flags = CapistranoMulticonfigParallel.configuration_flags
+      environment_options = setup_command_line(config_flags).join(' ')
+      "#{command_prefix} && #{bundle_gemfile_env} RAILS_ENV=#{stage} bundle exec multi_cap #{job_stage} #{capistrano_action} #{environment_options}"
     end
 
     def to_json

data/lib/capistrano_multiconfig_parallel/configuration/default.yml

@@ -34,6 +34,22 @@ default_config:
     default: './log/multi_cap_websocket.log'
     required: false
 
+  - name: 'config_dir'
+    type: 'filename'
+    description: >-
+      The path where the config file is located. If file is not provided,
+      will raise exception if Capfile is not found in the current directory
+      from where the script is running
+    default: ''
+    required: false
+
+  - name: 'log_dir'
+    type: 'filename'
+    description: >-
+      The path where the log files will be created
+    default: ''
+    required: false
+
   - name: 'development_stages'
     type: 'Array'
     description: >-

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -39,8 +39,7 @@ module CapistranoMulticonfigParallel
 
     def setup_command_line_standard(*args)
       options = args.extract_options!
-      args.select(&:present?)
-      [args, options]
+      [args.select(&:present?), options]
     end
 
     def wrap_string(string, options = {})

data/lib/capistrano_multiconfig_parallel/helpers/capistrano_helper.rb

@@ -3,20 +3,20 @@ module CapistranoMulticonfigParallel
   module CapistranoHelper
   module_function
 
-    def filtered_env_keys_format(keys)
-      keys.map { |key| env_key_format(key) }
+    def filtered_env_keys_format(keys, version = capistrano_version_2?)
+      keys.map { |key| env_key_format(key, version) }
     end
 
-    def env_prefix(key)
-      key != CapistranoMulticonfigParallel::ENV_KEY_JOB_ID && capistrano_version_2? ? '-S' : ''
+    def env_prefix(key, version = capistrano_version_2?)
+      key != CapistranoMulticonfigParallel::ENV_KEY_JOB_ID && version == true ? '-S' : ''
     end
 
-    def env_key_format(key)
-      capistrano_version_2? ? key.downcase : key
+    def env_key_format(key, version = capistrano_version_2?)
+      version == true ? key.downcase : key
     end
 
-    def trace_flag
-      capistrano_version_2? ? '--verbose' : '--trace'
+    def trace_flag(version = capistrano_version_2?)
+      version == true ? '--verbose' : '--trace'
     end
 
     def setup_flags_for_job(options)

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -21,9 +21,9 @@ module CapistranoMulticonfigParallel
     end
 
     def setup_configuration
-      @fetched_config.read config_file if File.file?(config_file)
       @fetched_config.use :commandline
-
+      @fetched_config.process_argv!
+      read_config_file
       @fetched_config.use :config_block
       validate_configuration
     end
@@ -32,11 +32,18 @@ module CapistranoMulticonfigParallel
       @fetched_config.finally do |config|
         check_configuration(config)
       end
-      @fetched_config.process_argv!
       @fetched_config.resolve!
       @fetched_config
     end
 
+    def read_config_file
+      @fetched_config.config_dir = @fetched_config.config_dir.present? ? File.expand_path(@fetched_config.config_dir) : try_detect_file('multi_cap.yml')
+      config_file_path = @fetched_config.config_dir.present? ? File.join(@fetched_config.config_dir, 'multi_cap.yml') : nil
+      config_file = File.expand_path(config_file_path || File.join(detect_root.to_s, 'config', 'multi_cap.yml'))
+      @fetched_config.log_dir = config_file_path.present? ? File.dirname(config_file) : File.dirname(File.dirname(config_file))
+      @fetched_config.read config_file if File.file?(config_file)
+    end
+
     def verify_application_dependencies(value, props)
       return unless value.is_a?(Array)
       value.reject { |val| val.blank? || !val.is_a?(Hash) }
@@ -84,10 +91,18 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def check_directories(props)
+      props.each do |prop|
+        value = get_prop_config(prop)
+        @check_config[prop] = value if value.present? && File.directory?(value)
+      end
+    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))
+      check_directories(%w(log_dir config_dir))
       verify_application_dependencies(@check_config['application_dependencies'], %w(app priority dependencies))
     end
   end

data/lib/capistrano_multiconfig_parallel/helpers/gem_helper.rb

@@ -5,7 +5,7 @@ module CapistranoMulticonfigParallel
 
     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
+      gem_spec.present? && property.present? ? gem_spec.send(property) : gem_spec
     end
 
     def find_loaded_gem_property(gem_name, property = 'version')
@@ -18,12 +18,14 @@ module CapistranoMulticonfigParallel
     end
 
     def get_parsed_version(version)
+      return 0 if version.blank?
       version = version.to_s.split('.')
       version.pop until version.size == 2
       version.join('.').to_f
     end
 
     def verify_gem_version(gem_version, version, options = {})
+      options.stringify_keys!
       version = get_parsed_version(version)
       get_parsed_version(gem_version).send(options.fetch('operator', '<='), version)
     end

data/lib/capistrano_multiconfig_parallel/helpers/internal_helper.rb

@@ -111,12 +111,9 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def config_file
-      File.join(detect_root.to_s, 'config', 'multi_cap.yml')
-    end
-
     def log_directory
-      File.join(detect_root.to_s, 'log')
+      log_dir = configuration.log_dir || detect_root.to_s
+      File.join(log_dir.to_s, 'log')
     end
 
     def main_log_file

data/lib/capistrano_multiconfig_parallel/helpers/stages_helper.rb

@@ -1,11 +1,32 @@
 module CapistranoMulticonfigParallel
   # module used to fetch the stages (code taken from https://github.com/railsware/capistrano-multiconfig)
-  # TODO: find a way to remove this and still be compatible with capistrano 2.x
+  # but refactored to be able to detect stages from multiple paths
   module StagesHelper
   module_function
 
-    def stages
-      fetch_stages_paths do |paths|
+    def stages(path = nil)
+      path.blank? && independent_deploy? ? fetch_stages_from_file : fetch_stages_app(path)
+    end
+
+    def multi_apps?(path = nil)
+      path.blank? && independent_deploy? ? true : stages(path).find { |stage| stage.include?(':') }.present?
+    end
+
+    def fetch_stages_from_file
+      configuration.application_dependencies.map { |hash| hash[:app] }
+    end
+
+    def app_names_from_stages
+      independent_deploy? ? fetch_stages_from_file : stages.map { |stage| stage.split(':').reverse[1] }.uniq
+    end
+
+    def independent_deploy?
+      app_with_no_path = configuration.application_dependencies.find { |hash| hash[:path].blank? }
+      configuration.config_dir.present? && app_with_no_path.blank? ? true : false
+    end
+
+    def fetch_stages_app(path)
+      fetch_stages_paths(path) do |paths|
         checks_paths(paths)
       end
     end
@@ -23,15 +44,19 @@ module CapistranoMulticonfigParallel
       paths.any? { |another| another != path && another.start_with?(path + ':') }
     end
 
-    def stages_paths
-      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('/', ':')
+    def stages_root(path)
+      File.expand_path(File.join(path || detect_root, 'config/deploy'))
+    end
+
+    def stages_paths(path)
+      root_stages = stages_root(path)
+      Dir["#{root_stages}/**/*.rb"].map do |file|
+        file.slice(root_stages.size + 1..-4).tr('/', ':')
       end
     end
 
-    def fetch_stages_paths
-      stages_paths.tap { |paths| yield paths if block_given? }
+    def fetch_stages_paths(path)
+      stages_paths(path).tap { |paths| yield paths if block_given? }
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 1
-    MINOR = 0
-    TINY = 7
+    MINOR = 1
+    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: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap
@@ -324,46 +324,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -604,26 +564,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: guard-inch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 description: CapistranoMulticonfigParallel is a simple ruby implementation that allows
   you to run multiple tasks in parallel for single or multiple applications and uses
   websockets for inter-process communication and has a interactive menu