From 851daf5e6a564d53fc43c3f102e1dc823c69d984 Mon Sep 17 00:00:00 2001
From: Peter Vandenberk <pvandenberk@mac.com>
Date: Mon, 6 Jan 2014 13:34:58 +0000
Subject: [PATCH] Width formatting for %T and %<T

---
 lib/ntail/formatting.rb      | 14 ++++++++++++--
 lib/ntail/formatting.treetop | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/ntail/formatting.rb b/lib/ntail/formatting.rb
index 4a124db..cbaab61 100644
--- a/lib/ntail/formatting.rb
+++ b/lib/ntail/formatting.rb
@@ -352,7 +352,12 @@ def _nt_body_bytes_sent
 
   module UpstreamResponseTime0
     def value(log_line, color)
-      foreground(log_line.upstream_response_time, color)
+      if color && Sickill::Rainbow.enabled
+        # 15 = 6 + 9, the extra amount of bytes required for the ANSI escape codes...
+        "%15s" % foreground(log_line.upstream_response_time, color)
+      else
+        "%6s" % log_line.upstream_response_time
+      end
     end
   end
 
@@ -383,7 +388,12 @@ def _nt_upstream_response_time
 
   module RequestTime0
     def value(log_line, color)
-      foreground(log_line.request_time, color)
+      if color && Sickill::Rainbow.enabled
+        # 15 = 6 + 9, the extra amount of bytes required for the ANSI escape codes...
+        "%15s" % foreground(log_line.request_time, color)
+      else
+        "%6s" % log_line.request_time
+      end
     end
   end
 
diff --git a/lib/ntail/formatting.treetop b/lib/ntail/formatting.treetop
index 0da5be3..5c8f7bc 100644
--- a/lib/ntail/formatting.treetop
+++ b/lib/ntail/formatting.treetop
@@ -73,7 +73,12 @@ grammar Formatting
   rule upstream_response_time
     '%<T' <Node> {
       def value(log_line, color)
-        foreground(log_line.upstream_response_time, color)
+        if color && Sickill::Rainbow.enabled
+          # 15 = 6 + 9, the extra amount of bytes required for the ANSI escape codes...
+          "%15s" % foreground(log_line.upstream_response_time, color)
+        else
+          "%6s" % log_line.upstream_response_time
+        end
       end
     }
   end
@@ -81,7 +86,12 @@ grammar Formatting
   rule request_time
     '%T' <Node> {
       def value(log_line, color)
-        foreground(log_line.request_time, color)
+        if color && Sickill::Rainbow.enabled
+          # 15 = 6 + 9, the extra amount of bytes required for the ANSI escape codes...
+          "%15s" % foreground(log_line.request_time, color)
+        else
+          "%6s" % log_line.request_time
+        end
       end
     }
   end