capistrano_multiconfig_parallel 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af426cfa70110d128cbe87845419726e79c208a1
-  data.tar.gz: 8fc920d2c30a6dba86a4454072f8545178b5e0cf
+  metadata.gz: bd23b511de842a842e488d77a14f485c25ea0038
+  data.tar.gz: 4ebc2e9f2a2f11d0546ba60930e70f2b641a8a85
 SHA512:
-  metadata.gz: d7d415e6280a296e2245caa1d969ee18e7875a31c52fb7a7dccf2c299647cc3a7dc3378ca2bacd9a3fc28ef52086004bae92b0d9a336b9e9aa5fba790860f0c9
-  data.tar.gz: 8c6d73cd137cc0b2ab546ffd2d76aa9a26ff866d90a0a7d746ed38ffd237d78ca574074885cb9f4983030656c0c661acea359a645c19112df5e0b1f8cc482e05
+  metadata.gz: 408a10f55c1fc2bb2232109abe5fb8ef345f58de0bcd3fda293e3c7c8979a9579a908aaff6bd946798badb61fd6762fece5e69e85dcc4df9fef18830718ebca0
+  data.tar.gz: 854662dee0a090edd903638ae6dd8ab69273cd6fd3b724a61daf0431d3202adde3cfca49843e8a72640126ca352dd00c678fca275f010329de843ca9ec2ca014

data/README.md

@@ -112,7 +112,7 @@ Available command line options when executing a command
 
 -	--application_dependencies
 
