console_table 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2714908facb82595d5192b796aa3dee67b79c63e
-  data.tar.gz: 710aebb51608070c1ea67a72d66e3d5796f1ef9a
+  metadata.gz: e1105b617581e5b593f42b5227546ec90e7ceb6f
+  data.tar.gz: 9b720ddaeef699a8d57c00bd8bfecd69b8b5ee2b
 SHA512:
-  metadata.gz: b713ffa5e0c3073417e5fbd7b56f282cde5fa307e802bf771ca3312fc1e90e7f97e75b7903536e5fb42f2302983035a16dc1834d6231541e65c2e56ce4113050
-  data.tar.gz: ef98aaa437d86e63f4ee6ca91296738dba6c15a2e4e0dda5162abe72f7a88c5761363e2f5b4609d038fe6a32caddc58599337b36c448f3bc6465ef43e8dbdd3d
+  metadata.gz: cf00120d77b9255bf7b2f9cd87ec5362ec6d88942034068a60c110d9d3f59f4bf5222b4e7155dc660327f87fa6a934091067de62adc32d9e6464699b3cadcacd
+  data.tar.gz: 996efe76eb5e2c28c5f78faa34e45ed596ae14d633800570bb87a2b3a6e344050b7922787db8a8597a779c052daa725df346d28abf9f3f29e2ef8fc939ff55b8

data/README.md

@@ -60,12 +60,12 @@ Once we have our table, we must print to it.  Printing a line of data means supp
 
 ```ruby
 ConsoleTable.define(table_config) do |table|
-	table.print({
+	table << {
 		:name=>"Rod",
 		:birthday=>"04-14-80",
 		:nickname=>"Chainsaw",
 		:motto=>"It works on my machine"
-	})
+	}
 end
 ```
 
@@ -90,12 +90,12 @@ table_config = [
 ]
 
 ConsoleTable.define(table_config) do |table|
-	table.print({
+	table << {
 		:name=>"Rod",
 		:birthday=>"04-14-80",
 		:nickname=>{:text=>"Chainsaw", :justify=>:left},
 		:motto=>"It works on my machine"
-	})
+	}
 end
 ```
 
@@ -118,16 +118,16 @@ table_config = [
    {:key=>:name, :size=>15, :title=>"Name"},
    {:key=>:birthday, :size=>8, :title=>"DOB"},
    {:key=>:nickname, :size=>0.3, :title=>"Nickname(s)", :justify=>:center},
-   {:key=>:motto, :size=>"*", :title=>"Motto", :justify=>:right},
+   {:key=>:motto, :size=>"*", :title=>"Motto", :justify=>:right}
 ]
 
 ConsoleTable.define(table_config) do |table|
-	table.print({
+	table << {
 		:name=>{:text=>"Rod", :highlight=>{:regex=>/[A-Z]/, :color=>:red},
 		:birthday=>{text: "04-14-80", :color=>:blue},
 		:nickname=>{:text=>"Chainsaw", :justify=>:left},
 		:motto=>{:text=>"This is a very long motto, I don't mind if it gets cut off but I'd like it to indicate as such with ellipses", :ellipsize=>true}
-	})
+	}
 end
 ```
 
@@ -156,19 +156,19 @@ table_config = [
 ]
 
 ConsoleTable.define(table_config, :left_margin=>5, :right_margin=>10, :title=>"Movie Killers") do |table|
-	table.print({
+	table << {
 		:title=>{:text=>"Friday the 13th", :highlight=>{:regex=>/[A-Z]/, :color=>:red}},
 		:name=>{:text=>"Jason's Mom", :justify=>:left},
 		:release_date=>{text: "05-09-80", :color=>:blue},
 		:tagline=>{:text=>"They were warned...They are doomed...And on Friday the 13th, nothing will save them.", :ellipsize=>true}
-	})
+	}
 
-	table.print({
+	table << {
 		:title=>{:text=>"Halloween", :highlight=>{:regex=>/[A-Z]/, :color=>:red}, :background=>:orange},
 		:name=>{:text=>"Michael Meyers", :justify=>:left},
 		:release_date=>{text: "10-25-80", :color=>:blue},
 		:tagline=>{:text=>"Everyone is entitled to one good scare", :ellipsize=>true}
-	})
+	}
 
 	table << {
 		:title=>{:text=>"Nightmare on Elm St.", :highlight=>{:regex=>/[A-Z]/, :color=>:red}, :background=>:orange},
@@ -179,8 +179,8 @@ ConsoleTable.define(table_config, :left_margin=>5, :right_margin=>10, :title=>"M
 
 	table << ["Hellraiser", "Pinhead", "9-18-87", "Demon to some. Angel to others."]
 
-	table.add_footer("This is just a line of footer text")
-	table.add_footer("This is a second footer with \nlots of \nlinebreaks in it.")
+	table.footer << "This is just a line of footer text"
+	table.footer << "This is a second footer with \nlots of \nlinebreaks in it."
 end
 ```
 
@@ -202,7 +202,7 @@ end
      =================================================================
 ```
 
-Note the alternative method of calling print (`<<`) and the fact that you can also supply an array instead of a hash, and ConsoleTable will infer from the array order which value goes in what column
+Note the alternative method of calling `<<` where you can supply an Array instead of a hash, and ConsoleTable will infer from the array order which value goes in what column
 
 ## Contributing
 

data/console_table.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'console_table'
 
 Gem::Specification.new do |spec|
   spec.name          = "console_table"
-  spec.version       = "0.0.7"
+  spec.version       = ConsoleTable::VERSION
   spec.authors       = ["Rod Hilton"]
   spec.email         = ["consoletable@rodhilton.com"]
   spec.summary       = %q{Simplifies printing tables of information to commandline consoles}

data/lib/console_table.rb

@@ -1,262 +1,276 @@
 require 'colorize'
 require 'terminfo'
 
-class ConsoleTable
+module ConsoleTable
+  VERSION = "0.1.0"
 
   def self.define(layout, options={}, &block)
-    table = ConsoleTable.new(layout, options)
-    table.print_header
+    table = ConsoleTableClass.new(layout, options)
+    table.send(:print_header)
     block.call(table)
-    table.print_footer
+    table.send(:print_footer)
   end
 
-  def initialize(column_layout, options={})
-    @original_column_layout = column_layout
-    @left_margin = options[:left_margin] || 0
-    @right_margin = options[:right_margin] || 0
-    @out = options[:output] || $stdout
-    @title = options[:title]
-    @set_width = options[:width]
+  class ConsoleTableClass
 
-    @footer_lines = []
+    attr_reader :footer
 
-    @headings_printed = false
-    @count = 0
+    def <<(options)
+      print(options)
+    end
 
-    calc_column_widths
-    Signal.trap('SIGWINCH', proc { calc_column_widths })
-  end
+    protected
 
-  def print_header()
-    @out.print " " * @left_margin
-    @out.print "=" * @working_width
-    @out.print "\n"
+    def initialize(column_layout, options={})
+      @original_column_layout = column_layout
+      @left_margin = options[:left_margin] || 0
+      @right_margin = options[:right_margin] || 0
+      @out = options[:output] || $stdout
+      @title = options[:title]
+      @set_width = options[:width]
 
-    if not @title.nil? and @title.length <= @working_width
-      @out.print " "*@left_margin
-      left_side = (@working_width - @title.uncolorize.length)/2
-      right_side = (@working_width - @title.uncolorize.length) - left_side
-      @out.print " "*left_side
-      @out.print @title
-      @out.print " "*right_side
-      @out.print "\n"
-    end
-  end
+      @footer = []
 
-  def print_headings()
-    @headings_printed = true
-    @out.print " "*@left_margin
+      @headings_printed = false
+      @count = 0
 
-    @column_widths.each_with_index do |column, i|
-      justify = column[:justify] || :left
-      title = (column[:title] || column[:key].to_s.capitalize).strip
-      @out.print format(column[:size], title, false, justify)
-      @out.print " " if i < @column_widths.size-1
+      calc_column_widths
+      Signal.trap('SIGWINCH', proc { calc_column_widths })
     end
-    @out.print "\n"
 
-    @out.print " " * @left_margin
-    @out.print "-" * @working_width
-    @out.print "\n"
-  end
+    def print_header()
+      @out.print " " * @left_margin
+      @out.print "=" * @working_width
+      @out.print "\n"
 
-  def add_footer(line)
-    lines = line.split("\n")
-    lines.each do |l|
-      @footer_lines << l.strip unless l.nil? or l.uncolorize.strip == ""
+      if not @title.nil? and @title.length <= @working_width
+        @out.print " "*@left_margin
+        left_side = (@working_width - @title.uncolorize.length)/2
+        right_side = (@working_width - @title.uncolorize.length) - left_side
+        @out.print " "*left_side
+        @out.print @title
+        @out.print " "*right_side
+        @out.print "\n"
+      end
     end
-  end
 
-  def print_footer()
-    should_print_footer = @footer_lines.length > 0 && @footer_lines.any? { |l| l.uncolorize.length <= @working_width }
+    def print_headings()
+      @headings_printed = true
+      @out.print " "*@left_margin
+
+      @column_widths.each_with_index do |column, i|
+        justify = column[:justify] || :left
+        title = (column[:title] || column[:key].to_s.capitalize).strip
+        @out.print format(column[:size], title, false, justify)
+        @out.print " " if i < @column_widths.size-1
+      end
+      @out.print "\n"
 
-    if should_print_footer
       @out.print " " * @left_margin
       @out.print "-" * @working_width
       @out.print "\n"
     end
 
-    @footer_lines.each do |line|
-      if line.uncolorize.length <= @working_width
-        @out.print " " * @left_margin
-        @out.print " " * (@working_width - line.uncolorize.length)
-        @out.print line
-        @out.print "\n"
+    def print_footer()
+      footer_lines = []
+      @footer.each do |line|
+        lines = line.split("\n")
+        lines.each do |l|
+          footer_lines << l.strip unless l.nil? or l.uncolorize.strip == ""
+        end
       end
-    end
 
-    @out.print " " * @left_margin
-    @out.print "=" * @working_width
-    @out.print "\n"
-  end
+      should_print_footer = footer_lines.length > 0 && footer_lines.any? { |l| l.uncolorize.length <= @working_width }
 
-  def print_plain(to_print)
-    @out.print " "*@left_margin
-
-    if to_print.is_a? String
-      @out.print format(@working_width, normalize(to_print))
-    elsif to_print.is_a? Hash
-      color = to_print[:color] || :default
-      background = to_print[:background] || :default
-      text = normalize(to_print[:text]) || ""
-      ellipsize = to_print[:ellipsize] || false
-      justify = to_print[:justify] || :left
-      mode = to_print[:mode] || :default
-
-      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)
+      if should_print_footer
+        @out.print " " * @left_margin
+        @out.print "-" * @working_width
+        @out.print "\n"
       end
-      @out.print formatted
-    end
-
-    @out.print "\n"
-  end
-
-  def <<(options)
-    print(options)
-  end
 
-  def print(options)
-    print_headings unless @headings_printed
-    
-    if options.is_a? Array #If an array or something is supplied, infer the order from the heading order
-      munged_options = {}
-      options.each_with_index do |element, i|
-        munged_options[@original_column_layout[i][:key]] = element
+      footer_lines.each do |line|
+        if line.uncolorize.length <= @working_width
+          @out.print " " * @left_margin
+          @out.print " " * (@working_width - line.uncolorize.length)
+          @out.print line
+          @out.print "\n"
+        end
       end
 
-      options = munged_options
+      @out.print " " * @left_margin
+      @out.print "=" * @working_width
+      @out.print "\n"
     end
 
-    @out.print " "*@left_margin
-    #column order is set, so go through each column and look up values in the incoming options
-    @column_widths.each_with_index do |column, i|
-      to_print = options[column[:key]] || ""
-      justify = column[:justify] || :left
-      if to_print.is_a? String
-        @out.print format(column[:size], normalize(to_print), false, justify)
-      elsif to_print.is_a? Hash
-        color = to_print[:color] || :default
-        background = to_print[:background] || :default
-        text = normalize(to_print[:text]) || ""
-        ellipsize = to_print[:ellipsize] || false
-        highlight = to_print[:highlight]
-        justify = to_print[:justify] || justify #can override
-        mode = to_print[:mode] || :default
+    def print(options)
 
-        formatted=format(column[:size], text, ellipsize, justify)
+      if (options.is_a? String)
+        print_plain(options)
+        return
+      end
 
-        if color != :default
-          formatted = formatted.colorize(color)
-        end
+      print_headings unless @headings_printed
 
-        if background != :default
-          formatted = formatted.colorize(:background=>background)
+      if options.is_a? Array #If an array or something is supplied, infer the order from the heading order
+        munged_options = {}
+        options.each_with_index do |element, i|
+          munged_options[@original_column_layout[i][:key]] = element
         end
 
-        if mode != :default
-          formatted = formatted.colorize(:mode=>mode)
+        options = munged_options
+      end
+
+      @out.print " "*@left_margin
+      #column order is set, so go through each column and look up values in the incoming options
+      @column_widths.each_with_index do |column, i|
+        to_print = options[column[:key]] || ""
+        justify = column[:justify] || :left
+        if to_print.is_a? String
+          @out.print format(column[:size], normalize(to_print), false, justify)
+        elsif to_print.is_a? Hash
+          color = to_print[:color] || :default
+          background = to_print[:background] || :default
+          text = normalize(to_print[:text]) || ""
+          ellipsize = to_print[:ellipsize] || false
+          highlight = to_print[:highlight]
+          justify = to_print[:justify] || justify #can override
+          mode = to_print[:mode] || :default
+
+          formatted=format(column[:size], text, ellipsize, justify)
+
+          if color != :default
+            formatted = formatted.colorize(color)
+          end
+
+          if background != :default
+            formatted = formatted.colorize(:background => background)
+          end
+
+          if mode != :default
+            formatted = formatted.colorize(:mode => mode)
+          end
+
+          unless highlight.nil?
+            highlight_regex = to_print[:highlight][:regex] || /wontbefoundbecauseit'sgobbledygookblahblahblahbah/
+            highlight_color = to_print[:highlight][:color] || :blue
+            highlight_background = to_print[:highlight][:background] || :default
+
+            formatted = formatted.gsub(highlight_regex, '\0'.colorize(:color => highlight_color, :background => highlight_background))
+          end
+
+          @out.print formatted
+        else
+          @out.print format(column[:size], normalize(to_print.to_s))
         end
 
-        unless highlight.nil?
-          highlight_regex = to_print[:highlight][:regex] || /wontbefoundbecauseit'sgobbledygookblahblahblahbah/
-          highlight_color = to_print[:highlight][:color] || :blue
-          highlight_background = to_print[:highlight][:background] || :default
+        @out.print " " if i < @column_widths.size-1
+      end
+      @out.print "\n"
 
-          formatted = formatted.gsub(highlight_regex, '\0'.colorize(:color => highlight_color, :background => highlight_background))
-        end
+      @count = @count + 1
+    end
 
-        @out.print formatted
+    def normalize(string)
+      if string.nil?
+        nil
       else
-        @out.print format(column[:size], normalize(to_print.to_s))
+        string.to_s.gsub(/\s+/, " ").strip #Primarily to remove any tabs or newlines
       end
-
-      @out.print " " if i < @column_widths.size-1
     end
-    @out.print "\n"
 
-    @count = @count + 1
-  end
+    def calc_column_widths()
+      @column_widths = []
 
-  private
-  def normalize(string)
-    if string.nil?
-      nil
-    else
-      string.to_s.gsub(/\s+/, " ").strip #Primarily to remove any tabs or newlines
-    end
-  end
+      total_width = @set_width
+      begin
+        total_width = TermInfo.screen_columns
+      rescue => ex
+        total_width = ENV["COLUMNS"].to_i || 79
+      end if total_width.nil?
 
-  def calc_column_widths()
-    @column_widths = []
+      keys = @original_column_layout.reject { |d| d[:key].nil? }.collect { |d| d[:key] }.uniq
+      if keys.length < @original_column_layout.length
+        raise("ConsoleTable configuration invalid, same key defined more than once")
+      end
 
-    total_width = @set_width
-    begin
-      total_width = TermInfo.screen_columns
-    rescue => ex
-      total_width = ENV["COLUMNS"].to_i || 79
-    end if total_width.nil?
+      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
+      available = total_width - used_up - @left_margin - @right_margin - num_spacers
 
-    keys = @original_column_layout.reject{|d| d[:key].nil?}.collect { |d| d[:key] }.uniq
-    if keys.length < @original_column_layout.length
-      raise("ConsoleTable configuration invalid, same key defined more than once")
-    end
+      if available <= 0
+        raise("ConsoleTable configuration invalid, current window is too small to display required sizes")
+      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
-    available = total_width - used_up - @left_margin - @right_margin - num_spacers
+      percentages = @original_column_layout.collect { |x| x[:size] }.find_all { |x| x.is_a? Float }
+      percent_used = percentages.inject(:+) || 0
 
-    if available <= 0
-      raise("ConsoleTable configuration invalid, current window is too small to display required sizes")
-    end
+      if percent_used > 1.0
+        raise("ConsoleTable configuration invalid, percentages total value greater than 100%")
+      end
 
-    percentages = @original_column_layout.collect { |x| x[:size] }.find_all { |x| x.is_a? Float }
-    percent_used = percentages.inject(:+) || 0
+      percent_available = 1 - percent_used
+      stars = @original_column_layout.collect { |x| x[:size] or x[:size].nil? }.find_all { |x| x.is_a? String }
+      num_stars = [stars.length, 1].max
+      percent_for_stars = percent_available.to_f / num_stars
+
+      @original_column_layout.each do |column_config|
+        if column_config[:size].is_a? Integer
+          @column_widths << column_config #As-is when integer
+        elsif column_config[:size].is_a? Float
+          @column_widths << column_config.merge({:size => (column_config[:size]*available).floor})
+        elsif column_config[:size].nil? or column_config[:size].is_a?(String) && column_config[:size] == "*"
+          @column_widths << column_config.merge({:size => (percent_for_stars*available).floor})
+        else
+          raise("ConsoleTable configuration invalid, '#{column_config[:size]}' is not a valid size")
+        end
+      end
 
-    if percent_used > 1.0
-      raise("ConsoleTable configuration invalid, percentages total value greater than 100%")
+      @working_width = (@column_widths.inject(0) { |res, c| res+c[:size] }) + @column_widths.length - 1
     end
 
-    percent_available = 1 - percent_used
-    stars = @original_column_layout.collect { |x| x[:size] or x[:size].nil?}.find_all { |x| x.is_a? String }
-    num_stars = [stars.length, 1].max
-    percent_for_stars = percent_available.to_f / num_stars
-
-    @original_column_layout.each do |column_config|
-      if column_config[:size].is_a? Integer
-        @column_widths << column_config #As-is when integer
-      elsif column_config[:size].is_a? Float
-        @column_widths << column_config.merge({:size => (column_config[:size]*available).floor})
-      elsif column_config[:size].nil? or column_config[:size].is_a?(String) && column_config[:size] == "*"
-        @column_widths << column_config.merge({:size => (percent_for_stars*available).floor})
+    def format(length, text, ellipsize=false, justify=:left)
+      if text.length > length
+        if ellipsize
+          text[0, length-3] + '...'
+        else
+          text[0, length]
+        end
       else
-        raise("ConsoleTable configuration invalid, '#{column_config[:size]}' is not a valid size")
+        if justify == :right
+          (" "*(length-text.length)) + text
+        elsif justify == :center
+          space = length-text.length
+          left_side = space/2
+          right_side = space - left_side
+          (" " * left_side) + text + (" "*right_side)
+        else #assume left
+          text + (" "*(length-text.length))
+        end
       end
     end
 
-    @working_width = (@column_widths.inject(0) { |res, c| res+c[:size] }) + @column_widths.length - 1
-  end
+    def print_plain(to_print)
+      @out.print " "*@left_margin
 
-  def format(length, text, ellipsize=false, justify=:left)
-    if text.length > length
-      if ellipsize
-        text[0, length-3] + '...'
-      else
-        text[0, length]
-      end
-    else
-      if justify == :right
-        (" "*(length-text.length)) + text
-      elsif justify == :center
-        space = length-text.length
-        left_side = space/2
-        right_side = space - left_side
-        (" " * left_side) + text + (" "*right_side)
-      else #assume left
-        text + (" "*(length-text.length))
+      if to_print.is_a? String
+        @out.print format(@working_width, normalize(to_print))
+      elsif to_print.is_a? Hash
+        color = to_print[:color] || :default
+        background = to_print[:background] || :default
+        text = normalize(to_print[:text]) || ""
+        ellipsize = to_print[:ellipsize] || false
+        justify = to_print[:justify] || :left
+        mode = to_print[:mode] || :default
+
+        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
+
+      @out.print "\n"
     end
   end
 end

data/test/test_console_table.rb

@@ -18,15 +18,15 @@ class ConsoleTableTest < Minitest::Test
     ]
 
     ConsoleTable.define(table_config, :width=> 100, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "Row 1, Column 1",
-                      :col2 => "Row 1, Column 2"
-                  })
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2"
+      }
 
-      table.print({
-                      :col1 => "Row 2, Column 1",
-                      :col2 => "Row 2, Column 1"
-                  })
+      table << {
+          :col1 => "Row 2, Column 1",
+          :col2 => "Row 2, Column 1"
+      }
     end
 
 #2345678901234567890##2345678901234567890
@@ -109,15 +109,12 @@ Row 1, Column 1      Row 1, Column 2
     ]
 
     ConsoleTable.define(table_config, :width=> 100, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "Row 1, Column 1",
-                      :col2 => "Row 1, Column 2"
-                  })
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2"
+      }
 
-      table.print({
-                      :col1 => "Row 2, Column 1",
-                      :col2 => "Row 2, Column 1"
-                  })
+      table << ["Row 2, Column 1", "Row 2, Column 1"]
     end
 
     expected=<<-END
@@ -139,15 +136,15 @@ Row 2, Column 1               Row 2, Column 1
     ]
 
     ConsoleTable.define(table_config, :width=> 100, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "Row 1, Column 1",
-                      :col2 => "Row 1, Column 2"
-                  })
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2"
+      }
 
-      table.print({
-                      :col1 => "Row 2, Column 1",
-                      :col2 => "Row 2, Column 1"
-                  })
+      table << {
+          :col1 => "Row 2, Column 1",
+          :col2 => "Row 2, Column 1"
+      }
     end
 
     expected=<<-END
@@ -170,17 +167,17 @@ Row 2, Column 1      Row 2, Column 1
     ]
 
     ConsoleTable.define(table_config, :width=> 100, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "Row 1, Column 1",
-                      :col2 => "Row 1, Column 2",
-                      :col3 => "Row 1, Column 3"
-                  })
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2",
+          :col3 => "Row 1, Column 3"
+      }
 
-      table.print({
-                      :col1 => "Row 2, Column 1",
-                      :col2 => "Row 2, Column 1",
-                      :col3 => "Row 2, Column 3"
-                  })
+      table << {
+          :col1 => "Row 2, Column 1",
+          :col2 => "Row 2, Column 1",
+          :col3 => "Row 2, Column 3"
+      }
     end
 
     expected=<<-END
@@ -202,10 +199,10 @@ Row 2, Column 1      Row 2, Column 1                         Row 2, Column 3
     ]
 
     ConsoleTable.define(table_config, :width=> 40, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "Row 1, Column 1",
-                      :col2 => "Row 1, Column 2",
-                  })
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2",
+      }
 
     end
 
@@ -227,10 +224,10 @@ Row 1, Column 1                         Row 1, Column 2
     ]
 
     ConsoleTable.define(table_config, :width=> 40, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "Row 1, Column 1",
-                      :col2 => "Row 1, Column 2",
-                  })
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2",
+      }
 
     end
 
@@ -257,25 +254,25 @@ Row 1, Column 1                         Row 1, Column 2
     ]
 
     ConsoleTable.define(table_config, :width=> 160, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "Row 1, Column 1",
-                      :col2 => "Row 1, Column 2",
-                      :col3 => "Row 1, Column 3",
-                      :col4 => "Row 1, Column 4",
-                      :col5 => "Row 1, Column 5",
-                      :col6 => "Row 1, Column 6",
-                      :col7 => "Row 1, Column 7",
-                  })
-
-      table.print({
-                      :col1 => "Row 2, Column 1",
-                      :col2 => "Row 2, Column 2",
-                      :col3 => "Row 2, Column 3",
-                      :col4 => "Row 2, Column 4",
-                      :col5 => "Row 2, Column 5",
-                      :col6 => "Row 2, Column 6",
-                      :col7 => "Row 2, Column 7",
-                  })
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2",
+          :col3 => "Row 1, Column 3",
+          :col4 => "Row 1, Column 4",
+          :col5 => "Row 1, Column 5",
+          :col6 => "Row 1, Column 6",
+          :col7 => "Row 1, Column 7",
+      }
+
+      table << {
+          :col1 => "Row 2, Column 1",
+          :col2 => "Row 2, Column 2",
+          :col3 => "Row 2, Column 3",
+          :col4 => "Row 2, Column 4",
+          :col5 => "Row 2, Column 5",
+          :col6 => "Row 2, Column 6",
+          :col7 => "Row 2, Column 7",
+      }
     end
 
     expected=<<-END
@@ -341,17 +338,14 @@ Row 2, Column 1      Row 2, Column 2                      Row  Row 2, Column 4
     ]
 
     ConsoleTable.define(table_config, :width=> 100, :output=>@mock_out) do |table|
-      table.print({
-                      :col1 => "This is short"
-                  })
+      table << ["This is short"]
 
-      table.print({
-                      :col1 => "This is way too long and it needs to get cut off"
-                  })
+      table << {:col1=>"This is way too long and it needs to get cut off"}
+
+      table << [
+          {:text=>"This is way too long and it needs to get cut off", :ellipsize=>true}
+      ]
 
-      table.print({
-                      :col1 => {:text=>"This is way too long and it needs to get cut off", :ellipsize=>true}
-                  })
     end
 
     expected=<<-END
@@ -375,23 +369,23 @@ This is way too l...
     ]
 
     ConsoleTable.define(table_config, :width=> 100, :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}
-                  })
+      table << {
+        :col1 => "Short1",
+        :col2 => "Short2",
+        :col3 => "Short3"
+      }
+
+      table << {
+        :col1 => {text: "Short1"},
+        :col2 => {text: "Short2"},
+        :col3 => {text: "Short3"}
+      }
+
+      table << {
+          :col1 => {text: "Short1", :justify=>:center},
+          :col2 => {text: "Short2", :justify=>:right},
+          :col3 => {text: "Short3", :justify=>:left}
+      }
     end
 
     expected=<<-END
@@ -417,19 +411,19 @@ Short1                      Short2                      Short3
     ]
 
     ConsoleTable.define(table_config, :left_margin=>5, :right_margin=>10, :width=>80, :title=>"Movie Killers", :output=>@mock_out) do |table|
-      table.print({
-                      :title=>{:text=>"Friday the 13th"},
-                      :name=>{:text=>"Jason's Mom", :justify=>:left},
-                      :release_date=>{text: "05-09-80"},
-                      :tagline=>{:text=>"They were warned...They are doomed...And on Friday the 13th, nothing will save them.", :ellipsize=>true}
-                  })
-
-      table.print({
-                      :title=>{:text=>"Halloween"},
-                      :name=>{:text=>"Michael Meyers", :justify=>:left},
-                      :release_date=>{text: "10-25-80"},
-                      :tagline=>{:text=>"Everyone is entitled to one good scare", :ellipsize=>true}
-                  })
+      table << {
+          :title=>{:text=>"Friday the 13th"},
+          :name=>{:text=>"Jason's Mom", :justify=>:left},
+          :release_date=>{text: "05-09-80"},
+          :tagline=>{:text=>"They were warned...They are doomed...And on Friday the 13th, nothing will save them.", :ellipsize=>true}
+      }
+
+      table << {
+          :title=>{:text=>"Halloween"},
+          :name=>{:text=>"Michael Meyers", :justify=>:left},
+          :release_date=>{text: "10-25-80"},
+          :tagline=>{:text=>"Everyone is entitled to one good scare", :ellipsize=>true}
+      }
 
       table << {
           :title=>{:text=>"Nightmare on Elm St."},
@@ -440,8 +434,8 @@ Short1                      Short2                      Short3
 
       table << ["Hellraiser", "Pinhead", "9-18-87", "Demon to some. Angel to others."]
 
-      table.add_footer("This is just a line of footer text")
-      table.add_footer("This is a second footer with \nlots of \nlinebreaks in it.")
+      table.footer << "This is just a line of footer text"
+      table.footer << "This is a second footer with \nlots of \nlinebreaks in it."
     end
 
     expected=<<-END
@@ -464,6 +458,29 @@ Short1                      Short2                      Short3
     assert_output_equal expected, @mock_out.string
   end
 
+  def test_printing_a_single_string_does_full_line
+    table_config = [
+        {:key=>:col1, :size=>20, :title=>"Column 1"},
+        {:key=>:col2, :size=>20, :title=>"Column 2"},
+    ]
+
+    ConsoleTable.define(table_config, :width=> 100, :output=>@mock_out) do |table|
+      table << "This is just a string, it should ignore columns"
+    end
+
+    expected=<<-END
+=========================================
+Column 1             Column 2
+-----------------------------------------
+This is just a string, it should ignore c
+=========================================
+    END
+
+    puts @mock_out.string
+
+    assert_output_equal expected, @mock_out.string
+  end
+
   private
   def assert_output_equal(expected, actual)
     expected_lines = expected.split("\n")

data/todo.txt

@@ -1,2 +1,3 @@
 :border=>true on options, uses | instead of " " to space and adds 2 to the spacer count. prepends if true
-perhaps :border=>:thin, :thick, thin does above, thick also adds a row of --'s between, or even smartly uses +'s for joins
+perhaps :border=>:thin, :thick, thin does above, thick also adds a row of --'s between, or even smartly uses +'s for joins
+note the dangerousness of this with the current impl - Total width available is always the screen width, so if you make a table with 2 20 char columns and set a border, where does the final | go? it should go at the end of the 40ish character, but it'd go at the end of the line I think. might not even want to bite this off

metadata

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