capistrano_multiconfig_parallel 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7cc02538db7ad911dd5b61aa6eab9f9d651ac64
-  data.tar.gz: e81e18d1337ccfeae94260e8ed40e2319377f7aa
+  metadata.gz: 37e1fd5e54ce834910e9d5a10bc8b8fda48d7fcc
+  data.tar.gz: 26042aa56996fccd7368b8cabff50d085b1f6014
 SHA512:
-  metadata.gz: 4f69ea91b5e891f4bd5186506734582c6d70785650f7ea9c08c9cc091bbe1bc084739084fe5c8a3277d99038f74d206087335714bacdebf2da11c41c8baa74ee
-  data.tar.gz: 4848c50cabcf6a0daa0f72bb9358f81aa49769746c9748e761954510b42c4682f4dbce620943adcdc06047679c39028dfb9fb82c3409376279007add787a6425
+  metadata.gz: 98552410ce19198066f3b6d5c13750e398a550cbc30261531f923b38909286e3cdc8ce73be8b7a9d449cb9cb24b06ab520ee113861221f7d85a125c287fb803c
+  data.tar.gz: 1ceb4b40efe8193f5a9ed568685f36c86c6f5e39fa82d5174eb5c5d8b6255546d600880807833ed4893a7edbeb277922ade06ae4edb95be6d48d56c4c28893e5

data/README.md

@@ -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.rc1
+  gem install capistrano_multiconfig_parallel -v 2.0.0.rc2
 ```
 
 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/classes/job_command.rb

@@ -6,7 +6,7 @@ module CapistranoMulticonfigParallel
     include FileUtils
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :job, :job_capistrano_version, :legacy_capistrano, :tempfile, :job_final_gemfile
+    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 initialize(job)
@@ -229,6 +229,10 @@ module CapistranoMulticonfigParallel
       environment_options = setup_command_line.join(' ')
       command = "#{fetch_bundler_check_command(@job_final_gemfile)} && WEBSOCKET_LOGGING=#{true} LOG_FILE=#{websocket_config.fetch('log_file_path', nil)} #{bundle_gemfile_env(@job_final_gemfile)} bundle exec cap #{job_stage} #{capistrano_action} #{environment_options}"
 
+      if @job_final_capfile != job_capfile
+        command += " -f #{@job_final_capfile}"
+      end
+
       get_command_script(command)
     end
 
@@ -237,6 +241,10 @@ module CapistranoMulticonfigParallel
       File.join(job_path, capfile_name.to_s)
     end
 
+    def job_capfile_multi
+      "#{job_capfile}.multi_cap"
+    end
+
     def job_gemfile_multi
       File.join(job_path, "Gemfile.multi_cap")
     end
@@ -253,7 +261,7 @@ module CapistranoMulticonfigParallel
     def check_capistrano_sentinel_availability
       #  '#{find_loaded_gem_property(capistrano_sentinel_name)}'
       #  path: '/home/raul/workspace/github/capistrano_sentinel'
-      if capistrano_sentinel_available? && capistrano_sentinel_needs_updating?
+      if capistrano_sentinel_available?
         @job_final_gemfile = job_gemfile
       else
         FileUtils.rm_rf(job_gemfile_multi) if File.exists?(job_gemfile_multi)
@@ -272,12 +280,26 @@ module CapistranoMulticonfigParallel
     end
 
     def prepare_capfile
-      return if File.foreach(job_capfile).grep(/#{capistrano_sentinel_name}/).any?
-      File.open(job_capfile, 'a+') do |f|
-        cmd=<<-CMD
-        require "#{capistrano_sentinel_name}"
-        CMD
-        f.write(cmd)
+      capfile_valid = File.foreach(job_capfile).grep(/#{capistrano_sentinel_name}/).any?
+      if capistrano_sentinel_available? && capfile_valid.present?
+        @job_final_capfile = job_capfile
+      elsif capfile_valid.blank? && capistrano_sentinel_available?
+        @job_final_capfile = job_capfile
+        File.open(job_capfile, 'a+') do |f|
+          cmd=<<-CMD
+          require "#{capistrano_sentinel_name}"
+          CMD
+          f.write(cmd)
+        end
+      elsif capistrano_sentinel_available? == false
+        @job_final_capfile = job_capfile_multi
+        FileUtils.copy(job_capfile, job_capfile_multi)
+        File.open(job_capfile_multi, 'a+') do |f|
+          cmd=<<-CMD
+          require "#{capistrano_sentinel_name}"
+          CMD
+          f.write(cmd)
+        end
       end
     end
 

data/lib/capistrano_multiconfig_parallel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid