capistrano_multiconfig_parallel 2.0.0.beta4 → 2.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e892a4906dcb28ec4b7d05aabebc11c9ea7b4ae7
-  data.tar.gz: 7eb5360c81713de4804c4f02bb4bde2c32070dda
+  metadata.gz: 8dcf6eedb9a056078cbf9751eec4891962435a25
+  data.tar.gz: 23169131c3f9ad637f3fba23aa6cb0e0ff72999f
 SHA512:
-  metadata.gz: 4c966a134c96f9b91bacded7eb60dae769c781c932bb96a4b895935713a4971fe1cbecbbfdd28c3d8580dd12320c071cc3b4fbbcb1709bc7d2a9d406057d9c4e
-  data.tar.gz: a9e5a053363e34ed6111f1823b487114a466ee42e99c6f5ccb0f58bea066fcbe99ceb21798b6b93c52786af63d6d0588e9938248bedad904baec96ba2b00df3d
+  metadata.gz: 0ba7953d5f457de62eb60117b04ab7857bab1a127cb0c17865d951343e8d4a3a937eecb25364c8b65e6f74d5b9337a117fa0957888bccb1bd845e4d73a53e31f
+  data.tar.gz: f75e4abf68ef7323ac2c6669dac8e2ae5baf49f09b4126f1e2d481bfd634dfbd9169fcf00e853d55b79f6216efbb9680b1e17048286ecf89ea3f1aaf1b8f89c0

data/README.md

@@ -18,19 +18,19 @@ 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 started in version 2.0.0.alpha ( currently gem is in beta version)
----------------------------------------
+-----------------------------------------------------------------------------------
 
 -	Code for handling websocket events when a task is invoked was moved to a new gem [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel)
 -	You can now deploy applications from anywhere on your computer without having to add this gem to the Gemfile, however you need to add the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) gem to your Gemfile, if you want to use this .
 -	And only create anywhere on your computer a YAML file as described in section **[2.2) Deploying multiple applications from a central location](#22-deploying-multiple-applications-from-a-central-location)**
--	If you don't add the **capistrano_sentinel** to each of your applications, the executable of this gem will automatically create a new file "Gemfile.multi_cap" in the root of each of the applications that you are deploying,  where the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) gem will be included and will use that Gemfile when doing deploys.
--	The Capfile file of each of the applications that you are deploying  will also be automatically changed to require [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) if you haven't done so yet.
+-	If you don't add the **capistrano_sentinel** to each of your applications, the executable of this gem will automatically create a new file "Gemfile.multi_cap" in the root of each of the applications that you are deploying, where the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) gem will be included and will use that Gemfile when doing deploys.
+-	The Capfile file of each of the applications that you are deploying will also be automatically changed to require [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) if you haven't done so yet.
 -	The changes to Capfile will be automatically reverted when the command finishes ( with success or error ) if the [capistrano_sentinel](https://github.com/bogdanRada/capistrano_sentinel) gem is not part of your Gemfile
 -	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
--	**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**
+-	**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 )**
 
-If you are using a older version than 2.0 please refer to this  [README for version 1.7.2 or lower](https://github.com/bogdanRada/capistrano_multiconfig_parallel/blob/master/V1_README.md)
-==========================================================================================================================================================
+If you are using a older version than 2.0 please refer to this [README for version 1.7.2 or lower](https://github.com/bogdanRada/capistrano_multiconfig_parallel/blob/master/V1_README.md)
+==========================================================================================================================================================================================
 
 Requirements
 ------------
@@ -76,7 +76,7 @@ Add the following to your Capfile after requiring **capistrano** and **capistran
 Install locally on your system the capistrano_multiconfig_parallel gem using this command :
 
 ```ruby
-  gem install capistrano_multiconfig_parallel -v 2.0.0.beta1
+  gem install capistrano_multiconfig_parallel -v 2.0.0.beta4
 ```
 
 Please read [Release Details](https://github.com/bogdanRada/capistrano_multiconfig_parallel/releases) if you are upgrading. We break backward compatibility between large ticks but you can expect it to be specified at release notes.

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -217,10 +217,12 @@ module CapistranoMulticonfigParallel
       job = CapistranoMulticonfigParallel::Job.new(self, options.merge(
                                                                     action: custom_command? && env_options[action_key].present? ? env_options[action_key] : options['action'],
                                                                     env_options: job_env_options,
-                                                                    path: options.fetch('path', nil)
+                                                                    path:  job_path(options)
 
       ))
-
+      if job.find_capfile.blank?
+        raise "Please make sure you have a Capfile in the project root directory #{job.job_path}"
+      end
       unless job.capistrano_sentinel_needs_updating?
          raise "Please consider upgrading the gem #{job.capistrano_sentinel_name} to version #{job.loaded_capistrano_sentinel_version} from #{job.job_capistrano_sentinel_version} in #{job.job_path} "
       end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -16,13 +16,21 @@ module CapistranoMulticonfigParallel
     end
 
     def lockfile_parser
-      if File.exists?(job_gemfile_lock)
+      if File.exists?(job_gemfile) && File.exists?(job_gemfile_lock)
         @lockfile_parser ||= Bundler::LockfileParser.new(Bundler.read_file("#{job_gemfile_lock}"))
       else
         raise RuntimeError, "please install the gems separately for this application #{job_path} and re-try again!"
       end
     end
 
+    def find_capfile(custom_path = job_path)
+      @capfile_path ||= Pathname.new(custom_path).children.find { |file| check_file(file, 'capfile') }
+    end
+
+    def capfile_name
+      find_capfile.present? ? find_capfile.basename : nil
+    end
+
     def gem_specs
       @specs = lockfile_parser.specs
     end
@@ -125,7 +133,11 @@ module CapistranoMulticonfigParallel
     end
 
     def job_path
-      path || detect_root
+      if path.present? && File.directory?(path) && find_capfile(path).present?
+        path
+      else
+        detect_root
+      end
     end
 
     def user_home_directory
@@ -173,13 +185,17 @@ module CapistranoMulticonfigParallel
       "source #{rvm_scripts_path} && rvm rvmrc trust #{job_path} && cd #{job_path} && source #{job_rvmrc_file}"
     end
 
+    def rvm_bash_prefix(command)
+      rvm_enabled_for_job? ? "bash --login -c '#{command}'" : command
+    end
+
     def fetch_deploy_command
       prepare_application_for_deployment
       #  config_flags = CapistranoMulticonfigParallel.configuration_flags.merge("capistrano_version": job_capistrano_version)
       environment_options = setup_command_line.join(' ')
       command = "#{check_rvm_loaded} && if [ `which bundler |wc -l` = 0 ]; then gem install bundler;fi && (#{bundle_gemfile_env(@job_final_gemfile)} bundle check || #{bundle_gemfile_env(@job_final_gemfile)} bundle install ) && WEBSOCKET_LOGGING=#{debug_websocket?} LOG_FILE=#{websocket_config.fetch('log_file_path', nil)} #{bundle_gemfile_env(@job_final_gemfile)} bundle exec cap #{job_stage} #{capistrano_action} #{environment_options}"
 
-      command = "bash --login -c '#{command}'"  if rvm_enabled_for_job?
+      command = rvm_bash_prefix(command)
       command = command.inspect
 
       command_text =<<-CMD
@@ -204,7 +220,7 @@ module CapistranoMulticonfigParallel
 
 
     def job_capfile
-      File.join(job_path, "Capfile")
+      File.join(job_path, capfile_name.to_s)
     end
 
     def job_gemfile_multi

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
     MAJOR = 2
     MINOR = 0
     TINY = 0
-    PRE = 'beta4'
+    PRE = 'beta5'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - bogdanRada