console_table 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc8c0f79d2fc85c38865c3b33db892ff2a432db
-  data.tar.gz: 77c8ef6f4172966e2bd66e98e900522145dd19d8
+  metadata.gz: 2ad359bbbe8957d51f799ac7761138ce6298c242
+  data.tar.gz: 33e4d6d67e2405a9915d7368b32d572e27f4575a
 SHA512:
-  metadata.gz: 8fa13fbebea0d09c30a2a84bab7c4bca6ecfc0b8c43ecdbe255c142f1115ba43a8698527149034f7f80e97c027febfb01b29ecf6571ec905f8cb5cff95a0cc57
-  data.tar.gz: 0c35bba2d213990e7bf7e292a566df77d788cdda194ff4136004df021c6ff2518d3b40e89359d5cb60e9827ccec1ccb4164cc0b2a34e78f6aeb2d7a93b6d8618
+  metadata.gz: ca996310196d283a334171530e68b93922bff9bf2e4ac5bf2a00870a469f597ebcd8cd3cb9273e21c32add989513808df3e913270a28e3f4398eb00e1ca77414
+  data.tar.gz: 69d0c16af724898caa200b825b3ea4c0c2fd92fe1809b969649120002f59a662bac0c16c1857c777ebe84a34ca379902da00eda03335eda328976c41dcfae7ae

data/lib/console_table.rb

@@ -1,7 +1,7 @@
 require 'terminfo'
 
 module ConsoleTable
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   def self.define(layout, options={}, &block)
     table = ConsoleTableClass.new(layout, options)
@@ -223,10 +223,10 @@ module ConsoleTable
         require 'pp'
         normalized = string.to_s
 
-        normalized = normalized.sub(/^(\e\[\d.*?m)(\s+)/, '\2\1') #Any leading spaces preceeded by a color code should be swapped with the color code itself, so the spaces themselves aren't colored
-        normalized = normalized.sub(/(\s+)(\e\[\d.*?m)$/, '\2\1')
-
-        normalized.gsub(/\s+/, " ").strip #Primarily to remove any tabs or newlines
+        normalized = normalized.sub(/^(\e\[\d[^m]*?m)(\s+)/, '\2\1') #Any leading spaces preceeded by a color code should be swapped with the color code itself, so the spaces themselves aren't colored
+        normalized = normalized.sub(/(\s+)(\e\[\d[^m]*?m)$/, '\2\1')
+        normalized = normalized.gsub(/\s+/, " ").strip #Primarily to remove any tabs or newlines
+        normalized
       end
     end
 
@@ -284,7 +284,7 @@ module ConsoleTable
 
 
     def uncolorize(string)
-      string.gsub(/\e\[\d.*?m/m, "")
+      string.gsub(/\e\[\d[^m]*?m/m, "")
     end
 
     #TODO: if you're doing center or right-justification, should it trim from the sides or from the left, respectively?

data/test/test_console_table.rb

@@ -160,15 +160,44 @@ Bl ah                1234
 ==========================
     END
 
-    require 'pp'
-    puts @mock_out.string
-
     assert_includes @mock_out.string, "\e[0;34;49mBl ah\e[0m"  #ensure the color got reset
     assert_includes @mock_out.string, "\e[0;31;49m1234 \e[0m"  #ensure the color got reset
 
     assert_output_equal expected, @mock_out.string
   end
 
+  def test_spacing_after_colors_is_preserved
+    table_config = [
+        {:key=>:col1, :size=>60, :title=>"Column 1"},
+    ]
+
+    ConsoleTable.define(table_config, :width=> 60, :output=>@mock_out) do |table|
+      table << [
+          "hello - \e[0;34;49mTest\e[0m - this is a test"
+      ]
+
+      table << [
+          "\e[0;34;49mTest\e[0m - this is a test"
+      ]
+
+      table << [
+          "blah and stuff - \e[0;34;49mTest\e[0m"
+      ]
+    end
+
+    expected=<<-END
+============================================================
+Column 1
+------------------------------------------------------------
+hello - Test - this is a test
+Test - this is a test
+blah and stuff - Test
+============================================================
+    END
+
+    assert_output_equal expected, @mock_out.string
+  end
+
   def test_can_ellipsize_at_column_level
     table_config = [
         {:key=>:col1, :size=>20, :title=>"Column 1", :ellipsize=>true},
@@ -232,8 +261,6 @@ Short
 ====================
     END
 
-    puts @mock_out.string
-
     assert_output_equal expected, @mock_out.string
   end
 
@@ -256,13 +283,13 @@ Short
 ==============================================================
       Column 1                   Column 2 Column 3
 --------------------------------------------------------------
-               Right       Center         Left
+               Right        Center        Left
 ==============================================================
     END
 
     assert_includes @mock_out.string, " \e[0;34;49mRight\e[0m"  #space is on outside of coor
     assert_includes @mock_out.string, " \e[0;35;49mLeft\e[0m "  #space is on outside of color
-    #assert_includes @mock_out.string, " \e[0;31;49mCenter\e[0m "  #this assert fails due to what I'm pretty sure is a bug in gsub(), but it's not the end of the world so I'm not doing a workaround
+    assert_includes @mock_out.string, " \e[0;31;49mCenter\e[0m"  #this assert fails due to what I'm pretty sure is a bug in gsub(), but it's not the end of the world so I'm not doing a workaround
 
     assert_output_equal expected, @mock_out.string
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_table
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rod Hilton