capistrano_multiconfig_parallel 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed328fa0087e607d4ceea9e7252aaab777af0b2
-  data.tar.gz: 2a33e3fa7789d488509f3954985fe3a08b13ea8f
+  metadata.gz: c0c51f13a444f7f6dec0885bfb772ed94b30c75a
+  data.tar.gz: c48a808ce7a4ab1b1080a9c684a6f15de0fa5533
 SHA512:
-  metadata.gz: cd51b1440e0c5e35d5d8f6533c009b40e55a7010554c13a73a2002c6896d52bd4e20771e591685f76373906d5ea04d57eeaf14bf62c3fbc50c9ab6192a1dab53
-  data.tar.gz: 064c770db3662fd8830f46718bd5158b0c46c3ba0f23a430f5879a7ac0b9ef360598ca42ec6c1d9b3d43b981720f779b3b96bda64a9704e2596a6f41c1c60604
+  metadata.gz: 58237118c9429a9388020f6153c7bc462394fb5f2b59cf0a521e984f2b98bf9087db6f998583f05b724b50c500a38d1d6a833ed74d734e104b89fff79716c16c
+  data.tar.gz: c8196672583a80018516959201e05259f269106c7135154d00f4160ef4a5345248409f7f5282197ed5ba435dba183e0552b84d6fc6bb74a08a0e03041d17a97c

data/lib/capistrano_multiconfig_parallel/all.rb

@@ -34,7 +34,7 @@ require 'forwardable'
 require 'English'
 
 # fix error with not files that can not be found
- Gem.find_files('composable_state_machine/**/*.rb').each { |path| require path }
+Gem.find_files('composable_state_machine/**/*.rb').each { |path| require path }
 
 require_relative './helpers/base_actor_helper'
 
@@ -45,5 +45,3 @@ end
 %w(version base application).each do |filename|
   Gem.find_files("capistrano_multiconfig_parallel/#{filename}.rb").each { |path| require path }
 end
-
-Terminal::Table::Style.defaults = {:width => 140}

data/lib/capistrano_multiconfig_parallel/celluloid/bundler_worker.rb

@@ -33,7 +33,7 @@ module CapistranoMulticonfigParallel
       else
         @progress_bar ||= PowerBar.new
         @progress_bar.define_singleton_method :terminal_width do
-          36
+          CapistranoMulticonfigParallel::ApplicationHelper::DEFAULT_TEXT_LENGTH
         end
         @progress_bar.settings.tty.finite.template.main = \
         "${<msg>} ${<bar> } ${<percent>%}" # + "${<rate>/s} ${<elapsed>}${ ETA: <eta>}"
@@ -43,7 +43,8 @@ module CapistranoMulticonfigParallel
         @progress_bar.settings.tty.finite.template.close = "\e[?25h\e[0mFINISHED \n" # clean up after us
         @progress_bar.settings.tty.finite.output = Proc.new{ |data|
           if data.present? && data.include?("Error") || data.include?("Installing")
-            @job.bundler_check_status = data.include?("Error") ? data.to_s.red : data.to_s.green
+            @job.bundler_check_status_colour = data.include?("Error") ? :red : :green
+            @job.bundler_check_status = data.to_s
             send_msg(CapistranoMulticonfigParallel::BundlerTerminalTable.topic, type: 'event', data: data.to_s.uncolorize )
           end
         }

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -51,10 +51,18 @@ module CapistranoMulticonfigParallel
 
     def worker_state
       if job.status.to_s.downcase != 'dead' && Actor.current.alive?
-        @machine.state.to_s.green
+        @machine.state.to_s
       else
         job.status = 'dead'
-        job.status.upcase.red
+        job.status.upcase
+      end
+    end
+
+    def state_colour
+      if job.status.to_s.downcase != 'dead' && Actor.current.alive?
+        return :green
+      else
+        return :red
       end
     end
 

data/lib/capistrano_multiconfig_parallel/classes/child_process_status.rb

@@ -25,7 +25,7 @@ module CapistranoMulticonfigParallel
 
     def on_read_stdout(data)
       @show_bundler = false if  data.to_s.include?("The Gemfile's dependencies are satisfied") || data.to_s.include?("Bundle complete")
