salticid 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64a66a4ad8d5621362736470e5e59de49304621e
-  data.tar.gz: 2d23c1e7bb6805f3930a8b7851c6df1d3249bd78
+  metadata.gz: 18d94d9cf5f66f05559c0c92dd49b4adc6de060f
+  data.tar.gz: 53528e2a51a6f6ab2b23d9f066a070b236d54d5e
 SHA512:
-  metadata.gz: 0473e989e79da8851aca8d0c1db2f3a73590811a97d558d56d495bc5437aa412af6d4f4e86bc1121c60d615db4eb815e776543af4e1bebe6e3e14c67756aeeff
-  data.tar.gz: 3ab14e47b33c26ba52fcdd4742802e4729c59819dc657b3a985a1e65de4da90a89ec1bb9aca4d547d35dea46c9ac8783a8f2c0b7ee8fde52b76a65832f3c962a
+  metadata.gz: c7144fe249fca65c9013bd41d58b971af2225e470510b6eb0e6eefe30562faacbc47164432e169bf947a0e5cd7ace3968e4d8f44021946fb2ab572d698753b03
+  data.tar.gz: 4edada67749f62971f0263c01c8a44b8d17632e1ffd1ea30844a53b94696c5c70e7192fdf87ad08d42a434bf535236cd935b0a3da44fffcb8168c19b0add526e

data/lib/salticid/host.rb

@@ -170,6 +170,7 @@ class Salticid::Host
 
     buffer = ''
     echoed = 0
+    stderr_echoed = 0
     status = nil
     written = false
 
@@ -213,11 +214,21 @@ class Salticid::Host
 
         # Handle STDERR
         ch.on_extended_data do |c, type, data|
+          # STDERR
           if type == 1
-            # STDERR
+            # Callback
             opts[:stderr].call(data) if opts[:stderr]
+
+            # Accrue in stderr string
             stderr << data
-            log :stderr, stderr if opts[:echo]
+
+            # Play forward any unwritten lines
+            if opts[:echo] and stderr_echoed < stderr.length
+              stderr[stderr_echoed..-1].split("\n")[0..-2].each do |fragment|
+                stderr_echoed += fragment.length + 1
+                log :stderr, fragment
+              end
+            end
           end
         end
         
@@ -244,6 +255,12 @@ class Salticid::Host
               echoed += fragment.length + 1
               log fragment
             end
+
+            # Last of stderr
+            stderr[stderr_echoed..-1].split("\n").each do |fragment|
+              echoed += fragment.length + 1
+              log :stderr, fragment
+            end
           end
         end
       end

data/lib/salticid/interface.rb

@@ -12,6 +12,7 @@ class Salticid
       :error => Curses::COLOR_RED,
       :warn => Curses::COLOR_YELLOW,
       :debug => Curses::COLOR_CYAN,
+      :stderr => Curses::COLOR_MAGENTA,
       :finished => Curses::COLOR_GREEN
     }
     COLOR_PAIRS = {}

data/lib/salticid/interface/host_view.rb

@@ -80,7 +80,7 @@ class Salticid
             else
               # Put hanging line
               @window.attron Curses::A_BOLD
-              @window.attron color if color
+              @window.color_set color if color
               @window.setpos lines_left, offset
               @window.addstr line
             end

data/lib/salticid/version.rb

@@ -1,3 +1,3 @@
 class Salticid
-  VERSION = "0.9.6"
+  VERSION = "0.9.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salticid
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - Kyle Kingsbury