-	-	This should be used only for Caphub-like applications , in order to deploy dependencies of an application in parallel and is described at section **[2.) Multiple applications](#multiple_apps)**
+	-	This should be used only for Caphub-like applications , in order to deploy dependencies of an application in parallel and is described at section **[2.) Multiple applications](#2-multiple-apps--like-caphub-)**
 
 Usage Instructions
 ==================

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -10,17 +10,12 @@ module CapistranoMulticonfigParallel
     end
 
     def top_level
-      job_manager = CapistranoMulticonfigParallel::BaseManager.new(self, top_level_tasks, stages)
+      job_manager = CapistranoMulticonfigParallel::BaseManager.new
       if job_manager.can_start? && !options.show_prereqs && !options.show_tasks
         job_manager.start
       else
         super
       end
     end
-
-    def multi_apps?
-      stages.find { |stage| stage.include?(':') }.present?
-    end
-
   end
 end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -121,7 +121,7 @@ module CapistranoMulticonfigParallel
     end
 
     def syncronized_confirmation?
-       !@job_manager.can_tag_staging?
+      !@job_manager.can_tag_staging?
     end
 
     def apply_confirmation_for_worker(worker)
@@ -129,7 +129,7 @@ module CapistranoMulticonfigParallel
     end
 
     def setup_worker_conditions(worker)
-      return if !apply_confirmation_for_worker(worker)
+      return unless apply_confirmation_for_worker(worker)
       hash_conditions = {}
       CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
         hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
@@ -138,7 +138,7 @@ module CapistranoMulticonfigParallel
     end
 
     def mark_completed_remaining_tasks(worker)
-      return if !apply_confirmation_for_worker(worker)
+      return unless apply_confirmation_for_worker(worker)
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
         task_confirmation = @job_to_condition[worker.job_id][task]
@@ -150,7 +150,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations_worker(worker)
-      return if  !apply_confirmation_for_worker(worker) || !syncronized_confirmation?
+      return if !apply_confirmation_for_worker(worker) || !syncronized_confirmation?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         result = wait_condition_for_task(worker.job_id, task)
         confirm_task_approval(result, task, worker) if result.present?

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -149,7 +149,7 @@ module CapistranoMulticonfigParallel
     end
 
     def task_approval(message)
-        job_conditions = @manager.job_to_condition[@job_id]
+      job_conditions = @manager.job_to_condition[@job_id]
       if job_conditions.present? && CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
         task_confirmation = job_conditions[message['task']]
         task_confirmation[:status] = 'confirmed'

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -59,9 +59,8 @@ module CapistranoMulticonfigParallel
         end
       end
 
-      def verify_array_of_strings(c, prop)
-        value = c[prop]
-        return unless value.present?
+      def verify_array_of_strings(value)
+        return true if value.blank?
         value.reject(&:blank?)
         raise ArgumentError, 'the array must contain only task names' if value.find { |row| !row.is_a?(String) }
       end
@@ -87,8 +86,7 @@ module CapistranoMulticonfigParallel
       end
 
       def check_boolean(c, prop)
-        #   return unless c[prop].present?
-        raise ArgumentError, "the property `#{prop}` must be boolean" unless [true, false, 'true', 'false'].include?(c[prop].to_s.downcase)
+        raise ArgumentError, "the property `#{prop}` must be boolean" unless %w(true false).include?(c[prop].to_s.downcase)
       end
 
       def configuration_valid?(stages)
@@ -101,13 +99,9 @@ module CapistranoMulticonfigParallel
           c.send("#{prop}=", c[prop.to_sym]) if check_boolean(c, prop.to_sym)
         end
         %w(task_confirmations development_stages apply_stage_confirmation).each do |prop|
-          c.send("#{prop}=", c[prop.to_sym]) if verify_array_of_strings(c, prop.to_sym)
+          c.send("#{prop}=", c[prop.to_sym]) if c[prop.to_sym].is_a?(Array) && verify_array_of_strings(c[prop.to_sym])
         end
-        c.application_dependencies = c[:application_dependencies] if verify_application_dependencies(c[:application_dependencies])
-        check_additional_config(c)
-      end
-
-      def check_additional_config(c)
+        c.application_dependencies = c[:application_dependencies] if c[:application_dependencies].is_a?(Array) && verify_application_dependencies(c[:application_dependencies])
         CapistranoMulticonfigParallel::CelluloidManager.debug_enabled = true if c[:multi_debug].to_s.downcase == 'true'
       end
     end

data/lib/capistrano_multiconfig_parallel/managers/base_manager.rb

@@ -8,15 +8,25 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
 
-    attr_accessor :condition, :manager, :deps, :application, :stage, :name, :args, :argv, :jobs, :job_registered_condition, :default_stage, :original_argv
+    attr_accessor :stages, :top_level_tasks, :jobs, :branch_backup, :condition, :manager, :dependency_tracker, :application, :stage, :name, :args, :argv, :default_stage
 
-    def initialize(cap_app, top_level_tasks, stages)
-      @cap_app = cap_app
-      @top_level_tasks = top_level_tasks
-      @stages = stages
+    def initialize
+      @stages = fetch_stages
+      collect_command_line_tasks(CapistranoMulticonfigParallel.original_args)
       @jobs = []
     end
 
+    def fetch_stages
+      stages_root = 'config/deploy'
+      Dir["#{stages_root}/**/*.rb"].map do |file|
+        file.slice(stages_root.size + 1..-4).tr('/', ':')
+      end.tap do |paths|
+        paths.reject! do |path|
+          paths.any? { |another| another != path && another.start_with?(path + ':') }
+        end
+      end.sort
+    end
+
     def run
       options = {}
       if custom_command?
@@ -28,13 +38,12 @@ module CapistranoMulticonfigParallel
       process_jobs
     end
 
-
     def run_custom_command(options)
-      stages = fetch_multi_stages
-      return if stages.blank?
-      stages = check_multi_stages(stages)
-      stages.each do |stage|
-        collect_jobs(options.merge('stage' => stage))
+      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))
       end
     end
 
@@ -46,18 +55,18 @@ module CapistranoMulticonfigParallel
       end
     end
 
-
     def backup_the_branch
       return if custom_command? || @argv['BRANCH'].blank?
       @branch_backup = @argv['BRANCH'].to_s
       @argv['BRANCH'] = nil
     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)
+      @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)
     end
 
     def custom_commands
@@ -65,12 +74,8 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel::CUSTOM_COMMANDS[key]
     end
 
-    def executes_deploy_stages?
-      @name == custom_commands[:stages]
-    end
-
     def multi_apps?
-      @cap_app.multi_apps?
+      @stages.find { |stage| stage.include?(':') }.present?
     end
 
     def configuration
@@ -89,9 +94,19 @@ module CapistranoMulticonfigParallel
       @stage = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[0]
       @stage = @stage.present? ? @stage : @default_stage
       @name, @args = parse_task_string(@top_level_tasks.second)
