capistrano_multiconfig_parallel 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a35a7ede67c601da4e663947e5e58fb0e83065
-  data.tar.gz: 9307b72fb8716cf0117307eb5d9a5c86169b5601
+  metadata.gz: 5b9578694025dca215377cd4d9d78dea9a0bad48
+  data.tar.gz: 0de2d1f4b3c3ad520620769ac2e2baf3c2b88e67
 SHA512:
-  metadata.gz: 4ac2faaeabb21aae54db13122d077fd0a93d973fd172f54bd38c12d75fbbaa28f035eba4da08f643ad977e01f97300d45fa046ff6c0e986fa690e3d03277b046
-  data.tar.gz: dc6cbf259342a4f4e44e663e97a41b7295cb42286fb164f0780de80c4e631348b156fe74bcf5b5e778d92f049cb874ed956afbac76681fa0cec6a1d03eaa486b
+  metadata.gz: 2c123c22fc754c732ec4d64be8477f264e2deb67080b638848a23253453aa3e0270281c6867516d618ed427bf86c245e3811b7dc300c692afe1a94f9493dac50
+  data.tar.gz: 5e8cd281aed6385d4bb2e072767572206a6c1b824bb8a0b4ce0cef170e50e7f6ab9aad40036d17f31fc0a609b3defedd34abb80310d896081a9e6ed322bcfcf3

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -121,13 +121,11 @@ module CapistranoMulticonfigParallel
       app = app.fetch('app', '')
       box = options['env_options']['BOX']
       message = box.present? ? "BOX #{box}:" : "stage #{options['stage']}:"
-      branch_name = get_applications_branch_from_stdin(app, message) if branch_name.blank?
       env_opts = get_app_additional_env_options(app, message)
 
-      options['env_options'] = options['env_options'].reverse_merge(env_opts)
-      env_options = {
-        'BRANCH' => branch_name
-      }.merge(options['env_options'])
+      options['env_options'] = options['env_options'].reverse_merge(env_opts.except('BOX'))
+      
+      env_options = branch_name.present? ?  { 'BRANCH' => branch_name }.merge(options['env_options']) : options['env_options']
 
       job = {
         app: app,
@@ -166,23 +164,7 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    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'
-      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)
-        branch = parse_inputted_value
-      else
-        branch = @argv['BRANCH']
-      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
@@ -198,6 +180,7 @@ module CapistranoMulticonfigParallel
       env_options = parse_inputted_value(key: :app_additional_env_options)
       env_options = env_options.split(' ')
       options = multi_fetch_argv(env_options)
+      options.stringify_keys!
       options
     end
 

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY = 0
+    TINY = 1
     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: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap