Apply arches#45

lib/table_print/formatter.rb

@@ -25,7 +25,7 @@ def initialize(width)
     end
 
     def format(value)
-      padding = width - length(value.to_s)
+      padding = width - length(strip_escape(value.to_s))
       truncate(value) + (padding < 0 ? '' : " " * padding)
     end
 
@@ -34,11 +34,15 @@ def truncate(value)
       return "" unless value
 
       value = value.to_s
-      return value unless value.length > width
+      return value unless strip_escape(value).length > width
 
       "#{value[0..width-4]}..."
     end
 
+    def strip_escape(value)
+      value.gsub(%r{\e[^m]*m}, '')
+    end
+
     def length(str)
       if TablePrint::Config.multibyte
         str.each_char.collect{|c| c.bytesize == 1 ? 1 : 2}.inject(0, &:+)

spec/formatter_spec.rb

@@ -53,6 +53,10 @@
       @f.format("1234567890123456").should == "1234567..."
     end
 
+    it "truncate colorized values correctly" do
+      @f.format("\e[0;31;49masdf\e[0m").should == "\e[0;31;49masdf\e[0m      "
+    end
+
     it "uses an empty string in place of nils" do
       @f.format(nil).should == "          "
     end