capistrano_multiconfig_parallel 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd23b511de842a842e488d77a14f485c25ea0038
-  data.tar.gz: 4ebc2e9f2a2f11d0546ba60930e70f2b641a8a85
+  metadata.gz: 61e15b86cf7100b8dc3c8095bc9774746af06c8d
+  data.tar.gz: a5dda64b54ddd59b5186c01aac8aa0c302b6d2c0
 SHA512:
-  metadata.gz: 408a10f55c1fc2bb2232109abe5fb8ef345f58de0bcd3fda293e3c7c8979a9579a908aaff6bd946798badb61fd6762fece5e69e85dcc4df9fef18830718ebca0
-  data.tar.gz: 854662dee0a090edd903638ae6dd8ab69273cd6fd3b724a61daf0431d3202adde3cfca49843e8a72640126ca352dd00c678fca275f010329de843ca9ec2ca014
+  metadata.gz: 790260475aa01f09fb80171fe0bb739c6c99ea326f19225cf9a188316336aac7bdc3cb68431252bc5471a5b5ec0c2d04344ba9d9a33e2a8bceac4762ad186055
+  data.tar.gz: fcd8e3536de4083093cd5f71bc0c3f6358d1c66a064e62e5e652585aa0e86bc7f9cac6ac8f984922f31ea34a2d5137c2484e459835c06c5f5d63a51e67c840af

data/capistrano_multiconfig_parallel.gemspec

@@ -17,19 +17,19 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
-  s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.0'
+  s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.2'
   s.add_runtime_dependency 'celluloid_pubsub', '~> 0.0', '>= 0.0.21'
   s.add_runtime_dependency 'composable_state_machine', '~> 1.0', '>= 1.0.2'
-  s.add_runtime_dependency 'terminal-table', '~> 1.4', '>= 1.4.5'
-  s.add_runtime_dependency 'colorize', '~> 0.7', '>= 0.7'
+  s.add_runtime_dependency 'terminal-table', '~> 1.5', '>= 1.5.2'
+  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-multiconfig','~> 3.0', '>= 3.0.8'
   s.add_runtime_dependency 'capistrano','~> 3.0','>= 3.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 'versionomy', '~> 0.4', '>= 0.4.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

@@ -33,5 +33,6 @@ Gem.find_files('capistrano_multiconfig_parallel/celluloid/**/*.rb').each { |path
 
 require_relative './version'
 require_relative './configuration'
+require_relative './helper'
 require_relative './base'
 require_relative './application'

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -1,6 +1,7 @@
 # base module that has the statis methods that this gem is using
 module CapistranoMulticonfigParallel
   include CapistranoMulticonfigParallel::Configuration
+  include Helper
 
   ENV_KEY_JOB_ID = 'multi_cap_job_id'
   MULTI_KEY = 'multi'
@@ -75,9 +76,9 @@ module CapistranoMulticonfigParallel
       err_backtrace = message.respond_to?(:backtrace) ? message.backtrace.join("\n\n") : ''
       if err_backtrace.present?
         logger.debug(
-          class_name: message.class,
-          message: error_message,
-          backtrace: err_backtrace
+        class_name: message.class,
+        message: error_message,
+        backtrace: err_backtrace
         )
       else
         logger.debug(message)
@@ -94,6 +95,10 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def using_cap3?
+      verify_gem_version('capistrano', '3', operator: '>=')
+    end
+
     def try_detect_capfile
       root = Pathname.new(FileUtils.pwd)
       root = root.parent unless root.directory?

data/lib/capistrano_multiconfig_parallel/helper.rb

@@ -0,0 +1,31 @@
+# module used for feching gem information
+module Helper
+  # function that makes the methods incapsulated as utility functions
+
+  module_function
+
+  def find_loaded_gem_property(gem_name, property)
+    gem_spec = Gem.loaded_specs.values.find { |repo| repo.name == gem_name }
+    gem_spec.respond_to?(property) ? gem_spec.send(property) : nil
+  end
+
+  def fetch_gem_version(gem_name, options = {})
+    version = find_loaded_gem_property(gem_name, 'version')
+    version.blank? ? nil : get_parsed_version(version.to_s, options)
+  end
+
+  def get_parsed_version(version, options)
+    parsing_options = {optional_fields: [:tiny]}.merge(options.fetch("unparse", {}))
+    Versionomy.parse(version).unparse(parsing_options)
+  rescue Versionomy::Errors::ParseError
+    nil
+  end
+
+  def verify_gem_version(gem_name, version, options = {})
+    options.stringify_keys!
+    version = get_parsed_version(version, options)
+    gem_version = fetch_gem_version(gem_name, options)
+    gem_version.blank? ? false : gem_version.send(options.fetch('operator', '<='), version)
+  end
+
+end

data/lib/capistrano_multiconfig_parallel/managers/base_manager.rb

@@ -42,8 +42,8 @@ module CapistranoMulticonfigParallel
       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' => custom_stages))
+      custom_stages.each do |stage|
+        collect_jobs(options.merge('stage' => stage))
       end
     end
 
@@ -62,11 +62,15 @@ module CapistranoMulticonfigParallel
     end
 
     def can_start?
-      @top_level_tasks.size > 1 && (@stages.include?(@top_level_tasks.first) || custom_command?) && ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
+      @top_level_tasks.size >= 1 && (@stages.include?(@top_level_tasks.first) || custom_command?) && ENV[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID].blank?
     end
 
     def custom_command?
-      @top_level_tasks.first == 'ensure_stage' && !@stages.include?(@top_level_tasks.second) && !@stages.include?(@top_level_tasks.first) && custom_commands.values.include?(@top_level_tasks.second)
+      if multi_apps?
+        !@stages.include?(@top_level_tasks.first) && custom_commands.values.include?(@top_level_tasks.first)
+      else
+        !@stages.include?(@top_level_tasks.second) && @stages.include?(@top_level_tasks.first) && custom_commands.values.include?(@top_level_tasks.second)
+      end
     end
 
     def custom_commands
@@ -151,9 +155,9 @@ module CapistranoMulticonfigParallel
       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)
+      deploy_app(options) unless custom_command?
     rescue => e
-      CapistranoMulticonfigParallel::Base.log_message(e)
+      CapistranoMulticonfigParallel.log_message(e)
     end
 
     def process_jobs

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 15
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - bogdanRada
@@ -19,7 +19,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: celluloid_pubsub
   requirement: !ruby/object:Gem::Requirement
@@ -76,20 +76,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -150,26 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: capistrano-multiconfig
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.8
-  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.8
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +250,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -631,6 +631,7 @@ files:
 - lib/capistrano_multiconfig_parallel/extensions/output_stream.rb
 - lib/capistrano_multiconfig_parallel/extensions/rake.rb
 - lib/capistrano_multiconfig_parallel/extensions/rake_hook_actor.rb
+- lib/capistrano_multiconfig_parallel/helper.rb
 - lib/capistrano_multiconfig_parallel/initializers/conf.rb
 - lib/capistrano_multiconfig_parallel/initializers/default.yml
 - lib/capistrano_multiconfig_parallel/managers/base_manager.rb