capistrano_multiconfig_parallel 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90465ac1914f4d1a52d75ea58d467fd3a9de07d0
-  data.tar.gz: c742e9d38e06da28fba7cff73425a135c9d3cfa9
+  metadata.gz: c04e56d6d029d5babb6f06674b3c9fcfd91501ee
+  data.tar.gz: 16fad70a3ab6d90fab9ed087bd37c7d178304629
 SHA512:
-  metadata.gz: 51b96d92426e0c983a9cecf6db95be7c305cf45fd090d41f9e3535dd245ffc0074a49d7359fe9eb4a0c21c1e78ae90f3785d172d8f0a115881b61ac7e387f092
-  data.tar.gz: 8c115ff9f2ec2baf17333191e08bb451e3980a732c3c85b94dfc66cc5b8d4a344fdbf3acd5c543921e98cabdd77a45d8acd8e3ccc98f80307bbe803311195e06
+  metadata.gz: 63c3cc0eefeb79386904d68d0c265385b772178cb0be0a4590518e69f4358fd75e06c8037bd2fea296b6dd3a6b4f5990be42c21a9c0c3863f87166f9fff8b312
+  data.tar.gz: f3dd4b27a7be10068b1a15b770fb37b17c44995d72ffd1ce143828586c2e857369206c1fabb7e136f3351753221fbfde533e7566cbdca7d1ccf3a95ebbd4de13

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.beta
+  gem install capistrano_multiconfig_parallel -v 2.0.0.beta1
 ```
 
 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/capistrano_multiconfig_parallel.gemspec

@@ -29,7 +29,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.14'
+  s.add_runtime_dependency 'capistrano_sentinel',  '>= 0.0', '>= 0.0.16'
 
   s.add_development_dependency 'rake', '>= 10.4', '>= 10.4'
   s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4'

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -220,6 +220,10 @@ module CapistranoMulticonfigParallel
                                                                     path: options.fetch('path', nil)
 
       ))
+
+      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
       @jobs << job unless job_can_tag_staging?(job)
     end
 

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -8,16 +8,6 @@ module CapistranoMulticonfigParallel
     attr_reader :options, :application, :manager, :bundler_status
     attr_writer :status, :exit_status, :bundler_status
 
-    delegate :job_stage,
-    :capistrano_action,
-    :execute_standard_deploy,
-    :setup_command_line,
-    :job_capistrano_version,
-    :gem_specs,
-    :job_stage_for_terminal,
-    :rollback_changes_to_application,
-    to: :command
-
     delegate :stderr_buffer,
     to: :manager
 
@@ -164,5 +154,14 @@ module CapistranoMulticonfigParallel
       end
       hash
     end
+
+    def method_missing(sym, *args, &block)
+      command.public_send(sym, *args, &block)
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      command.public_methods.include?(method_name) || super
+    end
+
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -6,11 +6,12 @@ module CapistranoMulticonfigParallel
     include FileUtils
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :job, :job_capistrano_version, :legacy_capistrano, :tempfile
+    attr_reader :job, :job_capistrano_version, :legacy_capistrano, :tempfile, :job_final_gemfile
     delegate :id, :app, :stage, :action, :task_arguments, :env_options, :path, to: :job
 
     def initialize(job)
       @job = job
+      @job_final_gemfile = job_gemfile_multi
       @legacy_capistrano = legacy_capistrano? ? true : false
     end
 
@@ -53,15 +54,23 @@ module CapistranoMulticonfigParallel
       gitflow_version.present? ? true : false
     end
 
-    def request_handler_gem_name
+    def capistrano_sentinel_name
       "capistrano_sentinel"
     end
 
-    def request_handler_gem_available?
-      gitflow_version = job_gem_version(request_handler_gem_name)
+    def capistrano_sentinel_available?
+      gitflow_version = job_gem_version(capistrano_sentinel_name)
       gitflow_version.present? ? true : false
     end
 
+    def loaded_capistrano_sentinel_version
+      find_loaded_gem_property(capistrano_sentinel_name)
+    end
+
+    def job_capistrano_sentinel_version
+      job_gem_version(capistrano_sentinel_name)
+    end
+
     def job_stage_for_terminal
       app.present? ? "#{app}:#{stage}" : "#{stage}"
     end
@@ -106,6 +115,15 @@ module CapistranoMulticonfigParallel
       verify_gem_version(job_capistrano_version, '3.0', operator: '<')
     end
 
+    def capistrano_sentinel_needs_updating?
+      if capistrano_sentinel_available?
+        loaded_capistrano_sentinel_version == job_capistrano_sentinel_version
+      else
+        # the capistrano_sentinel is not part of the Gemfile so no need checking if needs updating
+        true
+      end
+    end
+
     def job_path
       path || detect_root
     end
@@ -158,7 +176,7 @@ module CapistranoMulticonfigParallel
     def fetch_deploy_command
       #  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_gemfile_multi)} bundle check || #{bundle_gemfile_env(job_gemfile_multi)} bundle install ) && WEBSOCKET_LOGGING=#{debug_websocket?} LOG_FILE=#{websocket_config.fetch('log_file_path', nil)} #{bundle_gemfile_env(job_gemfile_multi)} bundle exec cap #{job_stage} #{capistrano_action} #{environment_options}"
+      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 = command.inspect
@@ -193,22 +211,22 @@ module CapistranoMulticonfigParallel
     end
 
     def prepare_application_for_deployment
-      check_handler_available
+      check_capistrano_sentinel_availability
       prepare_capfile
     end
 
-    def check_handler_available
-      #  '#{find_loaded_gem_property(request_handler_gem_name)}'
+    def check_capistrano_sentinel_availability
+      #  '#{find_loaded_gem_property(capistrano_sentinel_name)}'
       #  path: '/home/raul/workspace/github/capistrano_sentinel'
       FileUtils.rm_rf(job_gemfile_multi) if File.exists?(job_gemfile_multi)
       FileUtils.touch(job_gemfile_multi)
-      if request_handler_gem_available?
-        FileUtils.copy(File.join(job_path, 'Gemfile'), job_gemfile_multi)
+      if capistrano_sentinel_available? && capistrano_sentinel_needs_updating?
+        @job_final_gemfile = job_gemfile
       else
         File.open(job_gemfile_multi, 'w') do |f|
           cmd=<<-CMD
           source "https://rubygems.org" do
-            gem "#{request_handler_gem_name}", '#{find_loaded_gem_property(request_handler_gem_name)}'
+            gem "#{capistrano_sentinel_name}", '#{find_loaded_gem_property(capistrano_sentinel_name)}'
           end
           instance_eval(File.read(File.dirname(__FILE__) + "/Gemfile"))
           CMD
@@ -219,10 +237,10 @@ module CapistranoMulticonfigParallel
     end
 
     def prepare_capfile
-      return if File.foreach(job_capfile).grep(/#{request_handler_gem_name}/).any?
+      return if File.foreach(job_capfile).grep(/#{capistrano_sentinel_name}/).any?
       File.open(job_capfile, 'a+') do |f|
         cmd=<<-CMD
-        require "#{request_handler_gem_name}"
+        require "#{capistrano_sentinel_name}"
         CMD
         f.write(cmd)
       end
@@ -232,11 +250,11 @@ module CapistranoMulticonfigParallel
     def rollback_changes_to_application
       FileUtils.rm_rf(job_gemfile_multi)
       FileUtils.rm_rf("#{job_gemfile_multi}.lock")
-      unless request_handler_gem_available?
+      unless capistrano_sentinel_available?
         File.open(job_capfile, 'r') do |f|
           File.open("#{job_capfile}.tmp", 'w') do |f2|
             f.each_line do |line|
-              f2.write(line) unless line.include?(request_handler_gem_name)
+              f2.write(line) unless line.include?(capistrano_sentinel_name)
             end
           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 }
-      gem_spec.present? && property.present? ? gem_spec.send(property) : gem_spec
+      gem_spec.present? && property.present? ? gem_spec.send(property).to_s : gem_spec
     end
 
     def find_loaded_gem_property(gem_name, property = 'version')

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
     MAJOR = 2
     MINOR = 0
     TINY = 0
-    PRE = 'beta1'
+    PRE = 'beta2'
 
     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.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -247,7 +247,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.14
+        version: 0.0.16
   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.14
+        version: 0.0.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -527,7 +527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CapistranoMulticonfigParallel is a simple ruby implementation that allows