capistrano_multiconfig_parallel 0.30.0 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a451d8cf78447457a14a882d28bb9cb98efd36d9
-  data.tar.gz: d4ba430159980b1346ff58d554a1e22f3d27659f
+  metadata.gz: 9f8bd1e8d2bba139b5f06d0d2fa855cc2a3f030a
+  data.tar.gz: a155314cc93bf556b955d53574f712db877e3b4b
 SHA512:
-  metadata.gz: 1a154c1b6321741ae5a219ec3de41be089709ecb83de60a26d3ee9eb39c9c749d57f702916297dbf305c549a86302e3ed8c06a918a3cd411559a0a4cf87312c5
-  data.tar.gz: a3d40118f76c522917acb9d51285b15f9d6fca60a5a3ef2d41c638240f3817d6c2bd17921dfe1214cbf1a6b73a64de85b7b3fe7a7575fab9086bc4b8bb30c51d
+  metadata.gz: f95cf147ee0237298c9b04a1f518cb674ebeb25585cfd6cb57a300fc302c0e8a488a6cc7619604d5f63f3015d03b09f8142b165b880b5f64d4d66f5cb36268b9
+  data.tar.gz: 9fef095a975df04cba640842fc9b06803b1dc27545d830a4d9556cb8dab426c307a5aef466db276ea4c599e8cb3b1e8cfd2d459dad9079a08cf4e07c917e780f

data/.rubocop.yml

@@ -7,7 +7,10 @@ AllCops:
     - Rakefile
 
 ClassLength:
-  Max: 500
+  Max: 900
+  
+ModuleLength:
+  Max: 900
 
 Documentation:
   Enabled: true

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, :terminal_rows
+    attr_reader :options, :errors, :manager, :position, :job_manager, :terminal_rows, :screen_erased
 
     def self.topic
       'sshkit_terminal'
@@ -21,6 +21,7 @@ module CapistranoMulticonfigParallel
       @errors = []
       @options = options.is_a?(Hash) ? options.stringify_keys : options
       @job_manager = job_manager
+      @screen_erased = false
       async.run
     rescue => ex
       rescue_exception(ex)
@@ -36,8 +37,8 @@ module CapistranoMulticonfigParallel
 
     def notify_time_change(_channel, _message)
       table = Terminal::Table.new(title: 'Deployment Status Table', headings: default_heaadings)
-      setup_table_jobs(table)
-      display_table_on_terminal(table)
+      jobs = setup_table_jobs(table)
+      display_table_on_terminal(table, jobs)
     end
 
     def rescue_exception(ex)
@@ -46,11 +47,15 @@ module CapistranoMulticonfigParallel
       terminate
     end
 
-    def display_table_on_terminal(table)
-      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
+    def fetch_table_size(jobs)
+      job_rows = jobs.sum { |_job_id, job| job.row_size }
+      (job_rows + 2)**2
+    end
+
+    def display_table_on_terminal(table, jobs)
+      table_size = fetch_table_size(jobs)
+      @position, @terminal_rows, @screen_erased = CapistranoMulticonfigParallel::Cursor.display_on_screen("\n#{table}\n", @options.merge(position: @position, table_size: table_size))
+      # puts [@position, @terminal_rows, table_size , (@terminal_rows[:rows] - @position[:row]), screen_erased].inspect
       print_errors
       signal_complete
     end
@@ -65,6 +70,7 @@ module CapistranoMulticonfigParallel
         table.add_row(job.terminal_row)
         table.add_separator
       end
+      jobs
     end
 
     def show_confirmation(message, default)

data/lib/capistrano_multiconfig_parallel/classes/cursor.rb

@@ -25,24 +25,22 @@ module CapistranoMulticonfigParallel
       def fetch_cursor_position(table_size, position)
         final_position = position
         terminal_rows = fetch_terminal_size
-        if refetch_position?(table_size, terminal_rows, position)
+        screen_erased = refetch_position?(table_size, terminal_rows, position)
+        if screen_erased
           move_to_home! if position.present?
           final_position = fetch_position
           terminal_rows = fetch_terminal_size
         end
-        [final_position,terminal_rows]
+        [final_position, terminal_rows, screen_erased]
       end
 
-      def refetch_position?(table_size,terminal_size, position)
+      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))
+        terminal_rows.zero? || (terminal_rows.nonzero? && row_position >= (terminal_rows / 2)) || (table_size >= (terminal_rows - row_position))
       end
 
-      private
-
-
       def fetch_position
         res = ''
         $stdin.raw do |stdin|
@@ -68,11 +66,15 @@ module CapistranoMulticonfigParallel
       end
 
       def handle_string_display(string, options)
-        position = options.fetch('position',nil)
+        position = options.fetch('position', nil)
+        table_size = options.fetch('table_size', 0)
         if options.fetch('clear_screen', false).to_s == 'true'
           terminal_clear_display(string)
-        elsif position.present?
-          display_string_at_position(position, string)
+          [0, 0, false]
+        else
+          new_position, terminal_rows, screen_erased = fetch_cursor_position(table_size, position)
+          display_string_at_position(new_position, string)
+          [new_position, terminal_rows, screen_erased]
         end
       end
 
@@ -93,7 +95,7 @@ module CapistranoMulticonfigParallel
       end
 
       def erase_screen
-       puts("\e[2J")
+        puts("\e[2J")
       end
 
       def go_to_position(position)

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -44,6 +44,13 @@ module CapistranoMulticonfigParallel
       ]
     end
 
+    def row_size
+      longest_hash = terminal_row.max_by do |hash|
+        hash[:value].size
+      end
+      (longest_hash[:value].size.to_f / 80.0).ceil
+    end
+
     def worker_state
       default = status.to_s.upcase.red
       return default unless @manager.alive?

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 30
-    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.30.0
+  version: 0.30.1
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-pmap