capistrano_multiconfig_parallel 0.29.3 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46dc59e0272cf452cd04ad75a77bd0eafa664c9
-  data.tar.gz: a40e63eb0a7df1f623db2262f051991f4b38eef0
+  metadata.gz: a451d8cf78447457a14a882d28bb9cb98efd36d9
+  data.tar.gz: d4ba430159980b1346ff58d554a1e22f3d27659f
 SHA512:
-  metadata.gz: a4305d81d1a7bb49a9dc44377c9c90503e952ce54e3481fd6da7ec63342db89c683ed9426b87ac8020230d02d47a6ec0a349a9eb68684f2a7b868c914819cc10
-  data.tar.gz: ebc2361a965820426e792bb21c90265df0ab2ab45001940a4f759452a2e1e5d48e33a27e07d4de28ef7ab3de3dd8c9721306c6b2a66c2fbeb433824f41748ca8
+  metadata.gz: 1a154c1b6321741ae5a219ec3de41be089709ecb83de60a26d3ee9eb39c9c749d57f702916297dbf305c549a86302e3ed8c06a918a3cd411559a0a4cf87312c5
+  data.tar.gz: a3d40118f76c522917acb9d51285b15f9d6fca60a5a3ef2d41c638240f3817d6c2bd17921dfe1214cbf1a6b73a64de85b7b3fe7a7575fab9086bc4b8bb30c51d

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     include CapistranoMulticonfigParallel::ApplicationHelper
 
-    attr_reader :options, :errors, :manager, :position, :job_manager
+    attr_reader :options, :errors, :manager, :position, :job_manager, :terminal_rows
 
     def self.topic
       'sshkit_terminal'
@@ -17,6 +17,7 @@ module CapistranoMulticonfigParallel
     def initialize(manager, job_manager, options = {})
       @manager = manager
       @position = nil
+      @terminal_rows = nil
       @errors = []
       @options = options.is_a?(Hash) ? options.stringify_keys : options
       @job_manager = job_manager
@@ -46,8 +47,10 @@ module CapistranoMulticonfigParallel
     end
 
     def display_table_on_terminal(table)
-      @position ||= CapistranoMulticonfigParallel::Cursor.fetch_cursor_position
+      table_size = (table.rows.size + 2)**2
+      @position, @terminal_rows =  CapistranoMulticonfigParallel::Cursor.fetch_cursor_position(table_size, @position)
       CapistranoMulticonfigParallel::Cursor.display_on_screen("\n#{table}\n", @options.merge(position: @position))
+      #puts [@position, @terminal_rows, table_size , (@terminal_rows[:rows] - @position[:row]), CapistranoMulticonfigParallel::Cursor.refetch_position?(table_size, @terminal_rows, @position)].inspect
       print_errors
       signal_complete
     end

data/lib/capistrano_multiconfig_parallel/classes/cursor.rb

@@ -1,10 +1,20 @@
 require_relative '../helpers/application_helper'
 module CapistranoMulticonfigParallel
   # class used to fetch cursor position before displaying terminal table
+  # http://ispltd.org/mini_howto:ansi_terminal_codes
   class Cursor
     class << self
       include CapistranoMulticonfigParallel::ApplicationHelper
-      attr_accessor :position
+
+      def display_on_screen(string, options = {})
+        options = options.is_a?(Hash) ? options.stringify_keys : {}
+        handle_string_display(string, options)
+      end
+
+      def move_to_home!(row = 0, column = 1)
+        erase_screen
+        position_cursor(row, column)
+      end
 
       def fetch_terminal_size
         size = (dynamic_size_stty || dynamic_size_tput || `echo $LINES $COLUMNS`)
@@ -12,27 +22,26 @@ module CapistranoMulticonfigParallel
         { rows: size[0].to_i, columns: size[1].to_i }
       end
 
-      def fetch_cursor_position
-        terminal_size = fetch_terminal_size
-        position = fetch_position
-        return position if terminal_size[:rows].nonzero? && position[:row] < (terminal_size[:rows] / 2)
-        move_to_home!(0, 0)
-        fetch_position
+      def fetch_cursor_position(table_size, position)
+        final_position = position
+        terminal_rows = fetch_terminal_size
+        if refetch_position?(table_size, terminal_rows, position)
+          move_to_home! if position.present?
+          final_position = fetch_position
+          terminal_rows = fetch_terminal_size
+        end
+        [final_position,terminal_rows]
       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)
+      def refetch_position?(table_size,terminal_size, position)
+        return true if position.blank?
+        terminal_rows = terminal_size[:rows]
+        row_position = position[:row]
+        terminal_rows.zero? || (terminal_rows.nonzero? && row_position >= (terminal_rows / 2)) || (table_size >= (terminal_rows -row_position))
       end
 
-      def move_to_home!(row = 2, column = 1)
-        position_cursor(row, column)
-        erase_from_current_line_to_bottom
-      end
+      private
 
-    private
 
       def fetch_position
         res = ''
@@ -58,8 +67,9 @@ module CapistranoMulticonfigParallel
         lines.present? && cols.present? ? "#{lines} #{cols}" : nil
       end
 
-      def handle_string_display(position, clear_scren, string)
-        if clear_scren.to_s == 'true'
+      def handle_string_display(string, options)
+        position = options.fetch('position',nil)
+        if options.fetch('clear_screen', false).to_s == 'true'
           terminal_clear_display(string)
         elsif position.present?
           display_string_at_position(position, string)
@@ -82,6 +92,10 @@ module CapistranoMulticonfigParallel
         puts "\e[J"
       end
 
+      def erase_screen
+       puts("\e[2J")
+      end
+
       def go_to_position(position)
         position_cursor(position[:row], position[:column])
       end

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -50,10 +50,9 @@ module CapistranoMulticonfigParallel
     end
 
     def log_output_error(output, message)
-      return if output.blank?
+      puts message if output.present?
       terminal = Celluloid::Actor[:terminal_server]
-      terminal.errors.push(message) if terminal.present? && terminal.alive? && !terminal.errors.include?(message)
-      puts message
+      terminal.errors.push(message) if terminal.present? && terminal.alive?
     end
 
     def format_error(exception)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 0
-    MINOR = 29
-    TINY = 3
+    MINOR = 30
+    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.29.3
+  version: 0.30.0
 platform: ruby
 authors:
 - bogdanRada