console_table 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319bf461a967b3098c88d16ed370e6b32cfe0a11
-  data.tar.gz: 82ac42a1dcc1680f982ddafa7a9613a28a7a0d42
+  metadata.gz: 2f72bfb44646e954c27cf46a4b3b3f4d50c629b0
+  data.tar.gz: 23402eb6500112776e41f43a988c0340552c1b65
 SHA512:
-  metadata.gz: 1c0bdfbc856c1f7e04a7b9a3adfc3d259472947293a8812637395d233f1bc14ce68bc0e1730312012c4fd87765cb66e07ace95a74c7d27ab2c0f790ce552802b
-  data.tar.gz: 64a60d6b7571dcabee14970cc6b9bef3768c2bbcf9663c7d03378ea26085c8b466f7e28a0e56d666b709f92a2d9c562ef844fc6be7e1bb9b33871d99a4cfd6ad
+  metadata.gz: 3fb568ca9cac5df83ac89909b4988f56b464345ca938600926c84f747d734799ea64967d472420d0a30cc6be66b39afa0a9040d6eb63fd08be6d4a22573526a4
+  data.tar.gz: d2bdf4a87fe2dbf1a6f62a5a1a9bbfbf60250b28c36d96a480575e76fbe36597b71b275a60a9c700e2edff0bac2d7ff2b683b02f17a83d7cf4cfc8d24c55e5c2

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/console_table.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "console_table"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Rod Hilton"]
   spec.email         = ["consoletable@rodhilton.com"]
   spec.summary       = %q{Simplifies printing tables of information to commandline consoles}
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency 'rake', '~> 0'
   spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'minitest', '~> 5.5'
 
   spec.add_runtime_dependency 'colorize', '~> 0.7'
 end

data/lib/console_table.rb

@@ -101,7 +101,10 @@ class ConsoleTable
       justify = to_print[:justify] || :left
       mode = to_print[:mode] || :default
 
-      formatted=format(@working_width, text, ellipsize, justify).colorize(:color => color, :background => background, :mode => mode)
+      formatted=format(@working_width, text, ellipsize, justify)
+      if text != :default or background != :default or mode != :default
+        formatted = formatted.colorize(:color => color, :background => background, :mode => mode)
+      end
       @out.print formatted
     end
 
@@ -127,7 +130,11 @@ class ConsoleTable
         justify = to_print[:justify] || justify #can override
         mode = to_print[:mode] || :default
 
-        formatted=format(column[:size], text, ellipsize, justify).colorize(:color => color, :background => background, :mode => mode)
+        formatted=format(column[:size], text, ellipsize, justify)
+
+        if color != :default or background != :default or mode != :default
+          formatted = formatted.colorize(:color => color, :background => background, :mode => mode)
+        end
 
         unless (to_print[:highlight].nil?)
           highlight_regex = to_print[:highlight][:regex] || /wontbefoundbecauseit'sgobbledygookblahblahblahbah/
@@ -167,6 +174,11 @@ class ConsoleTable
       total_width = ENV["COLUMNS"].to_i || 150
     end
 
+    keys = @original_column_layout.collect { |d| d[:key] }.uniq
+    if keys.length < @original_column_layout.length
+      raise("ConsoleTable configuration invalid, same key defined more than once")
+    end
+
     num_spacers = @original_column_layout.length - 1
     set_sizes = @original_column_layout.collect { |x| x[:size] }.find_all { |x| x.is_a? Integer }
     used_up = set_sizes.inject(:+) || 0

data/test/{console_table_test.rb → test_console_table.rb}

@@ -1,7 +1,7 @@
-require 'test/unit'
-require '../lib/console_table'
+require 'minitest/autorun'
+require 'console_table'
 
-class ConsoleTableTest < Test::Unit::TestCase
+class ConsoleTableTest < Minitest::Test
 
   def setup
     @mock_out = StringIO.new
@@ -196,10 +196,10 @@ Row 2, Column 1      Row 2, Column 2                      Row  Row 2, Column 4
 
     commit_table_config = [
         {:key=>:col1, :size=>20, :title=>"Column 1"},
-        {:key=>:col1, :size=>20, :title=>"Column 2"},
+        {:key=>:col2, :size=>20, :title=>"Column 2"},
     ]
 
-    assert_raise(RuntimeError) { ConsoleTable.define(commit_table_config) }
+    assert_raises(RuntimeError) { ConsoleTable.define(commit_table_config) }
   end
 
   def test_wont_create_layout_with_more_than_100_percent
@@ -207,10 +207,10 @@ Row 2, Column 1      Row 2, Column 2                      Row  Row 2, Column 4
 
     commit_table_config = [
         {:key=>:col1, :size=>0.8, :title=>"Column 1"},
-        {:key=>:col1, :size=>0.3, :title=>"Column 2"},
+        {:key=>:col2, :size=>0.3, :title=>"Column 2"},
     ]
 
-    assert_raise(RuntimeError) { ConsoleTable.define(commit_table_config) }
+    assert_raises(RuntimeError) { ConsoleTable.define(commit_table_config) }
   end
 
   def test_wont_create_layout_with_invalid_size
@@ -218,10 +218,97 @@ Row 2, Column 1      Row 2, Column 2                      Row  Row 2, Column 4
 
     commit_table_config = [
         {:key=>:col1, :size=>0.8, :title=>"Column 1"},
-        {:key=>:col1, :size=>"hello!", :title=>"Column 2"},
+        {:key=>:col2, :size=>"hello!", :title=>"Column 2"},
+    ]
+
+    assert_raises(RuntimeError) { ConsoleTable.define(commit_table_config) }
+  end
+
+  def test_wont_allow_repeats_of_key_names
+    ENV["COLUMNS"] = "50"
+
+    commit_table_config = [
+        {:key=>:col1, :size=>20, :title=>"Column 1"},
+        {:key=>:col1, :size=>20, :title=>"Column 2"},
+    ]
+
+    assert_raises(RuntimeError) { ConsoleTable.define(commit_table_config) }
+  end
+
+  def test_can_truncate_output
+    ENV["COLUMNS"] = "100"
+
+    commit_table_config = [
+        {:key=>:col1, :size=>20, :title=>"Column 1"}
+    ]
+
+    ConsoleTable.define(commit_table_config, :output=>@mock_out) do |table|
+      table.print({
+                      :col1 => "This is short"
+                  })
+
+      table.print({
+                      :col1 => "This is way too long and it needs to get cut off"
+                  })
+
+      table.print({
+                      :col1 => {:text=>"This is way too long and it needs to get cut off", :ellipsize=>true}
+                  })
+    end
+
+    expected=<<-END
+====================
+Column 1
+--------------------
+This is short
+This is way too long
+This is way too l...
+====================
+    END
+
+    assert_output_equal expected, @mock_out.string
+  end
+
+  def test_can_justify_columns_and_override_in_rows
+    ENV["COLUMNS"] = "100"
+
+    commit_table_config = [
+        {:key=>:col1, :size=>20, :title=>"Column 1"},
+        {:key=>:col2, :size=>20, :title=>"Column 2", :justify=>:center},
+        {:key=>:col3, :size=>20, :title=>"Column 3", :justify=>:right}
     ]
 
-    assert_raise(RuntimeError) { ConsoleTable.define(commit_table_config) }
+    ConsoleTable.define(commit_table_config, :output=>@mock_out) do |table|
+      table.print({
+                      :col1 => "Short1",
+                      :col2 => "Short2",
+                      :col3 => "Short3"
+                  })
+
+      table.print({
+                      :col1 => {text: "Short1"},
+                      :col2 => {text: "Short2"},
+                      :col3 => {text: "Short3"}
+                  })
+
+      table.print({
+                      :col1 => {text: "Short1", :justify=>:center},
+                      :col2 => {text: "Short2", :justify=>:right},
+                      :col3 => {text: "Short3", :justify=>:left}
+                  })
+    end
+
+    expected=<<-END
+==============================================================
+Column 1                   Column 2                   Column 3
+--------------------------------------------------------------
+Short1                      Short2                      Short3
+Short1                      Short2                      Short3
+       Short1                      Short2 Short3
+==============================================================
+    END
+
+    assert_output_equal expected, @mock_out.string
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_table
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rod Hilton
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,7 @@ files:
 - Rakefile
 - console_table.gemspec
 - lib/console_table.rb
-- test/console_table_test.rb
+- test/test_console_table.rb
 - todo.txt
 homepage: https://github.com/rodhilton/console_table
 licenses:
@@ -109,4 +123,4 @@ signing_key:
 specification_version: 4
 summary: Simplifies printing tables of information to commandline consoles
 test_files:
-- test/console_table_test.rb
+- test/test_console_table.rb