inprovise 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWIzZmMxNTQzOTY1MjAxNTZiYjE2ZjQwNzZjZDg1ZDQwMDA3MWMxMg==
+    ZGIxYjZiN2VkYTY2OTEwNjVjMDg3OTBiMmUyYzM4YzVmZTZlZmIxMQ==
   data.tar.gz: !binary |-
-    YzYzYjJlYzc2MmYxOTFkYTJjY2Q0ZmY3Njg5MWFlYzc0NDU0MGUzNw==
+    NWRjZTgzZTY1ZGEzN2NiZTU2NWRjYTBkODIxNzA0YTA5MGQxMTVjNg==
 SHA512:
   metadata.gz: !binary |-
-    MDljNzdlYTgwNTEyM2I4YmNkMzE0Y2NlYTJhMWRhMjJiYzUyNGRiMjQ4YmEx
-    NmViZmRmMTUzNGJiMWRkNDg4YmEzYjNjMDAyMzI1OWVhMmNiMGU1MjBiYmJl
-    ZjU1YTZkYzUzZTk0ZjdlNDMzNzExMGM1MTYwNWI4MjZiZTI1ZTA=
+    N2I3Yzc5M2ZlOGVjZTJmMDUzNjcxODRhZWIwNjk3OTg0YjUwMzM2Y2EwZWI0
+    OGI0ZDQzNzBmZjU5YzBkNzZiN2ZhMGRlNzkxMDZlNDM0NzhlMTg3NjZiOWJj
+    YzIyMzcwODEyY2I2NWIzNDAwMzg0YTJmYzA3YzU3YTdhMjJjMDc=
   data.tar.gz: !binary |-
-    YTc2YjdjYzc3MGFkMGM3NDgwNGRjOWI2OGE0MTA4NjVkMDNjOTA0NDgyMDZi
-    ZWQ0NWMyMjcyMWYyNzliM2JlMzk0ZmFlZDhkMjMzNDQzMWFiMzk0MjI5YzVj
-    YmI4MGRiYWJmMDY2ZGJkNmE3ZTA1OGZjMWRiNjc2MWNhYWI2MWU=
+    ZTg4ZTc3MTA1Y2NkMDkwODE2YWNmMjdjZWQzYjQzNTY4ZjZkZTdjMDNiMDNk
+    ZjFiY2QwOWQ5OGNiOWM5ZTkwNWQ2MTQ1MjNiOGQ0ZGIwZGQ2Yzg2OGNjMTkz
+    MmY3Y2VkNjQwOWI5NWU1YjVlYzZkZjM2M2YwYTkwYzQ0MDI4MTY=

data/lib/inprovise/logger.rb

@@ -19,10 +19,6 @@ class Inprovise::Logger
   end
 
   def initialize(node, task)
-    @streams = {
-      :stdout => { :ios => $stdout, :buffer => [{col: nil, ln: '', cr: false}] },
-      :stderr => { :ios => $stderr, :buffer => [{col: nil, ln: '', cr: false}] }
-    }
     @node = node
     set_task(task)
   end
@@ -84,6 +80,17 @@ class Inprovise::Logger
   end
   private :buffer
 
+  def next_line(stream)
+    lnbuf = buffer(stream).shift || {}
+    [lnbuf[:col], lnbuf[:ln], lnbuf[:cr]]
+  end
+  private :next_line
+
+  def push_line(stream, col, ln, cr)
+    buffer(stream) << {col: col, ln: ln, cr: cr ? true : false}
+  end
+  private :push_line
+
   def put(msg, color=nil, stream=:stdout)
     streambuf = buffer(stream)
     streambuf.last[:col] ||= color
@@ -98,30 +105,26 @@ class Inprovise::Logger
   private :puts
 
   def do_print(stream=:stdout)
-    streambuf = buffer(stream)
-    while lnbuf = streambuf.shift
-      clear_to_eol = lnbuf[:cr]
-      lnbuf[:ln].scan(/([^\r]*)(\r)?/) do |txt, cr|
-        # do we have a (full) line to print?
-        if cr || !streambuf.empty?
-          out = lnbuf[:col] ? txt.to_s.send(lnbuf[:col]) : txt
+    until buffer(stream).empty?
+      col, ln, cr_at_start = next_line(stream)
+      ln.scan(/([^\r]*)(\r)?/) do |txt, cr|
+        nl = buffer(stream).size > 0
+        if cr || nl
           unless txt.empty?
-            ios(stream).print "\r".to_eol if clear_to_eol
-            ios(stream).print "#{@node.to_s} [#{@task.bold}] #{out}"
+            out = col ? txt.to_s.send(col) : txt
+            ios(stream).print "\r".to_eol if cr_at_start
+            ios(stream).print "#{@node} [#{@task.bold}] #{out}"
           end
-          ios(stream).flush if cr
-          ios(stream).puts unless cr || (txt.empty? && !clear_to_eol)
-          clear_to_eol = cr ? true : false
-          break unless cr # next line or cr?
-        else
-          streambuf << if txt.empty?
-            # restart with empty line
-            {col:nil,ln:'',cr:clear_to_eol}
+          if cr
+            ios(stream).flush
           else
-            # stuff the remaining text back for a next round
-            {col:lnbuf[:col],ln:txt,cr:clear_to_eol}
+            ios(stream).puts unless txt.empty? && !cr_at_start
           end
-          return
+          cr_at_start = cr
+        else
+          # cache for later
+          push_line(stream, txt.empty? ? nil : col, txt, cr_at_start)
+          return # done printing for now
         end
       end
     end

data/lib/inprovise/version.rb

@@ -5,6 +5,6 @@
 
 module Inprovise
 
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inprovise
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored