capistrano_multiconfig_parallel 0.27.2 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e808befd2776655ed65712c81083cad5fe610691
-  data.tar.gz: f81ccce076a838663e3ebd1fa3c2e8519bac2248
+  metadata.gz: 118d3709eeb7c3e3eb27958392d9e97d1ebe1fff
+  data.tar.gz: 88309d280c122e2ef5a824597fbb61278cf69eee
 SHA512:
-  metadata.gz: 87feebb58a8820da7507971b7ebe80046588c846e8e6496f4e7f40bd0b730efc96986b45cfcb84263257fe498be0d4840c5b71f6e1f26025e5e48cde871a1dc9
-  data.tar.gz: 4cdffabb0cebdd758228c12b13beec3deb8fcbfbd7f741898f9db9be479e581249b4b90cada701c45d2096e135616ab9b7c417b0c3181c32a609a022ad0b0d55
+  metadata.gz: e756c63ef3aa2a96bfa92a2c122e68b7082bb363123e6fcee0447d29357cc6e9f2c554637e4e9945e5cffc1c25b2aebc1969866a9cd1173ffefac034e06e5741
+  data.tar.gz: 220d8c84a377e8ad9e9c70f99629492a5354ccd296542096c7b9a61b05b957dbcf2c8b6ca7a0d5f1eeb77cd12fd449699afeaa18a6b8c4b3770e3c5cc3e08635

data/README.md

@@ -72,6 +72,10 @@ multi_debug: true
 multi_secvential: false
 websocket_server:
   enable_debug: false
+  use_redis: false
+  log_file_path: './log/multi_cap_websocket.log'
+terminal:
+  clear_screen: false  
 
 development_stages:
   - development
@@ -101,6 +105,18 @@ Available command line options when executing a command
 
 	-	if option is present and has value TRUE, will enable debugging of websocket communication between the workers
 
+-	--websocket_server.use_redis
+
+	-	Enables use of redis reactor for publish subscribe communication
+
+-	--websocket_server.log_file_path
+
+	-	Enables the logging of websocket communication into a different file -
+
+-	--terminal.clear_screen
+
+	-	Enables the clear screen to happen before the table status is displayed on screen
+
 -	--development_stages
 
 	-	if option is present and has value an ARRAY of STRINGS, each of them will be used as a development stage

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -25,7 +25,7 @@ module CapistranoMulticonfigParallel
       # http://rubydoc.info/gems/celluloid/Celluloid/SupervisionGroup/Member
       @workers = @worker_supervisor.pool(CapistranoMulticonfigParallel::CelluloidWorker, as: :workers, size: 10)
       Actor.current.link @workers
-      @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current, @job_manager)
+      @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current, @job_manager, configuration.fetch(:terminal, {}))
       @worker_supervisor.supervise_as(:web_server, CapistranoMulticonfigParallel::WebServer, [websocket_config])
 
       # Get a handle on the PoolManager

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -11,8 +11,10 @@ module CapistranoMulticonfigParallel
       'sshkit_terminal'
     end
 
-    def initialize(manager, job_manager)
+    def initialize(manager, job_manager, options = {})
       @manager = manager
+      @position = nil
+      @options = options.is_a?(Hash) ? options.stringify_keys : options
       @job_manager = job_manager
       async.run
     rescue => ex
@@ -40,8 +42,8 @@ module CapistranoMulticonfigParallel
     end
 
     def display_table_on_terminal(table)
-      terminal_clear
-      puts "\n#{table}\n"
+      @position ||= Cursor.fetch_position
+      Cursor.display_on_screen("\n#{table}\n", @options.merge(position: @position))
       signal_complete
     end
 
@@ -71,8 +73,5 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def terminal_clear
-      system('cls') || system('clear') || puts("\e[H\e[2J")
-    end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/cursor.rb

@@ -0,0 +1,62 @@
+require 'io/console'
+module CapistranoMulticonfigParallel
+  # class used to fetch cursor position before displaying terminal table
+  class Cursor
+    class << self
+
+      def fetch_position
+        res = ''
+        $stdin.raw do |stdin|
+          $stdout << "\e[6n"
+          $stdout.flush
+          while (line = stdin.getc) != 'R'
+            res << line if line
+          end
+        end
+        position = res.match(/(?<row>\d+);(?<column>\d+)/)
+        { row: position[:row].to_i, column: position[:column].to_i }
+      end
+
+
+      def display_on_screen(string, options = {})
+        options = options.is_a?(Hash) ? options.stringify_keys : {}
+        position = options.fetch('position', nil)
+        clear_scren =  options.fetch('clear_screen', false)
+        handle_string_display(position, clear_scren, string)
+      end
+
+      def handle_string_display(position, clear_scren, string)
+        if clear_scren.to_s == 'true'
+          terminal_clear_display(string)
+        elsif position.present?
+          display_string_at_position(position, string)
+        end
+      end
+
+      def terminal_clear_display(string)
+        terminal_clear
+        puts string
+      end
+
+      def display_string_at_position(position, string)
+        position_cursor(position[:row], position[:column])
+        erase_from_current_line_to_bottom
+        position_cursor(position[:row], position[:column])
+        puts string
+      end
+
+      def erase_from_current_line_to_bottom
+        puts "\e[J"
+      end
+
+      def position_cursor(line, column)
+        puts("\e[#{line};#{column}H")
+      end
+
+      def terminal_clear
+        system('cls') || system('clear') || puts("\e[H\e[2J")
+      end
+
+    end
+  end
+end

data/lib/capistrano_multiconfig_parallel/configuration/default.yml

@@ -51,6 +51,13 @@ default_config:
       - deploy:symlink:release
     required: false
 
+  - name: 'terminal.clear_screen'
+    type: 'boolean'
+    description: >-
+      Enables the clear screen to happen before the table status is displayed on screen
+    default: 'false'
+    required: false
+
 
   - name: 'apply_stage_confirmation'
     type: 'Array'

data/lib/capistrano_multiconfig_parallel/helpers/configuration.rb

@@ -87,7 +87,7 @@ module CapistranoMulticonfigParallel
       end
 
       def check_configuration
-        check_boolean_props(%w(multi_debug multi_secvential websocket_server.enable_debug websocket_server.use_redis))
+        check_boolean_props(%w(multi_debug multi_secvential websocket_server.enable_debug websocket_server.use_redis terminal.clear_screen))
         check_array_props(%w(task_confirmations development_stages apply_stage_confirmation))
         verify_application_dependencies(@check_config['application_dependencies'], %w(app priority dependencies))
       end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 27
-    TINY = 2
+    MINOR = 28
+    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: 0.27.2
+  version: 0.28.0
 platform: ruby
 authors:
 - bogdanRada
@@ -668,6 +668,7 @@ files:
 - lib/capistrano_multiconfig_parallel/celluloid/state_machine.rb
 - lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb
 - lib/capistrano_multiconfig_parallel/celluloid/web_server.rb
+- lib/capistrano_multiconfig_parallel/classes/cursor.rb
 - lib/capistrano_multiconfig_parallel/classes/dependency_tracker.rb
 - lib/capistrano_multiconfig_parallel/classes/input_stream.rb
 - lib/capistrano_multiconfig_parallel/classes/interactive_menu.rb