-      @argv = @cap_app.handle_options.delete_if { |arg| arg == @stage || arg == @name || arg == @top_level_tasks.first }
-      @argv = multi_fetch_argv(@argv)
-      @original_argv = @argv.clone
+    end
+
+    def collect_command_line_tasks(args) # :nodoc:
+      @argv = {}
+      @top_level_tasks = []
+      args.each do |arg|
+        if arg =~ /^(\w+)=(.*)$/m
+          @argv[Regexp.last_match(1)] = Regexp.last_match(2)
+        else
+          @top_level_tasks << arg unless arg =~ /^-/
+        end
+      end
+      @top_level_tasks.push(Rake.application.default_task_name) if @top_level_tasks.blank?
     end
 
     def parse_task_string(string) # :nodoc:
@@ -130,7 +145,7 @@ module CapistranoMulticonfigParallel
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
     end
 
-    def collect_jobs(options = {}, &block)
+    def collect_jobs(options = {}, &_block)
       options = prepare_options(options)
       options = options.stringify_keys
       apps = @dependency_tracker.fetch_apps_needed_for_deployment(options['app'], options['action'])
@@ -138,7 +153,7 @@ module CapistranoMulticonfigParallel
       deploy_multiple_apps(apps, options)
       deploy_app(options)
     rescue => e
-      raise [e, e.backtrace].inspect
+      CapistranoMulticonfigParallel::Base.log_message(e)
     end
 
     def process_jobs
@@ -152,9 +167,9 @@ module CapistranoMulticonfigParallel
 
     def tag_staging_exists? # check exists task from capistrano-gitflow
       check_giflow_tasks(
-      CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK,
-      CapistranoMulticonfigParallel::GITFLOW_CALCULATE_TAG_TASK,
-      CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK
+        CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK,
+        CapistranoMulticonfigParallel::GITFLOW_CALCULATE_TAG_TASK,
+        CapistranoMulticonfigParallel::GITFLOW_VERIFY_UPTODATE_TASK
       )
     rescue
       return false
@@ -165,10 +180,10 @@ module CapistranoMulticonfigParallel
     end
 
     def fetch_multi_stages
-      stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
-      stages = parse_inputted_value('value' => stages).split(',').compact if stages.present?
-      stages = stages.present? ? stages : [@default_stage]
-      stages
+      custom_stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
+      custom_stages = parse_inputted_value('value' => custom_stages).split(',').compact if custom_stages.present?
+      custom_stages = custom_stages.present? ? custom_stages : [@default_stage]
+      custom_stages
     end
 
     def wants_deploy_production?
@@ -176,11 +191,11 @@ module CapistranoMulticonfigParallel
     end
 
     def can_tag_staging?
-      using_git? && wants_deploy_production? && tag_staging_exists? && fetch_multi_stages.include?('staging')
+      wants_deploy_production? && tag_staging_exists? && fetch_multi_stages.include?('staging')
     end
 
-    def check_multi_stages(stages)
-      can_tag_staging? ? stages.reject { |u| u == 'production' } : stages
+    def check_multi_stages(custom_stages)
+      can_tag_staging? ? custom_stages.reject { |u| u == 'production' } : custom_stages
     end
 
     def deploy_app(options = {})
@@ -206,8 +221,7 @@ module CapistranoMulticonfigParallel
       @jobs.map { |job| job['env'] }
     end
 
-
-    private
+  private
 
     def call_task_deploy_app(options = {})
       options = options.stringify_keys
@@ -290,10 +304,6 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def using_git?
-      fetch(:scm, :git).to_sym == :git
-    end
-
     def fetch_app_additional_env_options
       options = {}
       return options if fetch(:app_additional_env_options).blank?

data/lib/capistrano_multiconfig_parallel/multi_app_helpers/dependency_tracker.rb

@@ -28,7 +28,7 @@ module CapistranoMulticonfigParallel
       applications
     end
 
-    private
+  private
 
     def application_dependencies
       deps = CapistranoMulticonfigParallel.configuration.application_dependencies

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,7 +7,7 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 14
+    MINOR = 15
     TINY = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap