capistrano_multiconfig_parallel 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3947be009ccd058468859ed7de03256be1da9ce7
-  data.tar.gz: 571ae64684a156ae392f03772dc37a917c26a84a
+  metadata.gz: ad818dec1e400fbf987547ee9f73b418e2717039
+  data.tar.gz: d89e2681e842160eef7ff03df18edbcc73593dcb
 SHA512:
-  metadata.gz: 925c1a9fdc0d3119c8fb09d2c474597842628cd29ac5f6cbe3f5b6c3790395b8c3837188f89ab463087d16e2d87f18c68acdd47a9e18991d3f115f27e72a7790
-  data.tar.gz: 803e0ea952fb18fcd4deb1e0f4f1c68c0b331bfb269afca0bc1febfca66fd89df3358c97f9514d6fd19c095c1124f3fb62410fb811a3a038543fefc19e800878
+  metadata.gz: fefdfa881e03d9278bb8789dc663edb312159760a709cd7bb07111fe7c99734ec3b0a7453df7c14ed9f4f06fd5e4a243a7ffa606fede326ef99423e7d4f5cb6a
+  data.tar.gz: 8d4e10d4d7295e9a91231201e59f94783a7ad0c4918b7da817cedfedb5ec7677a98e488f9f3f9dbae6f5d17d4a487ec5e88a0796e0c7fdc4ecea448dadb22b7b

data/Rakefile

@@ -19,6 +19,11 @@ end
 YARD::Config.options[:load_plugins] = true
 YARD::Config.load_plugins
 
+# dirty hack for YardocTask
+::Rake.application.class.class_eval do
+  alias_method :last_comment, :last_description
+end
+
 YARD::Rake::YardocTask.new do |t|
   t.files = ['lib/**/*.rb', 'spec/**/*_spec.rb'] # optional
   t.options = ['--any', '--extra', '--opts', '--markup-provider=redcarpet', '--markup=markdown', '--debug'] # optional

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -50,10 +50,13 @@ module CapistranoMulticonfigParallel
     end
 
     def verify_valid_data
-      if @top_level_tasks == ['default'] || (multi_apps? && !@top_level_tasks.first.to_s.include?(':') )
+     return if  @top_level_tasks != ['default']
+     raise_invalid_job_config
+    end
+
+    def raise_invalid_job_config
         puts 'Invalid execution, please call something such as `multi_cap production deploy`, where production is a stage you have defined'.red
         exit(false)
-      end
     end
 
     def initialize_data
@@ -201,6 +204,7 @@ module CapistranoMulticonfigParallel
 
     def prepare_job(options)
       options = options.stringify_keys
+      return raise_invalid_job_config if !job_stage_valid?(options)
       app = options.fetch('app', '')
       box = options['env_options'][boxes_key]
       message = box.present? ? "BOX #{box}:" : "stage #{options['stage']}:"
@@ -223,6 +227,19 @@ module CapistranoMulticonfigParallel
       can_tag_staging? && job.stage == 'production' && job.gitflow.present?
     end
 
+    def job_path(options)
+        options.fetch("path", detect_root)
+    end
+
+    def job_stage_valid?(options)
+        stages(job_path(options)).include?(job_stage(options))
+    end
+
+    def job_stage(options)
+      multi_apps?(job_path(options)) && options.fetch('app', nil).present? ? "#{options['app']}:#{options['stage']}" : "#{options['stage']}"
+    end
+
+
     def prepare_options(options)
       options = options.stringify_keys
       options['app'] = options.fetch('app', @application.to_s.clone)

data/lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb

@@ -24,9 +24,10 @@ module CapistranoMulticonfigParallel
     def fetch_application_dependencies(application, action)
       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 = applications.present? ? applications : []
+      app_options = applications.find { |hash| hash['app'] == application }.try(:dup)
       applications.delete_if { |hash| hash['app'] == application }
-      [applications, app_options]
+      [applications, (app_options || {})]
     end
 
     def show_interactive_menu(action)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 1
-    MINOR = 2
-    TINY = 9
+    MINOR = 3
+    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.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid