capistrano_multiconfig_parallel 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a78671478f02eea81290937d810f8d201a64035
-  data.tar.gz: 5c4a60eb2789c9b1df47f226b9afabbc29ad532d
+  metadata.gz: 7e02536cc3ccf434baaac3f46f7b84b91d6eda10
+  data.tar.gz: 0631bf39e10f727ac6180498b18e5f997a4cf610
 SHA512:
-  metadata.gz: d43f718c5aeea36c005ddbba82aca7135e318d122fbb29f7c2b83d23f467866ea1c6f454a3d944f5ae888672433721de667618ffb1793ef9778351c9da86d75a
-  data.tar.gz: 8e4b19c83d44d3df10878ba3212718a565c50d1b5db0d79f248effb2e3e6b338396cb9c74af6d0922a7a57993196ff5f10765659fc573c821bc86f04e3e54dcc
+  metadata.gz: f1fe7728cd4b3ccee8d7b698707e0bf2dac2668552f37b0eaae8dda5d317dace22acc607b3f081f466bb6eb485c8b690b45072ee19998bc2ed253dcba25240f9
+  data.tar.gz: 43cc88221c00e64976f2d2a367e3704ad7ce2c9b2b406e63765d3ed7fc8e7f19601cad34da711ae957dbee0c0a3803a59e16c08d3a153e7f2214485b83fe537f

data/README.md

@@ -6,6 +6,11 @@ capistrano_multiconfig_parallel
 [![Gem Downloads](https://ruby-gem-downloads-badge.herokuapp.com/capistrano_multiconfig_parallel?type=total&style=dynamic)](https://github.com/bogdanRada/capistrano_multiconfig_parallel)
 [![Maintenance Status](http://stillmaintained.com/bogdanRada/capistrano_multiconfig_parallel.png)](https://github.com/bogdanRada/capistrano_multiconfig_parallel)
 
+DEMO
+--------
+
+[![capistrano multiconfig parallel ](img/parallel_demo.png)](#features)
+
 Description
 --------
 CapistranoMulticonfigParallel is a simple ruby implementation that allows you to run multiple tasks in parallel for multiple applications and uses websockets for inter-process communication and has a interactive menu
@@ -33,7 +38,8 @@ Requirements
 10. [right_popen >= 1.1.3] [right_popen]
 11. [capistrano-multiconfig >= 3.0.8] [capistrano-multiconfig]
 12. [capistrano >= 3.0] [capistrano]
-13. [configurations >= 2.0.0] [configurations]
+13. [configliere >= 0.4] [configliere]
+14.  [inquirer >= 0.2] [inquirer]
 
 [ruby]: http://www.ruby-lang.org
 [activesupport]:https://rubygems.org/gems/activesupport
@@ -47,7 +53,8 @@ Requirements
 [right_popen]: https://github.com/rightscale/right_popen
 [capistrano-multiconfig]: https://github.com/railsware/capistrano-multiconfig
 [capistrano]: https://github.com/capistrano/capistrano/
-[configurations]: https://github.com/beatrichartz/configurations
+[configliere]: https://github.com/infochimps-platform/configliere
+[inquirer]: https://github.com/arlimus/inquirer.rb
 
 Compatibility
 --------
@@ -77,23 +84,83 @@ Add the following to your Capfile:
 Please read  [Release Details][release-details] if you are upgrading. We break backward compatibility between large ticks but you can expect it to be specified at release notes.
 [release-details]: https://github.com/bogdanRada/capistrano_multiconfig_parallel/releases
 
-Usage Instructions
+Default Configuration:
 --------
 
-[![capistrano multiconfig parallel ](img/parallel_demo.png)](#features)
+```yaml
+---
+multi_debug: true
+multi_progres: false
+multi_secvential: false
+websocket_server:
+  enable_debug: false
+  
+development_stages: 
+  - development
+  - webdev
+  
+task_confirmation_active: false  
+task_confirmations: 
+  - deploy:symlink:release
+
+track_dependencies: false
+application_dependencies: []
+---
+```
+
+ Available command line  options when executing a command
+--------
+
+* --multi-debug
+  * if option is present and has value TRUE , will enable debugging of workers
+
+* --multi-progress
+  * If option is present and has value TRUE  will first execute before any process , same task but with option "--dry-run" in order to show progress of how many tasks are in total for that task and what is the progress of executing
+ This will slow down the workers , because they will execute twice the same task.
+
+* --multi-secvential
+  * If parallel executing does not work for you, you can use this option so that each process is executed normally and ouputted to the screen.
+  However this means that all other tasks will have to wait for each other to finish before starting 
+
+* --websocket_server.enable_debug 
+  * if option is present and has value TRUE, will enable debugging of websocket communication between the workers
+
+* --development_stages
+  * if option is present and has value an ARRAY of STRINGS, each of them will be used as a development stage
 
-1. Single Apps ( normal Rails or rack applications) 
+* --task_confirmation_active
+  * if option is present and has value TRUE, will enable user confirmation dialogs before executing each task from option  **--task_confirmations**
+
+* --task_confirmations:
+  * 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
+  * 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)**
+
+Usage Instructions
+========
+
+In order to override default configurations, you can either specify them at runtime using command-line , or you can 
+create a file in location **config/multi_cap.yml** . This settings will be overriden by command line arguments( if any)
+
+## 1) Single Apps ( normal Rails or rack applications) 
     
 CapistranoMulticonfigParallel recognizes only "development" and "webdev" as stages for development
-if you use other stages for development, you need to configure it like this. This will override the default configuration.
-You will need to require this file in your Capfile also.
-
-```ruby
-CapistranoMulticonfigParallel.configure do |c|
-c.development_stages = ["development", "some_other_stage"]
-end
+if you use other stages for development, you need to configure it like this
+
+```yaml
+---
+development_stages:
+  - development
+  - webdev
+  - something_custom
+----
 ```
-### Deploying the application  to multiple sandboxes ( works only with development environments)
+
+### 1.1) Deploying the application  to multiple sandboxes ( works only with development environments)
 
 ```shell
 # <box_name>     - the name of a sandbox
@@ -110,7 +177,7 @@ 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.
 
-### 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_stages")
   
 
 ```shell
@@ -126,33 +193,32 @@ Also the script will ask if there are any other environment variables that user
 
 
 
-2. Multiple Apps ( like [Caphub][caphub]  ) 
+## 2.)  Multiple Apps ( like [Caphub][caphub]  ) 
 
 
 Configuration for this types of application is more complicated
 
-```ruby
-CapistranoMulticonfigParallel.configure do |c|
-c.development_stages = ['development', 'webdev']  
-c.task_confirmation_active = true
- c.task_confirmations = ['deploy:symlink:release'] 
- c.track_dependencies = true
-  c.application_dependencies = [
-    { app: 'blog', priority: 1, dependencies: [] },
-    { app: 'blog2', priority: 2, dependencies: ['blog'] },
-    { app: 'blog3', priority: 3, dependencies: ['blog', 'blog2'] },
-  ]
-end
+```yaml
+---
+track_dependencies: true
+application_dependencies:
+    - app: foo'
+      priority: 1
+      dependencies: []
+    - app: bar
+      priority: 1
+      dependencies: 
+        - foo
+    - app: foo2
+      priority: 1
+      dependencies: 
+        - foo
+        - bar
+---
 ```
 
 The "development_stages" options is used so that the gem can know if sandboxes are allowed for those environments.
 
-The "task_confirmation_active" option can have only two values:
-    - false  - all threads are executing normally without needing confirmation from user
-   - true - means threads need confirmation from user ( Can we used to synchronize all processes to wait before executing a task) 
-             For this we use the option "task_confirmations" which is a array with string. 
-              Each string is  the name of the task that needs confirmation.
-
 
 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
@@ -160,32 +226,14 @@ If that options has value "true" , it will ask the user before deploying a appli
 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)
 
- Default Configuration:
---------
+In this example, if we execute this command:
 
 ```ruby
-CapistranoMulticonfigParallel.configure do |c|
-   c.task_confirmations = ['deploy:symlink:release']
-        c.task_confirmation_active = false
-        c.track_dependencies = false
-        c.websocket_server = { enable_debug: false }
-        c.development_stages = ['development', 'webdev']
-end
+bundle exec multi_cap foo2:development deploy 
 ```
 
- Available command line  options when executing a command
---------
-
---multi-debug
-   If option is present , will enable debugging of workers
-
---multi-progress
-  If option is present will first execute before any process , same task but with option "--dry-run" in order to show progress of how many tasks are in total for that task and what is the progress of executing
- This will slow down the workers , because they will execute twice the same task.
-
---multi-secvential
-  If parallel executing does not work for you, you can use this option so that each process is executed normally and ouputted to the screen.
-  However this means that all other tasks will have to wait for each other to finish before starting 
+Will ask user if he wants to deploy the apps "foo" and "bar" , since they appear in the dependencies list for the application "foo2"
+ 
 
  Testing
 --------

data/capistrano_multiconfig_parallel.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   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 'configurations', '~> 2.0', '2.0.0'
+  s.add_runtime_dependency 'configliere', '~> 0.4', '>=0.4'
   s.add_runtime_dependency 'inquirer', '~> 0.2', '>= 0.2'
     
   s.add_development_dependency 'rspec-rails', '~> 2.0', '>= 2.0'

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -20,7 +20,6 @@ require 'capistrano/all'
 require 'fileutils'
 require 'logger'
 require 'pp'
-require 'configurations'
 # fix error with not files that can not be found
 Gem.find_files('composable_state_machine/**/*.rb').each { |path| require path }
 

data/lib/capistrano_multiconfig_parallel/application.rb

@@ -6,35 +6,7 @@ module CapistranoMulticonfigParallel
     end
 
     def sort_options(options)
-      super.push(multi_debug, multi_progress, multi_secvential)
-    end
-
-    def multi_debug
-      ['--multi-debug', '-D',
-       'Sets the debug enabled for celluloid actors',
-       lambda do |_value|
-         CapistranoMulticonfigParallel::CelluloidManager.debug_enabled = true
-         Celluloid.task_class = Celluloid::TaskThread
-       end
-      ]
-    end
-
-    def multi_progress
-      ['--multi-progress', '--multi-progress',
-       'Sets the debug enabled for celluloid actors',
-       lambda do |_value|
-         CapistranoMulticonfigParallel.show_task_progress = true
-       end
-      ]
-    end
-
-    def multi_secvential
-      ['--multi-secvential', '--multi-secvential',
-       'Sets the debug enabled for celluloid actors',
-       lambda do |_value|
-         CapistranoMulticonfigParallel.execute_in_sequence = true
-       end
-      ]
+      super.concat(CapistranoMulticonfigParallel.capistrano_options)
     end
 
     def top_level

data/lib/capistrano_multiconfig_parallel/base.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler'
 require 'bundler/setup'
-require 'configurations'
 require 'inquirer'
 require_relative './version'
 require_relative './configuration'
@@ -29,9 +28,9 @@ module CapistranoMulticonfigParallel
     def root
       File.expand_path(File.dirname(__dir__))
     end
-    
+
     def ask_confirm(message, default)
-     Ask.input message, default: default
+      Ask.input message, default: default
     end
 
     def verify_app_dependencies(stages)
@@ -51,10 +50,11 @@ module CapistranoMulticonfigParallel
     end
 
     def websokect_log_file
-      File.join(log_directory, 'multi_cap_webscoket.log')
+      File.join(log_directory, 'multi_cap_websocket.log')
     end
 
     def enable_logging
+      CapistranoMulticonfigParallel.configuration_valid?
       return unless CapistranoMulticonfigParallel::CelluloidManager.debug_enabled
       FileUtils.mkdir_p(log_directory)
       log_file = File.open(main_log_file, 'w')
@@ -68,9 +68,11 @@ module CapistranoMulticonfigParallel
       error_message = message.respond_to?(:message) ? message.message : message.inspect
       err_backtrace = message.respond_to?(:backtrace) ? message.backtrace.join("\n\n") : ''
       if err_backtrace.present?
-        logger.debug(class: message.class,
-                     message: error_message,
-                     backtrace: err_backtrace)
+        logger.debug(
+          class_name: message.class,
+          message: error_message,
+          backtrace: err_backtrace
+        )
       else
         logger.debug(message)
       end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -44,12 +44,12 @@ module CapistranoMulticonfigParallel
     def self.debug_websocket?
       websocket_config['enable_debug'].to_s == 'true'
     end
-    
+
     def self.websocket_config
-      config = CapistranoMulticonfigParallel.configuration.websocket_server
+      config = CapistranoMulticonfigParallel.configuration[:websocket_server]
       config.present? && config.is_a?(Hash) ? config.stringify_keys : {}
     end
-    
+
     def generate_job_id(job)
       primary_key = @jobs.size + 1
       job['id'] = primary_key

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -42,12 +42,11 @@ module CapistranoMulticonfigParallel
     def debug_enabled?
       @manager.class.debug_enabled?
     end
-    
 
     def start_task
       debug("exec worker #{@job_id} starts task with #{@job.inspect}") if debug_enabled?
       @task_confirmations = CapistranoMulticonfigParallel.configuration.task_confirmations
-      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug:  @manager.class.debug_websocket?) do |ws|
+      @client = CelluloidPubsub::Client.connect(actor: Actor.current, enable_debug: @manager.class.debug_websocket?) do |ws|
         ws.subscribe(@subscription_channel)
       end
     end

data/lib/capistrano_multiconfig_parallel/cli.rb

@@ -10,8 +10,7 @@ module CapistranoMulticonfigParallel
       if $stdout.isatty
         $stdout.sync = true
       end
-      CapistranoMulticonfigParallel.configuration_valid?
-      CapistranoMulticonfigParallel.verify_app_dependencies(stages) if CapistranoMulticonfigParallel.configuration.track_dependencies
+      CapistranoMulticonfigParallel.enable_logging
       CapistranoMulticonfigParallel::Application.new.run
     rescue Interrupt
       `stty icanon echo`

data/lib/capistrano_multiconfig_parallel/configuration.rb

@@ -4,17 +4,127 @@ module CapistranoMulticonfigParallel
   module Configuration
     extend ActiveSupport::Concern
 
-    included do
-      include Configurations
+    class_methods do
+      attr_accessor :configuration
 
-      configurable Hash, :websocket_server
-      configurable Array, :development_stages
+      def configuration
+        @config ||= Configliere::Param.new
+        @config.use :commandline
+        command_line_params.each do |param|
+          @config.define param[:name], type: param[:type], description: param[:description], default: param[:default]
+        end
+        @config.merge(Settings.use(:commandline).resolve!)
+        @config.read config_file if File.file?(config_file)
+
+        @config.use :config_block
+        @config.finally do |c|
+          check_configuration(c)
+        end
+        @config.resolve!
+      rescue => ex
+        puts ex.inspect
+        puts ex.backtrace if ex.respond_to?(:backtrace)
+      end
+
+      def default_config
+        @default_config ||= Configliere::Param.new
+        @default_config.read File.join(CapistranoMulticonfigParallel.root.to_s, 'capistrano_multiconfig_parallel', 'initializers', 'default.yml')
+        @default_config.resolve!
+      end
+
+      def config_file
+        File.join(CapistranoMulticonfigParallel.detect_root.to_s, 'config', 'multi_cap.yml')
+      end
+
+      def command_line_params
+        [
+          {
+            name: 'multi_debug',
+            type: :boolean,
+            description: '[MULTI_CAP] if option is present and has value TRUE , will enable debugging of workers',
+            default: default_config[:multi_debug]
+          },
+          {
+            name: 'multi_progress',
+            type: :boolean,
+            description: "[MULTI_CAP] if option is present and has value TRUE  will first execute before any process ,
+            same task but with option '--dry-run'  in order to show progress of how many tasks are in total for that task and what is the progress of executing
+           This will slow down the workers , because they will execute twice the same task.",
+            default: default_config[:multi_progress]
+          },
+          {
+            name: 'multi_secvential',
+            type: :boolean,
+            description: "[MULTI_CAP] If parallel executing does not work for you, you can use this option so that each process is executed normally and ouputted to the screen.
+  However this means that all other tasks will have to wait for each other to finish before starting ",
+            default: default_config[:multi_secvential]
+          },
+          {
+            name: 'websocket_server.enable_debug',
+            type: :boolean,
+            description: '[MULTI_CAP]  if option is present and has value TRUE, will enable debugging of websocket communication between the workers',
+            default: default_config[:websocket_server][:enable_debug]
+          },
+          {
+            name: 'development_stages',
+            type: Array,
+            description: '[MULTI_CAP] if option is present and has value an ARRAY of STRINGS, each of them will be used as a development stage',
+            default: default_config[:development_stages]
+          },
+          {
+            name: 'task_confirmations',
+            type: Array,
+            description: '[MULTI_CAP] if option is present and has value TRUE, will enable user confirmation dialogs
+                                before executing each task from option  **--task_confirmations**',
+            default: default_config[:task_confirmations]
+          },
+          {
+            name: 'task_confirmation_active',
+            type: :boolean,
+            description: "[MULTI_CAP] 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",
+            default: default_config[:task_confirmation_active]
+          },
+          {
+            name: 'track_dependencies',
+            type: :boolean,
+            description: "[MULTI_CAP] 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)**",
+            default: default_config[:track_dependencies]
+          },
+          {
+            name: 'application_dependencies',
+            type: Array,
+            description: "[MULTI_CAP] 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) ",
+            default: default_config[:application_dependencies]
+          }
+        ]
+      end
+
+      def capistrano_options
+        command_line_params.map do |param|
+          [
+            "--#{param[:name]}[=CAP_VALUE]",
+            "--#{param[:name]}",
+            param[:description],
+            lambda do |_value|
+            end
+          ]
+        end
+      end
 
-      configurable :track_dependencies do |value|
-        check_boolean(:track_dependencies, value)
+      def verify_array_of_strings(c, prop)
+        value = c[prop]
+        return unless value.present?
+        value.reject(&:blank?)
+        raise ArgumentError, 'the array must contain only task names' if value.find { |row| !row.is_a?(String) }
       end
 
-      configurable Array, :application_dependencies do |value|
+      def verify_application_dependencies(value)
         value.reject { |val| val.blank? || !val.is_a?(Hash) }
         wrong = value.find do|hash|
           !Set[:app, :priority, :dependencies].subset?(hash.keys.to_set) ||
@@ -26,44 +136,33 @@ module CapistranoMulticonfigParallel
         raise ArgumentError, "invalid configuration for #{wrong.inspect}" if wrong.present?
       end
 
-      configurable :task_confirmation_active do |value|
-        check_boolean(:task_confirmation_active, value)
-      end
-
-      configurable Array, :task_confirmations do |value|
-        value.reject(&:blank?)
-        if value.find { |row| !row.is_a?(String) }
-          raise ArgumentError, 'the array must contain only task names'
-        end
-      end
-
-      configuration_defaults do |c|
-        c.task_confirmations = ['deploy:symlink:release']
-        c.task_confirmation_active = false
-        c.track_dependencies = false
-        c.websocket_server = { enable_debug: false }
-        c.development_stages = ['development', 'webdev']
-      end
-
-      not_configured do |prop| # omit the arguments to get a catch-all not_configured
-        raise NoMethodError, "Please configure the property `#{prop}` by assigning a value of type #{configuration.property_type(prop)}"
+      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 self.value_is_boolean?(value)
-        [true, false, 'true', 'false'].include?(value)
+      def configuration_valid?
+        configuration
       end
 
-      def self.check_boolean(prop, value)
-        unless value_is_boolean?(value)
-          raise ArgumentError, "the property `#{prop}` must be boolean"
+      def check_configuration(c)
+        %w(multi_debug multi_progress multi_secvential task_confirmation_active track_dependencies 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).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])
+        check_additional_config(c)
       end
 
-      def self.configuration_valid?
-        configuration.nil? &&
-          configuration.task_confirmations &&
-          ((configuration.track_dependencies && configuration.application_dependencies) ||
-            configuration.track_dependencies == false)
+      def check_additional_config(c)
+        if c[:multi_debug].to_s.downcase == 'true'
+          CapistranoMulticonfigParallel::CelluloidManager.debug_enabled = true
+          Celluloid.task_class = Celluloid::TaskThread
+        end
+        CapistranoMulticonfigParallel.show_task_progress = true if c[:multi_progress].to_s.downcase == 'true'
+        CapistranoMulticonfigParallel.execute_in_sequence = true if c[:multi_secvential].to_s.downcase == 'true'
       end
     end
   end

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -13,6 +13,8 @@ module CapistranoMulticonfigParallel
       @top_level_tasks = top_level_tasks
       @stages = stages
       @jobs = []
+      CapistranoMulticonfigParallel.configuration_valid?
+      CapistranoMulticonfigParallel.verify_app_dependencies(@stages) if CapistranoMulticonfigParallel.configuration.track_dependencies
     end
 
     def can_start?
@@ -38,7 +40,6 @@ module CapistranoMulticonfigParallel
       @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)
-      CapistranoMulticonfigParallel.enable_logging
       block.call if block_given?
       run
     end
@@ -58,31 +59,30 @@ module CapistranoMulticonfigParallel
         run_async_jobs(&block)
       end
     end
-    
+
     def fetch_multi_stages
       stages = @argv['STAGES'].blank? ? '' : @argv['STAGES']
       stages = parse_inputted_value(value: stages).split(',').compact if stages.present?
       stages
     end
-  
-    
+
     def deploy_app(options = {})
       options = options.stringify_keys
-      app = options['app'].is_a?(Hash) ?  options['app'] : {'app' =>  options['app'] }
+      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
       main_box_name = @argv['BOX'].blank? ? '' : @argv['BOX']
-      stage = options.fetch('stage', @default_stage )
+      stage = options.fetch('stage', @default_stage)
       if CapistranoMulticonfigParallel.configuration.development_stages.include?(stage) && main_box_name.present? && /^[a-z0-9,]+/.match(main_box_name)
         execute_on_multiple_boxes(main_box_name, options)
       else
@@ -167,8 +167,12 @@ module CapistranoMulticonfigParallel
 
     def get_applications_branch_from_stdin(app, app_message)
       app_name = (app.is_a?(Hash) && app[:app].present?) ? app[:app].camelcase : app
-      app_name = app_name.present? ? app_name :  "current application"
+      app_name = app_name.present? ? app_name : 'current application'
       message = "Please enter Branch name for  #{app_name} for #{app_message}"
+      get_branch_name_from_stdin(message)
+    end
+
+    def get_branch_name_from_stdin(message)
       branch = ''
       if @argv['BRANCH'].blank? || (@argv['BRANCH'].present? && !custom_command?)
         set :app_branch_name, CapistranoMulticonfigParallel.ask_confirm(message, nil)
@@ -178,10 +182,10 @@ module CapistranoMulticonfigParallel
       end
       branch
     end
-    
+
     def get_app_additional_env_options(app, app_message)
       app_name = (app.is_a?(Hash) && app[:app].present?) ? app[:app].camelcase : app
-      app_name = app_name.present? ? app_name :  "current application"
+      app_name = app_name.present? ? app_name : 'current application'
       message = "Please write additional ENV options for #{app_name} for #{app_message}"
       set :app_additional_env_options, CapistranoMulticonfigParallel.ask_confirm(message, nil)
       fetch_app_additional_env_options