capistrano_multiconfig_parallel 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23a276b744f5b10886de516ebe9f1171d801cf40
-  data.tar.gz: 2abbb61d095c7b5ac3735596fad3cc0bd416dfa3
+  metadata.gz: 7850da2d68285258db1d775ca37bae04c3953267
+  data.tar.gz: 832c4718cce677196834dbc0bb2037e63b2ad1f1
 SHA512:
-  metadata.gz: a4b775ff7cd574643e5cb97059a9c9e3fb53f4cb000f63122c0b3c569cbf0a91d72fa6504f3d221240660c7cc2787affa450da923c32080ab85d1346923bc8d2
-  data.tar.gz: 36b362acbcc91d464d1bf7f9c9fdc5951ac34cba0d89794c9a54dc0f111bd60d504c6fcb7e37e21a8e96b698b42e674e7b1c128c27f2ddce451169d8297765e8
+  metadata.gz: ac16a865357e133e767330c957fe78f5fee9198f1a3144f8041d4350cb1ab5a597e5352dfaba92a0b740965b45c4de6e64a2d8ec166a873e1663fbbb9770c78f
+  data.tar.gz: 8a16667cb2b53b5c5629a069dfbfaffd0cbd36baf09de2eaeffa3c7620a65cd4b66adc9be0bc21a427bf3c72c8c719531ab6eda6efa5f4acf59fbcc0ce5f4997

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -65,6 +65,7 @@ module CapistranoMulticonfigParallel
     end
 
     def print_error_if_exist
+      return unless development_debug?
       [@job.stderr_buffer].each do |buffer|
         buffer.rewind
         data = buffer.read
