capistrano_multiconfig_parallel 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807e40ee77401d31f5ca168c79daa993f0742d2e
-  data.tar.gz: f0fcf399fd6dde6a96fdc40ae10fa6c6e593bd5d
+  metadata.gz: 576d2d4c017df766b649b56f90a3410f58beaf9a
+  data.tar.gz: e4952851b1bab357329ece299ee8de1346256956
 SHA512:
-  metadata.gz: 5e4d5b0d0e9869d781067480e025b25ac187c67a196247fd8f07c2691adb8f968425c297f4b3d5d788068b01b226a7668a32af096cab4b0cdadedf0dfbf2cb94
-  data.tar.gz: 1ce688cb8219b2bb26ade54ca01af7a198497ed9932ba03242a9c385f951bdc681417b42da32fbb298d613ffd6955020ff4cf29dbf448e1f2cc8906e5df399d0
+  metadata.gz: fe9d160ac7cf3658b94f70627b6a0a498097074185ebe1465de2baa638c278a80ba5d5cae140876d6ae02dc3b4e5e588b0070467ee680ef8e74d5cd7a561bc11
+  data.tar.gz: baa62229473d2fda8046a4aed016834327b9c659d088f98c876a5bdd91c7553b737a50b488b09893f844fe5d5823dbcd61620392035afd215a24035093ee54b5

data/README.md

@@ -99,7 +99,9 @@ development_stages:
   - development
   - webdev
 
-syncronize_confirmation: true  
+syncronize_confirmation: true
+apply_stage_confirmation:
+  - production  
 task_confirmation_active: false  
 task_confirmations: 
   - deploy:symlink:release
@@ -132,6 +134,10 @@ application_dependencies: []
 * --syncronize_confirmation
   * if option is present and has value TRUE, all workers will be synchronized to wait for same task from the ***task_confirmations** Array before they execute it 
 
+* --apply_stage_confirmation
+  * If option is present and has value an ARRAY of STRING, each string should be the name of a stage. 
+    The confirmations will only be applied if the workers are executing tasks to one of that stage.
+
 * --task_confirmation_active
   * if option is present and has value TRUE, will enable user confirmation dialogs before executing each task from option  **--task_confirmations**
 
@@ -176,22 +182,19 @@ bundle exec multi_cap  <development_stage> <task_name>   BOX=<box_name>,<box_nam
 ```
 
 If a branch is specified using "BRANCH=name" it will deploy same branch to all sandboxes
-If a branch is not specified, will ask for each of the sandboxes the name of the branch to deploy
 The branch environment variable is then passed to the capistrano task
 
 Also the script will ask if there are any other environment variables that user might want to pass to each of the sandboxes separately.
 
-### 1.2) Deploying the application  to multiple stages  ( Using the customized command "deploy_stages")
+### 1.2) Deploying the application  to multiple stages  ( Using the customized command "deploy_multi_stages")
   
 
 ```shell
 
-bundle exec multi_cap deploy_stages  STAGES=development, staging, production
+bundle exec multi_cap deploy_multi_stages  STAGES=development, staging, production
 ```
 
-If a branch is specified using "BRANCH=name" it will deploy same branch to all stages
-If a branch is not specified, will ask for each of the stage the name of the branch to deploy
-The branch environment variable is then passed to the capistrano process
+If a branch is specified using "BRANCH=name" it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
 
 Also the script will ask if there are any other environment variables that user might want to pass to each of the stages separately.
 
@@ -239,6 +242,17 @@ bundle exec multi_cap foo2:development deploy
 Will ask user if he wants to deploy the apps "foo" and "bar" , since they appear in the dependencies list for the application "foo2"
  
 
+### 1.2) Deploying multiple application  to multiple stages  ( Using the customized command "deploy_multi_stages")
+  
+
+```shell
+
+bundle exec multi_cap deploy_multi_stages  STAGES=development, staging, production
+```
+
+If a branch is specified using **BRANCH=<name>** it will deploy same branch to all stages.The branch environment variable is then passed to the capistrano task
+If you want different branches , capistrano will ask for additional ENV options for each stage, and can be specified then for each stage
+
  Testing
 --------
 

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -14,7 +14,6 @@ module CapistranoMulticonfigParallel
 
   CUSTOM_COMMANDS = {
     CapistranoMulticonfigParallel::MULTI_KEY => {
-      menu: 'show_menu',
       stages: 'deploy_multi_stages'
     },
     CapistranoMulticonfigParallel::SINGLE_KEY => {
@@ -23,7 +22,7 @@ module CapistranoMulticonfigParallel
   }
 
   class << self
-    attr_accessor :show_task_progress, :execute_in_sequence, :logger, :original_args
+    attr_accessor :show_task_progress, :execute_in_sequence, :logger, :original_args, :interactive_menu
 
     def root
       File.expand_path(File.dirname(__dir__))

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -105,27 +105,28 @@ module CapistranoMulticonfigParallel
       debug("all jobs have completed #{condition}") if self.class.debug_enabled?
       @job_manager.condition.signal('completed') if condition
     end
-
+    
+    def apply_confirmations?
+       CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true' &&
+        CapistranoMulticonfigParallel.configuration.apply_stage_confirmation.include?(@job_manager.stage)
+    end
+    
     def syncronized_confirmation?
-      CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true' && !@job_manager.executes_deploy_stages?
+        CapistranoMulticonfigParallel.configuration.syncronize_confirmation.to_s.downcase == 'true' && 
+        !@job_manager.executes_deploy_stages? 
     end
 
     def setup_worker_conditions(worker)
+      return unless  apply_confirmations?
       hash_conditions = {}
-      if need_confirmations?
-        CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
-          hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
-        end
+      CapistranoMulticonfigParallel.configuration.task_confirmations.each do |task|
+        hash_conditions[task] = { condition: Celluloid::Condition.new, status: 'unconfirmed' }
       end
       @job_to_condition[worker.job_id] = hash_conditions
     end
 
-    def need_confirmations?
-      CapistranoMulticonfigParallel.configuration.task_confirmation_active.to_s.downcase == 'true'
-    end
-
     def mark_completed_remaining_tasks(worker)
-      return unless need_confirmations?
+      return unless apply_confirmations?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         fake_result = proc { |sum| sum }
         task_confirmation = @job_to_condition[worker.job_id][task]
@@ -137,7 +138,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations_worker(worker)
-      return if !need_confirmations? || syncronized_confirmation?
+      return if !apply_confirmations?  || 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?
@@ -149,7 +150,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_task_confirmations
-      return unless need_confirmations?
+      return  if !apply_confirmations? || !syncronized_confirmation?
       CapistranoMulticonfigParallel.configuration.task_confirmations.each_with_index do |task, _index|
         results = []
         @jobs.pmap do |job_id, _job|

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -38,7 +38,7 @@ module CapistranoMulticonfigParallel
       @machine = CapistranoMulticonfigParallel::StateMachine.new(job, Actor.current)
       manager.register_worker_for_job(job, Actor.current)
     end
-
+    
     def debug_enabled?
       @manager.class.debug_enabled?
     end
@@ -102,7 +102,7 @@ module CapistranoMulticonfigParallel
       setup_task_arguments
       debug("worker #{@job_id} executes: #{generate_command}") if debug_enabled?
       @child_process.async.work(generate_command, actor: Actor.current, silent: true)
-      @manager.wait_task_confirmations_worker(Actor.current) unless @manager.syncronized_confirmation?
+      @manager.wait_task_confirmations_worker(Actor.current)
     end
 
     def check_child_proces
@@ -135,7 +135,7 @@ module CapistranoMulticonfigParallel
     end
 
     def task_approval(message)
-      if CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
+      if @manager.apply_confirmations? && CapistranoMulticonfigParallel.configuration.task_confirmations.include?(message['task']) && message['action'] == 'invoke'
         task_confirmation = @manager.job_to_condition[@job_id][message['task']]
         task_confirmation[:status] = 'confirmed'
         task_confirmation[:condition].signal(message['task'])

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -98,6 +98,13 @@ module CapistranoMulticonfigParallel
                                 \t from the ***task_confirmations** Array before they execute it ",
             default: default_config[:syncronize_confirmation]
           },
+          {
+            name: 'apply_stage_confirmation',
+            type: Array,
+            description: "if option is present and has value TRUE, all workers will be synchronized to wait for same task
+                                \t from the ***task_confirmations** Array before they execute it ",
+            default: default_config[:apply_stage_confirmation]
+          },
           {
             name: 'track_dependencies',
             type: :boolean,
@@ -159,10 +166,10 @@ module CapistranoMulticonfigParallel
       end
 
       def check_configuration(c)
-        %w(multi_debug multi_progress multi_secvential task_confirmation_active track_dependencies websocket_server.enable_debug).each do |prop|
+        %w(multi_debug multi_progress multi_secvential task_confirmation_active track_dependencies websocket_server.enable_debug syncronize_confirmation).each do |prop|
           c.send("#{prop}=", c[prop.to_sym]) if check_boolean(c, prop.to_sym)
         end
-        %w(task_confirmations development_stages).each do |prop|
+        %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])

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -42,17 +42,19 @@ module CapistranoMulticonfigParallel
     end
     
     def start(&block)
-       CapistranoMulticonfigParallel.configuration_valid?
+      CapistranoMulticonfigParallel.configuration_valid?
+      @default_stage = CapistranoMulticonfigParallel.configuration.development_stages.present? ? CapistranoMulticonfigParallel.configuration.development_stages.first : 'development'
       check_before_starting
       @application = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[1]
       @stage = custom_command? ? nil : @top_level_tasks.first.split(':').reverse[0]
+      @stage = @stage.present? ? @stage : @default_stage
       @name, @args = @cap_app.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)
       block.call if block_given?
       run
     end
-
+    
     def check_before_starting
       @condition = Celluloid::Condition.new
       @manager = CapistranoMulticonfigParallel::CelluloidManager.new(Actor.current)
@@ -89,13 +91,13 @@ module CapistranoMulticonfigParallel
       app = options['app'].is_a?(Hash) ? options['app'] : { 'app' => options['app'] }
       branch = @branch_backup.present? ? @branch_backup : @argv['BRANCH'].to_s
       call_task_deploy_app({
-        branch: branch,
-        app: app,
-        action: options['action']
-      }.reverse_merge(options))
+          branch: branch,
+          app: app,
+          action: options['action']
+        }.reverse_merge(options))
     end
 
-  private
+    private
 
     def call_task_deploy_app(options = {})
       options = options.stringify_keys
@@ -154,8 +156,6 @@ module CapistranoMulticonfigParallel
     end
 
     def prepare_options(options)
-      @default_stage = CapistranoMulticonfigParallel.configuration.development_stages.present? ? CapistranoMulticonfigParallel.configuration.development_stages.first : 'development'
-      @stage = @stage.present? ? @stage : @default_stage
       options = options.stringify_keys
       options['app'] = options.fetch('app', @application.to_s.clone)
       options['action'] = options.fetch('action', @name.to_s.clone)

data/lib/capistrano_multiconfig_parallel/helpers/multi_app_manager.rb

@@ -39,9 +39,7 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel.interactive_menu = true
       options[:action] = @argv['ACTION'].present? ? @argv['ACTION'].present? : 'deploy'
       action_name = @name
-      if action_name == custom_commands[:menu]
-        menu_deploy_interactive(options)
-      elsif action_name == custom_commands[:stages]
+      if  action_name == custom_commands[:stages]
         multi_stage_deploy(options)
       else
         raise "Custom command #{@name} not available for multi apps"

data/lib/capistrano_multiconfig_parallel/initializers/default.yml

@@ -9,6 +9,8 @@ development_stages:
   - webdev
 
 syncronize_confirmation: true  
+apply_stage_confirmation:
+  - production
 task_confirmation_active: false  
 task_confirmations: 
   - deploy:symlink:release

data/lib/capistrano_multiconfig_parallel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap