capistrano_multiconfig_parallel 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a94bfcd478671618c964a8aceeea6279ce001d7
-  data.tar.gz: 7f532987d4c39dfad8a69b5d5abfa887076c5363
+  metadata.gz: c0d7fbfdddb1813c37500eed17d8d200fa162d35
+  data.tar.gz: f28477691b9551c1e59040c561869a4246e2ef0c
 SHA512:
-  metadata.gz: 5df46089130cd81277c53146c72564634d9e22ff41060cef8b5acfffd770b5f70d9fc98da828e8cb392de28c5689242d44d504164cf7fc5d6f531972d50be099
-  data.tar.gz: eab535d887b690c6358adf9815e609bad57c26a7c3ba1456ec6301fc90cf24e1413e13b654db0c8b3eededb0423f3569bce9f750190cd4579d8473e27a4db8fb
+  metadata.gz: 38032af4671c6b73fe789c0014d7d6d410a4fe72e1dc5563f2645ec1df061aaef191cfa2e5b183c2396f4d6697ef804f4e1e1236168d030cb81286d46c915423
+  data.tar.gz: 8e4c41d88e958835fa3682180809c9fd11f8dfa02425d9b020ee204c283dcd894e9514f6db4227fe8fce7931faddf5d9a28c13469b1fefbc614193b56abf1686

data/README.md

@@ -79,7 +79,6 @@ apply_stage_confirmation:
 task_confirmations:
   - deploy:symlink:release
 
-track_dependencies: false
 application_dependencies: []
 ---
 ```
@@ -111,9 +110,9 @@ Available command line options when executing a command
 
 	-	if option is present and has value an ARRAY of Strings, and --task_confirmation_active is TRUE , then will require a confirmation from user before executing the task. This will syncronize all workers to wait before executing that task, then a confirmation will be displayed, and when user will confirm , all workers will resume their operation.
 
--	--track_dependencies
+-	--application_dependencies
 
-	-	This should be useed only for Caphub-like applications , in order to deploy dependencies of an application in parallel. This is used only in combination with option **--application_dependencies** which 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](#multiple_apps)**
 
 Usage Instructions
 ==================
@@ -171,7 +170,6 @@ Configuration for this types of application is more complicated
 
 ```yaml
 ---
-track_dependencies: true
 application_dependencies:
     - app: foo'
       priority: 1
@@ -190,8 +188,6 @@ application_dependencies:
 
 The "development_stages" options is used so that the gem can know if sandboxes are allowed for those environments.
 
-If you want to deploy an application with dependencies you can use the option "track_dependencies". If that options has value "true" , it will ask the user before deploying a application if he needs the dependencies deployed too
-
 The dependencies are being kept in the option "application_dependencies" This is an array of hashes. Each hash has only the keys "app" ( app name), "priority" and "dependencies" ( an array of app names that this app is dependent to)
 
 In this example, if we execute this command:

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -54,7 +54,6 @@ module CapistranoMulticonfigParallel
     end
 
     def enable_logging
-      CapistranoMulticonfigParallel.configuration_valid?
       FileUtils.mkdir_p(log_directory) unless File.directory?(log_directory)
       if CapistranoMulticonfigParallel::CelluloidManager.debug_enabled.to_s.downcase == 'true'
         FileUtils.touch(main_log_file) unless File.file?(main_log_file)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -116,11 +116,10 @@ module CapistranoMulticonfigParallel
     end
 
     def apply_confirmations?
-     confirmations =   CapistranoMulticonfigParallel.configuration.task_confirmations
+      confirmations = CapistranoMulticonfigParallel.configuration.task_confirmations
       confirmations.is_a?(Array) && confirmations.present?
     end
 
-
     def syncronized_confirmation?
       (!@job_manager.executes_deploy_stages?) ||
         (@job_manager.executes_deploy_stages? && !@job_manager.can_tag_staging? && @job_manager.confirmation_applies_to_all_workers?)

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -78,23 +78,32 @@ module CapistranoMulticonfigParallel
         raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
       end
 
+      def verify_app_dependencies(stages)
+        applications = stages.map { |stage| stage.split(':').reverse[1] }
+        wrong = configuration.application_dependencies.find do |hash|
+          !applications.include?(hash[:app]) || (hash[:dependencies].present? && hash[:dependencies].find { |val| !applications.include?(val) })
+        end
+        raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
+      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)
       end
 
-      def configuration_valid?
+      def configuration_valid?(stages)
         configuration
+        verify_app_dependencies(stages) if configuration.application_dependencies.present?
       end
 
       def check_configuration(c)
-        %w(multi_debug multi_secvential track_dependencies websocket_server.enable_debug).each do |prop|
+        %w(multi_debug multi_secvential websocket_server.enable_debug).each do |prop|
           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)
         end
-        c.application_dependencies = c[:application_dependencies] if c[:track_dependencies].to_s.downcase == 'true' && verify_application_dependencies(c[:application_dependencies])
+        c.application_dependencies = c[:application_dependencies] if verify_application_dependencies(c[:application_dependencies])
         check_additional_config(c)
       end
 

data/lib/capistrano_multiconfig_parallel/initializers/default.yml

@@ -45,14 +45,6 @@ default_config:
     default:
       - production
 
-  - name: 'track_dependencies'
-    type: ':boolean'
-    description: >-
-      This should be useed only for Caphub-like applications ,
-      in order to deploy dependencies of an application in parallel.
-      This is used only in combination with option **--application_dependencies**
-      CAP_VALUE can be true or false
-    default: false
 
   - name: 'application_dependencies'
     type: 'Array'

data/lib/capistrano_multiconfig_parallel/managers/base_manager.rb

@@ -14,7 +14,17 @@ module CapistranoMulticonfigParallel
       @top_level_tasks = top_level_tasks
       @stages = stages
       @jobs = []
-      CapistranoMulticonfigParallel.enable_logging
+    end
+
+    def run
+      options = {}
+      if custom_command?
+        run_custom_command(options)
+      else
+        options = verify_options_custom_command(options)
+        run_normal_command(options)
+      end
+      process_jobs
     end
 
     def can_start?
@@ -87,7 +97,9 @@ module CapistranoMulticonfigParallel
     end
 
     def check_before_starting
-      CapistranoMulticonfigParallel.configuration_valid?
+      CapistranoMulticonfigParallel.configuration_valid?(@stages)
+      CapistranoMulticonfigParallel.enable_logging
+      @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(Actor.current)
       @default_stage = CapistranoMulticonfigParallel.configuration.development_stages.present? ? CapistranoMulticonfigParallel.configuration.development_stages.first : 'development'
       @condition = Celluloid::Condition.new
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
@@ -95,6 +107,7 @@ module CapistranoMulticonfigParallel
 
     def collect_jobs(options = {}, &block)
       options = prepare_options(options)
+      options = options.stringify_keys
       block.call(options) if block_given?
     rescue => e
       raise [e, e.backtrace].inspect

data/lib/capistrano_multiconfig_parallel/managers/multi_app_manager.rb

@@ -6,47 +6,15 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
 
-    def initialize(cap_app, top_level_tasks, stages)
-      super(cap_app, top_level_tasks, stages)
-      @dependency_tracker = CapistranoMulticonfigParallel::DependencyTracker.new(Actor.current)
-    end
-
-    def check_before_starting
-      verify_app_dependencies(@stages) if configuration.present? && configuration.track_dependencies.to_s.downcase == 'true'
-      super
-    end
-
-    def verify_app_dependencies(stages)
-      applications = stages.map { |stage| stage.split(':').reverse[1] }
-      wrong = configuration.application_dependencies.find do |hash|
-        !applications.include?(hash[:app]) || (hash[:dependencies].present? && hash[:dependencies].find { |val| !applications.include?(val) })
-      end
-      raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
-    end
-
-    def run
-      options = {}
-      if custom_command?
-        run_custom_command(options)
-      else
-        menu_deploy_interactive(options)
+    def run_normal_command(options)
+      multi_collect_and_run_jobs(options) do |apps, new_options|
+        deploy_multiple_apps(apps, new_options)
+        deploy_app(new_options) if !custom_command? && new_options['app'].present?
       end
-      process_jobs
     end
 
     def run_custom_command(options)
-      return unless custom_command?
       CapistranoMulticonfigParallel.interactive_menu = true
-      options = verify_options_custom_command(options)
-      action_name = @name
-      if action_name == custom_commands[:stages]
-        multi_stage_deploy(options)
-      else
-        raise "Custom command #{@name} not available for multi apps"
-      end
-    end
-
-    def multi_stage_deploy(options)
       stages = fetch_multi_stages
       return if stages.blank?
       stages = check_multi_stages(stages)
@@ -59,13 +27,6 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def menu_deploy_interactive(options)
-      multi_collect_and_run_jobs(options) do |apps, new_options|
-        deploy_multiple_apps(apps, new_options)
-        deploy_app(new_options) if !custom_command? && new_options['app'].present?
-      end
-    end
-
   private
 
     def multi_collect_and_run_jobs(options = {}, &block)

data/lib/capistrano_multiconfig_parallel/managers/single_app_manager.rb

@@ -5,29 +5,13 @@ module CapistranoMulticonfigParallel
     include Celluloid
     include Celluloid::Logger
 
-    def run
-      options = {}
-      if custom_command?
-        run_custom_command(options)
-      else
-        deploy_single_app(options)
+    def run_normal_command(options)
+      collect_jobs(options) do |new_options|
+        deploy_app(new_options)
       end
-      process_jobs
     end
 
     def run_custom_command(options)
-      return unless custom_command?
-      options = verify_options_custom_command(options)
-      action_name = @name
-      if action_name == custom_commands[:stages]
-        stage_deploy(options)
-      else
-        raise "Custom command #{@name} not available for single apps"
-      end
-    end
-
-    def stage_deploy(options)
-      return unless custom_command?
       stages = fetch_multi_stages
       return if stages.blank?
       stages = check_multi_stages(stages)
@@ -37,12 +21,5 @@ module CapistranoMulticonfigParallel
         end
       end
     end
-
-    def deploy_single_app(options)
-      return if custom_command?
-      collect_jobs(options) do |new_options|
-        deploy_app(new_options)
-      end
-    end
   end
 end

data/lib/capistrano_multiconfig_parallel/multi_app_helpers/dependency_tracker.rb

@@ -14,7 +14,7 @@ module CapistranoMulticonfigParallel
       if @job_manager.custom_command? && @job_manager.multi_apps?
         apps_selected = all_websites_return_applications_selected
         applications = get_applications_to_deploy(action, apps_selected)
-      elsif CapistranoMulticonfigParallel.configuration.track_dependencies
+      elsif CapistranoMulticonfigParallel.configuration.application_dependencies.present?
         if application.present?
           applications = get_applications_to_deploy(action, [application.camelcase])
           applications = applications.delete_if { |hash| hash['app'] == application }
@@ -30,7 +30,7 @@ module CapistranoMulticonfigParallel
   private
 
     def application_dependencies
-      deps = CapistranoMulticonfigParallel.configuration.track_dependencies ? CapistranoMulticonfigParallel.configuration.application_dependencies : []
+      deps = CapistranoMulticonfigParallel.configuration.application_dependencies
       deps.present? && deps.is_a?(Array) ? deps.map(&:stringify_keys) : []
     end
 

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 13
-    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.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - bogdanRada