interactive-logger 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c5636a0534a2b4c303e9b6b3f83cdb0e1791dc6
-  data.tar.gz: f11583fe28d1b0757f8a73edeb82d52d0d8b8bf6
+  metadata.gz: 1a9968debc063988b1bbc485e31145a487b5c526
+  data.tar.gz: 26611433c1293dcce8cc04d99d693a9873e09cdc
 SHA512:
-  metadata.gz: 3156898ce2975d594b9799bcfe0abef48d68db309e7cc2b07345e61306c97994314e890ecb3ad72dcc447ef0e1df499525cf9ca21efc3b5e0e6730389ac5cc33
-  data.tar.gz: 4136d190ac320d7e5f9d60100d1ad84a9783fba4c7c053fcc5ba6c43499533e538c6e7ef8c54db4114b6de45079195e4de7451f45dc19c156943e6ed0b9c4a57
+  metadata.gz: 6ff09b4c51163c387f018fa64a22927d918393bcb91b1b64dd0f4cf014e03e8aed804fd40074807722e1101a255081dd48e3edf019bb05319daad4f2dc5d0c45
+  data.tar.gz: bc8cc4c43d4f0201a67bd28dff417534c3655852ab80e86c4d3c2f773b2c57f60da3e3e7bad9e2bb06dee41548eda679076e3e8f2697b2b1c394a2d08c4ef82e

data/lib/interactive-logger.rb

@@ -11,6 +11,7 @@ class InteractiveLogger
   def initialize(debug: false)
     @debug = debug
     @current_step = nil
+    @draw_mutex = Mutex.new
   end
 
   def debug?; @debug == true end
@@ -41,11 +42,16 @@ class InteractiveLogger
 
     loop do
       if queue.empty?
-        @current_step.continue # Keep the UI updating regardless of actual process.
+        @draw_mutex.synchronize do
+          @current_step.continue # Keep the UI updating regardless of actual process.
+        end
       else
         until queue.empty?
           msg = queue.pop
-          @current_step.send(msg.shift, *msg)
+
+          @draw_mutex.synchronize do
+            @current_step.send(msg.shift, *msg)
+          end
         end
       end
 
@@ -69,25 +75,32 @@ class InteractiveLogger
   def debug(str)
     return unless debug?
 
-    @current_step.blank if @current_step
-    print '--> '.yellow
-    puts str
-    @current_step.repaint if @current_step
+    @draw_mutex.synchronize do
+      @current_step.blank if @current_step
+      print '--> '.yellow
+      puts str
+      @current_step.repaint if @current_step
+    end
   end
+
   # Post an informative message above the current step output.
   def info(str)
-    @current_step.blank if @current_step
-    print '--> '.green
-    puts str
-    @current_step.repaint if @current_step
+    @draw_mutex.synchronize do
+      @current_step.blank if @current_step
+      print '--> '.green
+      puts str
+      @current_step.repaint if @current_step
+    end
   end
 
   # Post an error message above the current step output.
   def error(str)
-    @current_step.blank if @current_step
-    print '--> '.red
-    puts str
-    @current_step.repaint if @current_step
+    @draw_mutex.synchronize do
+      @current_step.blank if @current_step
+      print '--> '.red
+      puts str
+      @current_step.repaint if @current_step
+    end
   end
 
   # Post a single message, without any progress tracking.

data/lib/interactive_logger/step.rb

@@ -1,4 +1,6 @@
 # coding: utf-8
+require 'io/console'
+
 class InteractiveLogger
   class Step
     PROGRESS_SYMBOLS = %w(- \\ | /)
@@ -12,21 +14,24 @@ class InteractiveLogger
       @start = Time.now
       @show_time = show_time
       @pos = 0
-      print_msg(in_progress_prefix << str)
+      print_trimmed(in_progress_prefix << str)
     end
 
     def continue(str = nil)
       @pos += 1
+      blank
       @last_str = str if str
-      print_msg(in_progress_prefix << @last_str)
+      print_trimmed(in_progress_prefix << @last_str)
     end
 
     def failure(str = nil)
+      blank
       @last_str = str if str
       print_msg(prefix(FAILURE_SYMBOL) << @last_str)
     end
 
     def success(str = nil)
+      blank
       @last_str = str if str
       print_msg(prefix(SUCCESS_SYMBOL) << @last_str)
     end
@@ -35,7 +40,7 @@ class InteractiveLogger
     def blank
       print "\r"
       if @last_print_msg
-        print ' ' * @last_print_msg.uncolorize.size
+        print ' ' * IO.console.winsize[1]
       end
       print "\r"
     end
@@ -64,5 +69,58 @@ class InteractiveLogger
       @last_print_msg = str
       print str
     end
+
+    # Trim string to current terminal width and break at newline so it can be
+    # replaced rather than causing the same line to print multiple times.
+    #
+    # The bulk of this logic is dedicated to counting only printable
+    # characters, and ensure we reset the colors afterward.
+    def print_trimmed(str)
+      terminal_width = IO.console.winsize[1]
+
+      # Take only the first line.
+      str = str.lines.first.chomp
+      @last_print_msg = ""
+
+      len = 0 # Printable length of characters sent to screen so far.
+      pos = 0 # Position in input string buffer.
+      c = true # Are we counting characters?
+
+      # Copy characters, including nonprintables, until we have copied
+      # terminal_width - 4 printables, then add an elipsis and call it
+      # a day.
+      loop do
+        if str[pos, 2] == "\e["
+          @last_print_msg << "\e["
+          pos += 2
+          c = false
+          next
+        end
+
+        if c == false && str[pos] == "m"
+          @last_print_msg << str[pos]
+          pos += 1
+          c = true
+          next
+        end
+
+        # Everything fits, nothing to do.
+        if pos == str.size
+          break
+        end
+
+        # We are going to run out of space, reset color to normal and draw an elipsis.
+        if len == terminal_width - 5 && str.size > pos + 3
+          @last_print_msg << "\e[0m..."
+          break
+        end
+
+        @last_print_msg << str[pos]
+        len += 1 if c
+        pos += 1
+      end
+
+      print @last_print_msg
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interactive-logger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kyle Smith <askreet@gmail.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -33,7 +33,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.3
 description: A colorful, interactive logger for tracking progress of an operation.
 email: askreet@gmail.com
 executables: []
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A colorful, interactive logger.