capistrano_multiconfig_parallel 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d2f26567119f10125fc2405dfbf2c43ac58abbd
-  data.tar.gz: 3038d99e240a14ba32becc87d6f4d3f92a73c220
+  metadata.gz: 5d2597af7ef8c177ea61d7e535b7ac546d3cdc70
+  data.tar.gz: cfd8fc986a102d2fb9fe9a18975cbdadb3eb9f05
 SHA512:
-  metadata.gz: 15f3503e0ba919497e95f1891d3a866ea5ccfbc0601861cb9ed9488a0c1850a2b1675122522fd81420c7eccd89c5bad580ba55f023dd7153a12fb6f6c252e827
-  data.tar.gz: 0616700d0b686d3a74875a688989e87d7b7aa34097fd1f7c7806150ec14a6daa303eecd8b772cb66a94f32280fa31448fbec9a07bc87f2ec678d28721bd3bead
+  metadata.gz: d8c821103168c6b92df533a2eb30205125d8a86b11d220fd4f5b0770ad5a12d9255dec7fa41bf9d5d83ada1f678951cfa8342d2a85a915c96e25153e1ca50ee8
+  data.tar.gz: 5b9a84cc4facd9ac2226ef343b4f46fdf8db19492f14fa178cacb5dc53401ca2be552fee76d23948671e6cf27425df8501f2b476e652dd21519760f643d89a7b

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -123,10 +123,11 @@ module CapistranoMulticonfigParallel
 
     def user_prompt_needed?(data)
       question, default = get_question_details(data)
+      log_to_file("Rake worker #{@job_id} tries to determine question #{data.inspect} #{question.inspect} #{default.inspect}")
       return if question.blank? || @action != 'invoke'
       publish_to_worker(action: 'stdout',
                         question: question,
-                        default: default.delete('()'),
+                        default: default.present? ? default.delete('()') : '',
                         job_id: @job_id)
       wait_for_stdin_input
     end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -56,8 +56,9 @@ module CapistranoMulticonfigParallel
     end
 
     def worker_state
+      worker_obj = worker
       default = status.to_s.upcase.red
-      worker.present? && worker.alive? ? worker.worker_state : default
+      worker_obj.present? && worker_obj.alive? ? worker_obj.worker_state : default
     end
 
     def id

data/lib/capistrano_multiconfig_parallel/classes/rake_task_hooks.rb

@@ -23,6 +23,10 @@ module CapistranoMulticonfigParallel
       end
     end
 
+    def actor
+      Celluloid::Actor[rake_actor_id]
+    end
+
   private
 
     def output_stream
@@ -35,8 +39,9 @@ module CapistranoMulticonfigParallel
 
     def before_hooks
       stringio = StringIO.new
-      output_stream.hook(stringio)
-      input_stream.hook(actor, stringio)
+      output = output_stream.hook(stringio)
+      input = input_stream.hook(actor, stringio)
+      [input, output]
     end
 
     def after_hooks
@@ -64,10 +69,6 @@ module CapistranoMulticonfigParallel
       CapistranoMulticonfigParallel::RakeWorker.supervise_as(rake_actor_id)
     end
 
-    def actor
-      Celluloid::Actor[rake_actor_id]
-    end
-
     def job_id
       capistrano_version_2? ? @config.fetch(CapistranoMulticonfigParallel::ENV_KEY_JOB_ID, nil) : @env[CapistranoMulticonfigParallel::ENV_KEY_JOB_ID]
     end

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -33,8 +33,8 @@ module CapistranoMulticonfigParallel
     end
 
     def get_question_details(data)
-      /(.*)\?*\s*\:*\s*(\([^)]*\))*/m =~ data
-      [regex_last_match(1), regex_last_match(2)]
+      matches = /(.*)\?*\s*\:*\s*(\([^)]*\))*/m.match(data).captures
+      [matches[0], matches[1]]
     end
 
     def setup_command_line_standard(*args)

data/lib/capistrano_multiconfig_parallel/initializers/capistrano2.rb

@@ -1,5 +1,15 @@
 if CapistranoMulticonfigParallel.capistrano_version_2?
   require 'capistrano/cli'
+
+  HighLine.class_eval do
+    alias_method :original_ask, :ask
+
+    def ask(question, _answer_type = String, &_details)
+      rake = CapistranoMulticonfigParallel::RakeTaskHooks.new(ENV, nil, CapistranoMulticonfigParallel.original_args_hash)
+      rake.actor.user_prompt_needed?(question)
+    end
+  end
+
   Capistrano::Configuration::Execution.class_eval do
     alias_method :original_execute_task, :execute_task
 
@@ -21,4 +31,5 @@ if CapistranoMulticonfigParallel.capistrano_version_2?
       end
     end
   end
+
 end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 4
+    TINY = 5
     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: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - bogdanRada