-      @actor.async.update_machine_state(truncate(data, 36), :bundler => true) if @show_bundler == true && data.strip.present? && data.strip != '.'
+      @actor.async.update_machine_state(truncate(data, CapistranoMulticonfigParallel::ApplicationHelper::DEFAULT_TEXT_LENGTH), :bundler => true) if @show_bundler == true && data.strip.present? && data.strip != '.'
       io_callback('stdout', data)
     end
 

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -51,7 +51,7 @@ module CapistranoMulticonfigParallel
           { value: wrap_string(job_stage_for_terminal) },
           { value: wrap_string(capistrano_action) },
           { value: terminal_env_variables.map { |str| wrap_string(str) }.join("\n") },
-          { value: wrap_string(worker_state) }
+          { value: wrap_coloured_string(*worker_state) }
         ]
       end
     end
@@ -61,7 +61,7 @@ module CapistranoMulticonfigParallel
         { value: wrap_string(id.to_s) },
         { value: wrap_string(File.basename(job.job_path)) },
         { value: wrap_string("bundle check || bundle install") },
-        { value: wrap_string(bundler_check_status.to_s) }
+        { value: wrap_coloured_string(bundler_check_status.to_s,  color: bundler_check_status_colour) }
       ]
     end
 
@@ -71,7 +71,7 @@ module CapistranoMulticonfigParallel
         { value: wrap_string(job_stage_for_terminal) },
         { value: wrap_string("Setting up gems..") },
         { value: terminal_env_variables.map { |str| wrap_string(str) }.join("\n") },
-        { value: wrap_string(status.to_s.green) }
+        { value: wrap_coloured_string(status.to_s, color: :green) }
       ]
     end
 
@@ -89,8 +89,12 @@ module CapistranoMulticonfigParallel
 
     def worker_state
       worker_obj = worker
-      default = status.to_s.upcase.red
-      worker_died? ? default : worker_obj.worker_state
+      default = status.to_s.upcase
+      if worker_died?
+        [default, color: :red]
+      else
+        [worker_obj.worker_state, color: worker.state_colour]
+      end
     end
 
     def id
@@ -108,6 +112,7 @@ module CapistranoMulticonfigParallel
       { name: 'exit_status', default: nil },
       { name: 'bundler_status', default: nil },
       { name: 'bundler_check_status', default: nil },
+      { name: 'bundler_check_status_colour', default: :green },
       { name: 'new_jobs_dispatched', default: [] },
       { name: 'will_dispatch_new_job', default: nil },
     ].each do |hash|

data/lib/capistrano_multiconfig_parallel/helpers/application_helper.rb

@@ -7,6 +7,8 @@ require_relative './capistrano_helper'
 module CapistranoMulticonfigParallel
   # class that holds the options that are configurable for this gem
   module ApplicationHelper
+    DEFAULT_TEXT_LENGTH = 22
+
     include CapistranoMulticonfigParallel::InternalHelper
     include CapistranoMulticonfigParallel::CoreHelper
     include CapistranoMulticonfigParallel::ParseHelper
@@ -78,9 +80,20 @@ module CapistranoMulticonfigParallel
         [args.select(&:present?), options]
       end
 
-      def wrap_string(string, options = {})
+      def internal_wrap_string(string, options = {})
         options.stringify_keys!
-        string.scan(/.{#{options.fetch('length', 36)}}|.+/).map(&:strip).join(options.fetch('character', $INPUT_RECORD_SEPARATOR))
+        string.scan(/.{#{options.fetch('length', CapistranoMulticonfigParallel::ApplicationHelper::DEFAULT_TEXT_LENGTH)}}|.+/).map(&:strip)
+      end
+
+      def wrap_string(string, options = {})
+        internal_wrap_string(string, options).join(options.fetch('character', $INPUT_RECORD_SEPARATOR))
+      end
+
+      def wrap_coloured_string(string, options = {})
+        new_array = internal_wrap_string(string, options).collect do |str|
+          str.colorize(options["color"].to_s.to_sym)
+        end
+        new_array.join(options.fetch('character', $INPUT_RECORD_SEPARATOR))
       end
 
       def percent_of(index, total)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,8 +8,8 @@ module CapistranoMulticonfigParallel
   module VERSION
 
     MAJOR = 2
-    MINOR = 7
-    TINY = 1
+    MINOR = 8
+    TINY = 0
     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: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - bogdanRada