@@ -75,7 +76,7 @@ module CapistranoMulticonfigParallel
     def start_async_deploy
       RightScale::RightPopen.popen3_async(
         @cmd,
-        target: self,
+        target: Actor.current,
         environment: @options.fetch(:environment, nil),
         pid_handler: :on_pid,
         input: :on_input_stdin,
@@ -99,7 +100,7 @@ module CapistranoMulticonfigParallel
     end
 
     def on_read_stderr(data)
-      @job.save_stderr_error(data)
+      @job.save_stderr_error(data) if development_debug?
       io_callback('stderr', data)
     end
 

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -21,6 +21,7 @@ module CapistranoMulticonfigParallel
       @manager = manager
       @position = nil
       @terminal_rows = nil
+      @cursor = CapistranoMulticonfigParallel::Cursor.new
       @errors = []
       @options = options.is_a?(Hash) ? options.stringify_keys : options
       @job_manager = job_manager
@@ -57,7 +58,7 @@ module CapistranoMulticonfigParallel
 
     def display_table_on_terminal(table, jobs)
       table_size = fetch_table_size(jobs)
-      @position, @terminal_rows, @screen_erased = CapistranoMulticonfigParallel::Cursor.display_on_screen(
+      @position, @terminal_rows, @screen_erased = @cursor.display_on_screen(
         "#{table}",
         @options.merge(
           position: @position,
@@ -70,7 +71,7 @@ module CapistranoMulticonfigParallel
     end
 
     def print_errors
-      puts(@errors.join("\n")) if @errors.present? && @options.fetch('clear_screen', false).to_s == 'false'
+      puts(@errors.join("\n")) if @errors.present? && @options.fetch('clear_screen', false).to_s == 'false' && development_debug?
     end
 
     def setup_table_jobs(table)

data/lib/capistrano_multiconfig_parallel/classes/cursor.rb

@@ -3,113 +3,111 @@ 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
+    include CapistranoMulticonfigParallel::ApplicationHelper
 
-      def display_on_screen(string, options = {})
-        options = options.is_a?(Hash) ? options.stringify_keys : {}
-        handle_string_display(string, options)
-      end
+    def display_on_screen(string, options = {})
+      options = options.is_a?(Hash) ? options.stringify_keys : {}
+      handle_string_display(string, options)
+    end
 
     private
 
-      def move_to_home!(row = 0, column = 1)
-        erase_screen
-        position_cursor(row, column)
-      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`)
-        size = strip_characters_from_string(size).split(' ')
-        { rows: size[0].to_i, columns: size[1].to_i }
-      end
+    def fetch_terminal_size
+      size = (dynamic_size_stty || dynamic_size_tput || `echo $LINES $COLUMNS`)
+      size = strip_characters_from_string(size).split(' ')
+      { rows: size[0].to_i, columns: size[1].to_i }
+    end
 
-      def fetch_cursor_position(table_size, position, previously_erased_screen)
-        final_position = position || fetch_position
+    def fetch_cursor_position(table_size, position, previously_erased_screen)
+      final_position = position || fetch_position
+      terminal_rows = fetch_terminal_size
+      if previously_erased_screen == false && refetch_position?(table_size, terminal_rows, final_position)
+        screen_erased = true
+        move_to_home!
+        final_position = fetch_position
         terminal_rows = fetch_terminal_size
-        if previously_erased_screen == false && refetch_position?(table_size, terminal_rows, final_position)
-          screen_erased = true
-          move_to_home!
-          final_position = fetch_position
-          terminal_rows = fetch_terminal_size
-        end
-        [final_position, terminal_rows, screen_erased]
       end
+      [final_position, terminal_rows, screen_erased]
+    end
 
-      def refetch_position?(table_size, terminal_size, position)
-        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 refetch_position?(table_size, terminal_size, position)
+      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 fetch_position
-        res = ''
-        $stdin.raw do |stdin|
-          $stdout << "\e[6n"
-          $stdout.flush
-          while (line = stdin.getc) != 'R'
-            res << line if line
-          end
+    def fetch_position
+      res = ''
+      $stdin.raw do |stdin|
+        $stdout << "\e[6n"
+        $stdout.flush
+        while (line = stdin.getc) != 'R'
+          res << line if line
         end
-        position = res.match(/(?<row>\d+);(?<column>\d+)/)
-        { row: position[:row].to_i, column: position[:column].to_i }
       end
+      position = res.match(/(?<row>\d+);(?<column>\d+)/)
+      { row: position[:row].to_i, column: position[:column].to_i }
+    end
 
-      def dynamic_size_stty
-        size = `stty size 2>/dev/null`
-        size.present? ? size : nil
-      end
+    def dynamic_size_stty
+      size = `stty size 2>/dev/null`
+      size.present? ? size : nil
+    end
 
-      def dynamic_size_tput
-        lines = `tput lines 2>/dev/null`
-        cols = `tput cols 2>/dev/null`
-        lines.present? && cols.present? ? "#{lines} #{cols}" : nil
-      end
+    def dynamic_size_tput
+      lines = `tput lines 2>/dev/null`
+      cols = `tput cols 2>/dev/null`
+      lines.present? && cols.present? ? "#{lines} #{cols}" : nil
+    end
 
-      def handle_string_display(string, options)
-        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)
-          [0, 0, false]
-        else
-          new_position, terminal_rows, screen_erased = fetch_cursor_position(table_size, position, options.fetch('screen_erased', false))
-          display_string_at_position(new_position, string)
-          [new_position, terminal_rows, screen_erased]
-        end
+    def handle_string_display(string, options)
+      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)
+        [0, 0, false]
+      else
+        new_position, terminal_rows, screen_erased = fetch_cursor_position(table_size, position, options.fetch('screen_erased', false))
+        display_string_at_position(new_position, string)
+        [new_position, terminal_rows, screen_erased]
       end
+    end
 
-      def terminal_clear_display(string)
-        terminal_clear
-        puts string
-      end
+    def terminal_clear_display(string)
+      terminal_clear
+      puts string
+    end
 
-      def display_string_at_position(position, string)
-        go_to_position(position)
-        erase_from_current_line_to_bottom
-        go_to_position(position)
-        puts string
-      end
+    def display_string_at_position(position, string)
+      go_to_position(position)
+      erase_from_current_line_to_bottom
+      go_to_position(position)
+      puts string
+    end
 
-      def erase_from_current_line_to_bottom
-        puts "\e[J"
-      end
+    def erase_from_current_line_to_bottom
+      puts "\e[J"
+    end
 
-      def erase_screen
-        puts("\e[2J")
-      end
+    def erase_screen
+      puts("\e[2J")
+    end
 
-      def go_to_position(position)
-        position_cursor(position[:row], position[:column])
-      end
+    def go_to_position(position)
+      position_cursor(position[:row], position[:column])
+    end
 
-      def position_cursor(line, column)
-        puts("\e[#{line};#{column}H")
-      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
+    def terminal_clear
+      system('cls') || system('clear') || puts("\e[H\e[2J")
     end
   end
 end

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -26,6 +26,7 @@ module CapistranoMulticonfigParallel
     end
 
     def save_stderr_error(data)
+      return unless development_debug?
       return unless @manager.alive?
       stderr_buffer.rewind
       old_data = stderr_buffer.read.dup

data/lib/capistrano_multiconfig_parallel/helpers/core_helper.rb

@@ -52,6 +52,10 @@ module CapistranoMulticonfigParallel
       [CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed, SystemExit].find { |class_name| error.is_a?(class_name) }.present?
     end
 
+    def development_debug?
+      ENV['MULTICAP_DEBUG'].to_s == 'true'
+    end
+
     def log_error(error, options = {})
       message = format_error(error)
       log_output_error(error, options.fetch(:output, nil), message)
@@ -63,7 +67,7 @@ module CapistranoMulticonfigParallel
     end
 
     def terminal_errors?
-      terminal_actor.present? && terminal_actor.alive? && terminal_actor.errors.is_a?(Array)
+      development_debug? && terminal_actor.present? && terminal_actor.alive? && terminal_actor.errors.is_a?(Array)
     end
 
     def log_output_error(error, output, message)

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -7,8 +7,8 @@ module CapistranoMulticonfigParallel
   # module used for generating the version
   module VERSION
     MAJOR = 1
-    MINOR = 4
-    TINY = 2
+    MINOR = 5
+    TINY = 0
     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: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid