Merge lp:~noskcaj/ubuntu/trusty/ruby-terminal-table/1.4.5 into lp:ubuntu/trusty/ruby-terminal-table

[Jackson Doak]

New upstream release, update packaging

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

7. By Jackson Doak on 2013-12-12

Use DEP5 copyright format

6. By Jackson Doak on 2013-12-12

Bump standards-version to 3.9.5

5. By Jackson Doak on 2013-12-12

Bump debhelper to 9

4. By Jackson Doak on 2013-12-12

* debian/control:
  - Drop DM-Upload-Allowed field

3. By Jackson Doak on 2013-12-12

New upstream release.

=== modified file 'History.rdoc'
--- History.rdoc	2011-06-17 13:38:26 +0000
+++ History.rdoc	2013-12-12 07:49:48 +0000
@@ -1,9 +1,19 @@
+1.4.5 / 2012-3-15
+==================
+
+  * Add color support.
+  * Various bugfixes
+
+1.4.3 / 2011-10-13
+==================
+
+  * Optimize for faster table output.
 
 1.4.2 / 2010-01-14
 ==================
 
   * Fixed some bugs with colspan
-  
+
 === 1.4.1 / 2009-12-18
 
 * Fix column alignment with separators.

=== modified file 'README.rdoc'
--- README.rdoc	2011-06-17 13:38:26 +0000
+++ README.rdoc	2013-12-12 07:49:48 +0000
@@ -1,138 +1,220 @@
-
 = Terminal Table
 
-Simple, feature rich ASCII table generator.
-
-== Installation:
-
-  Install [Gemcutter](http://gemcutter.org) then execute:
-  $ sudo gem install terminal-table
-
-== Features:
-
-* Fast
-* Simple
-* Optional headings
-* Alignment of columns, headings, or cells
-* Supports column span
-* Easy modification of table strings (+, -, |)
-
-== Examples:
-
-  require 'rubygems'
-  require 'terminal-table/import'
-   
-  puts table(['a', 'b'], [1, 2], [3, 4], :separator, [4, 6])
-   
-  t = table ['a', 'b']
-  t << [1, 2]
-  t << [3, 4]
-  t.add_separator
-  t << [4, 6]
-  puts t
-   
-  user_table = table do |t|
-    t.headings = 'First Name', 'Last Name', 'Email'
-    t << ['TJ',  'Holowaychuk', '[e-mail]']
-    t << ['Bob', 'Someone',     '[e-mail]']
-    t << ['Joe', 'Whatever',    '[e-mail]']
-  end
-  puts user_table
-   
-  user_table = table do
-    self.headings = 'First Name', 'Last Name', 'Email'
-    add_row ['TJ',  'Holowaychuk', { :value => '[e-mail]', :alignment => :right }]
-    add_row ['Bob', 'Someone',     '[e-mail]']
-    add_row ['Joe', 'Whatever',    '[e-mail]']
-    align_column 1, :center
-  end
-  puts user_table
-
-  puts
-  user_table = table do
-    self.headings = ['First Name', 'Last Name', {:value => 'Phones', :colspan => 2, :alignment => :center}]
-    add_row ['Bob', 'Someone',     '123', '456']
-    add_row ['TJ',  'Holowaychuk', {:value => "No phones", :colspan => 2, :alignment => :center}]
-    add_row ['Joe', 'Whatever',    '4324', '343242']
-  end
-  puts user_table
-   
-  rows = []
-  rows << ['Lines',      100]
-  rows << ['Comments',   20]
-  rows << ['Ruby',       70]
-  rows << ['JavaScript', 30]
-  puts table([nil, 'Lines'], *rows)
-   
-  rows = []
-  rows << ['Lines',      100]
-  rows << ['Comments',   20]
-  rows << ['Ruby',       70]
-  rows << ['JavaScript', 30]
-  puts table(nil, *rows)
-
-== Results:
-
-  +---+---+
-  | a | b |
-  +---+---+
-  | 1 | 2 |
-  | 3 | 4 |
-  +---+---+
-  | 4 | 6 |
-  +---+---+
-
-   
-  +---+---+
-  | a | b |
-  +---+---+
-  | 1 | 2 |
-  | 3 | 4 |
-  +---+---+
-  | 4 | 6 |
-  +---+---+
-   
-  +------------+-------------+---------------------+
-  | First Name | Last Name   | Email               |
-  +------------+-------------+---------------------+
-  | TJ         | Holowaychuk | [e-mail]  |
-  | Bob        | Someone     | [e-mail] |
-  | Joe        | Whatever    | [e-mail] |
-  +------------+-------------+---------------------+
-   
-  +------------+-----------------------------+---------------------+
-  | First Name | Last Name                   | Email               |
-  +------------+-----------------------------+---------------------+
-  | TJ         |         Holowaychuk         |  [e-mail] |
-  | Bob        |           Someone           | [e-mail] |
-  | Joe        |          Whatever           | [e-mail] |
-  +------------+-----------------------------+---------------------+
-
-  +------------+-------------+-----------+--------+
-  | First Name | Last Name   |       Phones       |
-  +------------+-------------+-----------+--------+
-  | Bob        | Someone     | 123       | 456    |
-  | TJ         | Holowaychuk |     No phones      |
-  | Joe        | Whatever    | 4324      | 343242 |
-  +------------+-------------+-----------+--------+
-
-  +------------+-------+
-  |            | Lines |
-  +------------+-------+
-  | Lines      | 100   |
-  | Comments   | 20    |
-  | Ruby       | 70    |
-  | JavaScript | 30    |
-  +------------+-------+
-
-  +------------+-----+
-  | Lines      | 100 |
-  | Comments   | 20  |
-  | Ruby       | 70  |
-  | JavaScript | 30  |
-  +------------+-----+
-
-== License:
+== Description
+
+Terminal Table is a fast and simple, yet feature rich ASCII table generator written in Ruby.
+
+== Installation
+
+Install http://gemcutter.org and execute:
+  
+  $ gem install terminal-table
+
+== Usage
+
+=== Basics
+
+To use Terminal Table:
+
+  require 'terminal-table'
+
+To generate a table, provide an array of arrays (which are interpreted as rows):
+
+  rows = []
+  rows << ['One', 1]
+  rows << ['Two', 2]
+  rows << ['Three', 3]
+  table = Terminal::Table.new :rows => rows
+  
+  # > puts table
+  #
+  # +-------+---+
+  # | One   | 1 |
+  # | Two   | 2 |
+  # | Three | 3 |
+  # +-------+---+
+
+
+The constructor can also be given a block which is either yielded the Table object or instance evaluated:
+
+  table = Terminal::Table.new do |t|
+    t.rows = rows
+  end
+
+  table = Terminal::Table.new do
+    self.rows = rows
+  end
+
+Adding rows one by one:
+
+  table = Terminal::Table.new do |t|
+    t << ['One', 1]
+    t.add_row ['Two', 2]
+  end
+
+To add separators between rows:
+  
+  table = Terminal::Table.new do |t|
+    t << ['One', 1]
+    t << :separator
+    t.add_row ['Two', 2]
+    t.add_separator
+    t.add_row ['Three', 3]
+  end
+  
+  # > puts table
+  #
+  # +-------+---+
+  # | One   | 1 |
+  # +-------+---+
+  # | Two   | 2 |
+  # +-------+---+
+  # | Three | 3 |
+  # +-------+---+
+
+Cells can handle multiline content:
+  
+  table = Terminal::Table.new do |t|
+    t << ['One', 1]
+    t << :separator
+    t.add_row ["Two\nDouble", 2]
+    t.add_separator
+    t.add_row ['Three', 3]
+  end
+  
+  # > puts table
+  #
+  # +--------+---+
+  # | One    | 1 |
+  # +--------+---+
+  # | Two    | 2 |
+  # | Double |   |
+  # +--------+---+
+  # | Three  | 3 |
+  # +--------+---+
+
+=== Head
+
+To add a head to the table:
+
+  table = Terminal::Table.new :headings => ['Word', 'Number'], :rows => rows
+  
+  # > puts table
+  #
+  # +-------+--------+
+  # | Word  | Number |
+  # +-------+--------+
+  # | One   | 1      |
+  # | Two   | 2      |
+  # | Three | 3      |
+  # +-------+--------+
+
+=== Title
+
+To add a title to the table:
+
+  table = Terminal::Table.new :title => "Cheatsheet", :headings => ['Word', 'Number'], :rows => rows
+  
+  # > puts table
+  #
+  # +------------+--------+
+  # |     Cheatsheet      |
+  # +------------+--------+
+  # | Word       | Number |
+  # +------------+--------+
+  # | One        | 1      |
+  # | Two        | 2      |
+  # | Three      | 3      |
+  # +------------+--------+
+
+=== Alignment
+
+To align the second column to the right:
+
+  table.align_column(1, :right)
+  
+  # > puts table
+  #
+  # +-------+--------+
+  # | Word  | Number |
+  # +-------+--------+
+  # | One   |      1 |
+  # | Two   |      2 |
+  # | Three |      3 |
+  # +-------+--------+
+
+To align an individual cell, you specify the cell value in a hash along the alignment:
+
+  table << ["Four", {:value => 4.0, :alignment => :center}]
+  
+  # > puts table
+  #
+  # +-------+--------+
+  # | Word  | Number |
+  # +-------+--------+
+  # | One   |      1 |
+  # | Two   |      2 |
+  # | Three |      3 |
+  # | Four  |  4.0   |
+  # +-------+--------+
+  
+=== Style
+
+To specifify style options:
+  
+  table = Terminal::Table.new :headings => ['Word', 'Number'], :rows => rows, :style => {:width => 80}
+  
+  # > puts table
+  #
+  # +--------------------------------------+---------------------------------------+
+  # | Word                                 | Number                                |
+  # +--------------------------------------+---------------------------------------+
+  # | One                                  | 1                                     |
+  # | Two                                  | 2                                     |
+  # | Three                                | 3                                     |
+  # +--------------------------------------+---------------------------------------+
+
+And change styles on the fly:
+  
+  table.style = {:width => 40, :padding_left => 3, :border_x => "=", :border_i => "x"}
+  
+  # > puts table
+  #
+  # x====================x=================x
+  # |               Cheatsheet             |
+  # x====================x=================x
+  # |   Word             |   Number        |
+  # x====================x=================x
+  # |   One              |   1             |
+  # |   Two              |   2             |
+  # |   Three            |   3             |
+  # x====================x=================x
+  
+To change the default style options:
+
+  Terminal::Style.defaults = {:width => 80}
+
+All Table objects created afterwards will inherit these defaults.
+
+=== Constructor options and setter methods
+
+Valid options for the constructor are :rows, :headings, :style and :title - and all options can also be set on the created table object by their setter method:
+
+  table = Terminal::Table.new
+  table.title = "Cheatsheet"
+  table.headings = ['Word', 'Number']
+  table.rows = rows
+  table.style = {:width => 40}
+
+== More examples
+
+For more examples, please see the examples/examples.rb file included in the source distribution.
+
+== Author
+
+TJ Holowaychuk <[e-mail]>
+
+== License
 
 (The MIT License)
 

=== modified file 'Todo.rdoc'
--- Todo.rdoc	2011-06-17 13:38:26 +0000
+++ Todo.rdoc	2013-12-12 07:49:48 +0000
@@ -6,7 +6,6 @@
 == Minor:
 
 * Programmatically add separator rows
-* Arbitrary dimensions
 * Add multi-column sorting
 * Change; pre-create Cell and Heading objects to clean up Table a bit
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-17 13:38:26 +0000
+++ debian/changelog	2013-12-12 07:49:48 +0000
@@ -1,3 +1,14 @@
+ruby-terminal-table (1.4.5-0ubuntu1) trusty; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Drop DM-Upload-Allowed field
+    - Bump debhelper to 9
+    - Bump standards-version to 3.9.5
+  * Use DEP5 copyright format
+
+ -- Jackson Doak <[e-mail]>  Thu, 12 Dec 2013 17:59:06 +1100
+
 ruby-terminal-table (1.4.2-0ubuntu3) oneiric; urgency=low
 
   * Updated Maintainer field

=== modified file 'debian/compat'
--- debian/compat	2011-06-17 13:38:26 +0000
+++ debian/compat	2013-12-12 07:49:48 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2011-06-17 13:38:26 +0000
+++ debian/control	2013-12-12 07:49:48 +0000
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Brian Thomason <[e-mail]>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.3)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), gem2deb (>= 0.2.3)
+Standards-Version: 3.9.5
 Homepage: http://github.com/visionmedia/terminal-table
 XS-Ruby-Versions: all
 

=== modified file 'debian/copyright'
--- debian/copyright	2011-06-17 13:38:26 +0000
+++ debian/copyright	2013-12-12 07:49:48 +0000
@@ -1,6 +1,6 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: terminal-table
-Source: http://rubygems.org/downloads/terminal-table-1.4.2.gem
+Source: http://rubygems.org/downloads/terminal-table-1.4.5.gem
 
 Files: *
 Copyright: Copyright (c) 2008-2009 TJ Holowaychuk <[e-mail]>

=== modified file 'examples/examples.rb'
--- examples/examples.rb	2011-06-17 13:38:26 +0000
+++ examples/examples.rb	2013-12-12 07:49:48 +0000
@@ -1,4 +1,3 @@
-
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'terminal-table/import'
 
@@ -7,6 +6,7 @@
 
 puts
 t = table ['a', 'b']
+t.style = {:padding_left => 2, :width => 80}
 t << [1, 2]
 t << [3, 4]
 t << :separator
@@ -14,11 +14,22 @@
 puts t
 
 puts
-user_table = table do |t|
-  t.headings = 'First Name', 'Last Name', 'Email'
-  t << %w( TJ Holowaychuk [e-mail] )
-  t << %w( Bob Someone [e-mail] )
-  t << %w( Joe Whatever [e-mail] )
+user_table = table do |v|
+  v.title = "Contact Information"
+  v.headings = 'First Name', 'Last Name', 'Email'
+  v << %w( TJ Holowaychuk [e-mail] )
+  v << %w( Bob Someone [e-mail] )
+  v << %w( Joe Whatever [e-mail] )
+end
+puts user_table
+
+puts
+user_table = table do |v|
+  v.style.width = 80
+  v.headings = 'First Name', 'Last Name', 'Email'
+  v << %w( TJ Holowaychuk [e-mail] )
+  v << %w( Bob Someone [e-mail] )
+  v << %w( Joe Whatever [e-mail] )
 end
 puts user_table
 
@@ -38,7 +49,9 @@
 user_table = table do
   self.headings = ['First Name', 'Last Name', {:value => 'Phones', :colspan => 2, :alignment => :center}]
   add_row ['Bob', 'Someone',     '123', '456']
-  add_row ['TJ',  'Holowaychuk', {:value => "No phones", :colspan => 2, :alignment => :center}]
+  add_row :separator
+  add_row ['TJ',  'Holowaychuk', {:value => "No phones\navaiable", :colspan => 2, :alignment => :center}]
+  add_row :separator
   add_row ['Joe', 'Whatever',    '4324', '343242']
 end
 puts user_table

=== modified file 'lib/terminal-table.rb'
--- lib/terminal-table.rb	2011-06-17 13:38:26 +0000
+++ lib/terminal-table.rb	2013-12-12 07:49:48 +0000
@@ -22,10 +22,6 @@
 #++
 
 $:.unshift File.dirname(__FILE__)
-
-require 'terminal-table/version'
-require 'terminal-table/core_ext'
-require 'terminal-table/table'
-require 'terminal-table/cell'
-require 'terminal-table/heading'
-require 'terminal-table/table_helper'
+%w(version core_ext table cell row separator style table_helper).each do |file|
+  require "terminal-table/#{file}"
+end
\ No newline at end of file

=== modified file 'lib/terminal-table/cell.rb'
--- lib/terminal-table/cell.rb	2011-06-17 13:38:26 +0000
+++ lib/terminal-table/cell.rb	2013-12-12 07:49:48 +0000
@@ -14,40 +14,81 @@
       attr_reader :value
       
       ##
-      # Cell alignment.
-      
-      attr_reader :alignment
-      
-      ##
       # Column span.
       
       attr_reader :colspan
       
       ##
-      # Initialize with _width_ and _options_.
+      # Initialize with _options_.
       
-      def initialize width, options = nil
-        @width = width
+      def initialize options = nil
         @value, options = options, {} unless Hash === options
         @value = options.fetch :value, value
-        @alignment = options.fetch :alignment, :left
+        @alignment = options.fetch :alignment, nil
         @colspan = options.fetch :colspan, 1
+        @width = options.fetch :width, @value.to_s.size
+        @index = options.fetch :index
+        @table = options.fetch :table
+      end
+      
+      def alignment?
+        !@alignment.nil?
+      end
+      
+      def alignment
+        @alignment || :left
+      end
+      
+      def alignment=(val)
+        supported = %w(left center right)
+        if supported.include?(val.to_s)
+          @alignment = val
+        else
+          raise "Aligment must be one of: #{supported.join(' ')}"
+        end
+      end
+      
+      def lines
+        @value.to_s.split(/\n/)
       end
       
       ##
       # Render the cell.
       
-      def render
-        " #{value} ".align alignment, width + 2
+      def render(line = 0)
+        left = " " * @table.style.padding_left
+        right = " " * @table.style.padding_right
+        render_width = lines[line].to_s.size - escape(lines[line]).size + width
+        "#{left}#{lines[line]}#{right}".align(alignment, render_width + @table.cell_padding)
       end
       alias :to_s :render
       
       ##
-      # Cell length.
-      
-      def length
-        value.to_s.length + 2
+      # Returns the longest line in the cell and
+      # removes all ANSI escape sequences (e.g. color)
+      
+      def value_for_column_width_recalc
+        lines.map{ |s| escape(s) }.max_by{ |s| s.size }
+      end
+      
+      ##
+      # Returns the width of this cell
+      
+      def width
+        padding = (colspan - 1) * @table.cell_spacing
+        inner_width = (1..@colspan).to_a.inject(0) do |w, counter|
+          w + @table.column_width(@index + counter - 1)
+        end
+        inner_width + padding
+      end
+
+      ##
+      # removes all ANSI escape sequences (e.g. color)      
+      def escape(line)
+        line.to_s.gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '').
+          gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '').
+          gsub(/[\x03|\x1a]/, '')
       end
     end
   end
-end
\ No newline at end of file
+end

=== modified file 'lib/terminal-table/core_ext.rb'
--- lib/terminal-table/core_ext.rb	2011-06-17 13:38:26 +0000
+++ lib/terminal-table/core_ext.rb	2013-12-12 07:49:48 +0000
@@ -1,28 +1,8 @@
 
 class String
   def align position, length
-    send position, length
+    self.__send__ position, length
   end
   alias_method :left, :ljust
   alias_method :right, :rjust
-end
-
-module Enumerable
-  def map_with_index &block
-    vals = []
-    each_with_index { |v, i| vals << yield(v, i) } 
-    vals
-  end
-  alias :collect_with_index :map_with_index
-end
-
-class Object
-  def yield_or_eval &block
-    return unless block
-    if block.arity > 0
-      yield self
-    else
-      self.instance_eval &block
-    end
-  end
 end
\ No newline at end of file

=== removed file 'lib/terminal-table/heading.rb'
--- lib/terminal-table/heading.rb	2011-06-17 13:38:26 +0000
+++ lib/terminal-table/heading.rb	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-module Terminal
-  class Table
-    class Heading < Cell
-      def initialize width, params
-        super
-      end
-    end
-  end
-end
\ No newline at end of file

=== added file 'lib/terminal-table/row.rb'
--- lib/terminal-table/row.rb	1970-01-01 00:00:00 +0000
+++ lib/terminal-table/row.rb	2013-12-12 07:49:48 +0000
@@ -0,0 +1,48 @@
+module Terminal
+  class Table
+    class Row
+      
+      ##
+      # Row cells
+      
+      attr_reader :cells
+      
+      attr_reader :table
+      
+      ##
+      # Initialize with _width_ and _options_.
+      
+      def initialize table, array = []
+        @cell_index = 0
+        @table = table
+        @cells = []
+        array.each { |item| self << item }
+      end
+      
+      def add_cell item
+        options = item.is_a?(Hash) ? item : {:value => item}
+        cell = Cell.new(options.merge(:index => @cell_index, :table => @table))
+        @cell_index += cell.colspan
+        @cells << cell
+      end
+      alias << add_cell
+      
+      def [] index
+        cells[index]
+      end
+      
+      def height
+        cells.map { |c| c.lines.count }.max
+      end
+      
+      def render
+        y = @table.style.border_y
+        (0...height).to_a.map do |line|
+          y + cells.map do |cell|
+            cell.render(line)
+          end.join(y) + y
+        end.join("\n")
+      end
+    end
+  end
+end
\ No newline at end of file

=== added file 'lib/terminal-table/separator.rb'
--- lib/terminal-table/separator.rb	1970-01-01 00:00:00 +0000
+++ lib/terminal-table/separator.rb	2013-12-12 07:49:48 +0000
@@ -0,0 +1,14 @@
+module Terminal
+  class Table
+    class Separator < Row
+      
+      def render
+        arr_x = ([e-mail]_of_columns).to_a.map do |i|
+          @table.style.border_x * (@table.column_width(i) + @table.cell_padding) 
+        end
+        border_i = @table.style.border_i
+        border_i + arr_x.join(border_i) + border_i
+      end
+    end
+  end
+end
\ No newline at end of file

=== added file 'lib/terminal-table/style.rb'
--- lib/terminal-table/style.rb	1970-01-01 00:00:00 +0000
+++ lib/terminal-table/style.rb	2013-12-12 07:49:48 +0000
@@ -0,0 +1,61 @@
+
+module Terminal
+  class Table
+    # A Style object holds all the formatting information for a Table object
+    # 
+    # To create a table with a certain style, use either the constructor 
+    # option <tt>:style</tt>, the Table#style object or the Table#style= method
+    #
+    # All these examples have the same effect:
+    # 
+    #     # by constructor
+    #     @table = Table.new(:style => {:padding_left => 2, :width => 40})
+    #
+    #     # by object
+    #     @table.style.padding_left = 2
+    #     @table.style.width = 40
+    #
+    #     # by method
+    #     @table.style = {:padding_left => 2, :width => 40}
+    # 
+    # To set a default style for all tables created afterwards use Style.defaults=
+    # 
+    #     Terminal::Table::Style.defaults = {:width => 80}
+    #
+    class Style
+      @@defaults = {
+        :border_x => "-", :border_y => "|", :border_i => "+",
+        :padding_left => 1, :padding_right => 1,
+        :width => nil
+      }
+      
+      attr_accessor :border_x
+      attr_accessor :border_y
+      attr_accessor :border_i
+      
+      attr_accessor :padding_left
+      attr_accessor :padding_right
+      
+      attr_accessor :width
+      
+      
+      def initialize options = {}
+        apply self.class.defaults.merge(options)
+      end
+      
+      def apply options
+        options.each { |m, v| __send__ "#{m}=", v }
+      end
+      
+      class << self
+        def defaults
+          @@defaults
+        end
+        
+        def defaults= options
+          @@defaults = defaults.merge(options)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file

=== modified file 'lib/terminal-table/table.rb' (properties changed: +x to -x)
--- lib/terminal-table/table.rb	2011-06-17 13:38:26 +0000
+++ lib/terminal-table/table.rb	2013-12-12 07:49:48 +0000
@@ -2,114 +2,39 @@
 module Terminal
   class Table
     
-    #--
-    # Exceptions
-    #++
-    
-    Error = Class.new StandardError
-    
-    ##
-    # Table characters, x axis, y axis, and intersection.
-    
-    X, Y, I = '-', '|', '+'
-    
-    ##
-    # Headings array.
-    
-    attr_accessor :headings
-    
-    ##
-    # Rows array.
-    
-    attr_accessor :rows
+    attr_reader :title
+    attr_reader :headings
     
     ##
     # Generates a ASCII table with the given _options_.
   
     def initialize options = {}, &block
-      @headings = options.fetch :headings, []
-      @rows = options.fetch :rows, []
-      yield_or_eval &block if block
-    end
-    
-    ##
-    # Render the table.
-  
-    def render
-      buffer = [separator, "\n"]
-      if has_headings?
-        buffer << render_headings
-        buffer << "\n" << separator << "\n"
-      end
-      buffer << @rows.map do |row| 
-        render_row(row)
-      end.join("\n")
-      buffer << "\n" << separator << "\n"
-      buffer.join
-    end
-    alias :to_s :render
-    
-    ##
-    # Render headings.
-
-    def render_headings
-      Y + headings.map_with_index do |heading, i|
-        width = 0
-        if heading.is_a?(Hash) and !heading[:colspan].nil?
-          i.upto(i + heading[:colspan] - 1) do |col|
-            width += length_of_column(col)
-          end
-          width += (heading[:colspan] - 1) * (Y.length + 2)
-        else
-          width = length_of_column(i)
-        end
-        Heading.new( width, heading).render
-      end.join(Y) + Y
-    end
-    
-    ##
-    # Render the given _row_.
-
-    def render_row row
-      if row == :separator
-        separator
-      else
-        Y + row.map_with_index do |cell, i|
-          render_cell(cell, row_to_index(row, i))
-        end.join(Y) + Y
-      end
-    end
-    
-    ##
-    # Render the given _cell_ at index _i_.
-
-    def render_cell cell, i
-      width = 0
-      if cell.is_a?(Hash) and !cell[:colspan].nil?
-        i.upto(i + cell[:colspan] - 1) do |col|
-          width += length_of_column(col)
-        end
-        width += (cell[:colspan] - 1) * (Y.length + 2)
-      else
-        width = length_of_column(i)
-      end
-      Cell.new(width, cell).render
-    end
-    
-    ##
-    # Create a separator based on colum lengths.
-    
-    def separator
-      I + columns.collect_with_index do |col, i| 
-        X * (length_of_column(i) + 2) 
-      end.join(I) + I 
+      @column_widths = []
+      self.style = options.fetch :style, {}
+      self.headings = options.fetch :headings, []
+      self.rows = options.fetch :rows, []
+      self.title = options.fetch :title, nil
+      yield_or_eval(&block) if block
+    end
+    
+    ##
+    # Align column _n_ to the given _alignment_ of :center, :left, or :right.
+    
+    def align_column n, alignment
+      r = rows
+      column(n).each_with_index do |col, i|
+        cell = r[i][n]
+        cell.alignment = alignment unless cell.alignment?
+      end
     end
     
     ##
     # Add a row. 
     
-    def add_row row
+    def add_row array
+      row = array == :separator ? Separator.new(self) : Row.new(self, array)
       @rows << row
+      recalc_column_widths row
     end
     alias :<< :add_row
 
@@ -117,175 +42,179 @@
     # Add a separator.
 
     def add_separator
-      @rows << :separator
-    end
-
-    ##
-    # Weither or not any headings are present, since they are optional.
-    
-    def has_headings?
-      not headings.empty?
+      self << :separator
+    end
+    
+    def cell_spacing
+      cell_padding + style.border_y.length
+    end
+    
+    def cell_padding
+      style.padding_left + style.padding_right
     end
     
     ##
     # Return column _n_.
     
-    def column n
-      rows.map { |row| row[n] }.compact 
+    def column n, method = :value, array = rows
+      array.map { |row| 
+        cell = row[n]
+        cell && method ? cell.__send__(method) : cell
+      }.compact 
     end
     
     ##
     # Return _n_ column including headings.
     
-    def column_with_headings n
-      headings_with_rows.map { |row| row_with_hash(row)[n] }.compact
-    end
-
-    def row_with_hash row
-      # this method duplicates the multi-column columns in each column they are in
-      index = 0
-      row.inject [] do |columns, column|
-        if column.is_a?(Hash) && column[:colspan] && column[:colspan] > 1
-          column[:start_index] = index
-          column[:colspan].times do
-            columns << column
-            index += 1
-          end
-        else
-          columns << column
-          index += 1
-        end
-        columns
-      end
-    end
-
-    def row_to_index row, index
-      new_index = -1
-      0.upto(index) do |i|
-        column = row[i]
-        if column.is_a?(Hash) && column[:colspan] && column[:colspan] > 1 && index != i
-          new_index = new_index + column[:colspan]
-        else
-          new_index += 1
-        end
-      end
-      return new_index
+    def column_with_headings n, method = :value
+      column n, method, headings_with_rows
     end
     
     ##
     # Return columns.
     
-    def columns 
+    def columns
       (0...number_of_columns).map { |n| column n } 
     end
     
     ##
-    # Return the length of the largest cell found within column _n_.
-
-    def length_of_largest_cell_in_column n
-      column_with_headings(n).map do |cell|
-        if cell.is_a? Hash
-          if cell[:colspan] && cell[:colspan] > 1
-            if (cell[:value].to_s.length <= length_of_single_columns_where_multicolumn_is(cell[:start_index],cell[:colspan]))
-              0
-            else
-              spacing_length = (3 * (cell[:colspan] - 1))
-              length_in_columns = (cell[:value].to_s.length - spacing_length)
-              (length_in_columns.to_f / cell[:colspan]).ceil
-            end
-          else
-            cell[:value].to_s.length
-          end
-        else
-          cell.to_s.length
-        end
-      end.sort.last
-    end
-
-    ##
-    # Returns the length of the largest single column cell found within column _n_.
-
-    def length_of_largest_single_column_cell_in_column n
-      column_with_headings(n).map do |cell|
-        if cell.is_a? Hash
-          if cell[:colspan] && cell[:colspan] > 1
-            0
-          else
-            cell[:value].to_s.length
-          end
-        else
-          cell.to_s.length
-        end
-      end.sort.last
-    end
-
-    ##
-    # Returns the length of the single columns starting from _n_ and going through _length_ columns.
-
-    def length_of_single_columns_where_multicolumn_is(n,length)
-      total_length = 0
-      spacing_length = (3 * (length - 1))
-      total_length = total_length + spacing_length
-      n.upto(n + length - 1) do |i|
-        total_length = total_length + length_of_largest_single_column_cell_in_column(i)
-      end
-      return total_length
-    end
-    
-    ##
     # Return length of column _n_.
     
-    def length_of_column n
-      length_of_largest_cell_in_column n      
+    def column_width n
+      width = @column_widths[n] || 0
+      width + additional_column_widths[n].to_i
     end
+    alias length_of_column column_width # for legacy support
     
     ##
     # Return total number of columns available.
      
     def number_of_columns
-      return rows.first.length unless rows.empty?
-      raise Error, 'your table needs some rows'
-    end
-    
-    ##
-    # Align column _n_ to the given _alignment_ of :center, :left, or :right.
-    
-    def align_column n, alignment
-      r = rows
-      column(n).each_with_index do |col, i|
-        r[i][n] = { :value => col, :alignment => alignment } unless Hash === col
-      end
-    end
-    
-    ##
-    # Return headings combined with rows.
-    
-    def headings_with_rows
-      [headings] + rows
-    end
-
+      headings_with_rows.map { |r| r.cells.size }.max
+    end
+
+    ##
+    # Set the headings
+    
+    def headings= array
+      @headings = Row.new(self, array)
+      recalc_column_widths @headings
+    end
+
+    ##
+    # Render the table.
+  
+    def render
+      separator = Separator.new(self)
+      buffer = [separator]
+      unless @title.nil?
+        buffer << Row.new(self, [title_cell_options])
+        buffer << separator
+      end
+      unless @headings.cells.empty?
+        buffer << @headings
+        buffer << separator
+      end
+      buffer += @rows
+      buffer << separator
+      buffer.map { |r| r.render }.join("\n")
+    end
+    alias :to_s :render
+    
     ##
     # Return rows without separator rows.
 
     def rows
-      @rows.reject { |row| row == :separator }
-    end
-
-    ##
-    # Return rows including separator rows.
-
-    def all_rows
-      @rows
-    end
-
+      @rows.reject { |row| row.is_a? Separator }
+    end
+    
+    def rows= array
+      @rows = []
+      array.each { |arr| self << arr }
+    end
+
+    def style=(options)
+      style.apply options
+    end
+    
+    def style
+      @style ||= Style.new
+    end
+    
+    def title=(title)
+      @title = title
+      recalc_column_widths Row.new(self, [title_cell_options])
+    end
+    
     ##
     # Check if _other_ is equal to self. _other_ is considered equal
     # if it contains the same headings and rows.
 
     def == other
-      if other.respond_to? :headings and other.respond_to? :rows
-        headings == other.headings and rows == other.rows
-      end
+      if other.respond_to? :render and other.respond_to? :rows
+        self.headings == other.headings and self.rows == other.rows
+      end
+    end
+
+    private
+    
+    def columns_width
+      @column_widths.inject(0) { |s, i| s + i + cell_spacing } + style.border_y.length
+    end
+    
+    def additional_column_widths
+      return [] if style.width.nil?
+      spacing = style.width - columns_width
+      if spacing < 0
+        raise "Table width exceeds wanted width of #{wanted} characters."
+      else
+        per_col = spacing / number_of_columns
+        arr = (1...number_of_columns).to_a.map { |i| per_col }
+        other_cols = arr.inject(0) { |s, i| s + i }
+        arr << spacing - other_cols
+        arr
+      end
+    end
+    
+    def recalc_column_widths row
+      return if row.is_a? Separator
+      i = 0
+      row.cells.each do |cell|
+        colspan = cell.colspan
+        cell_value = cell.value_for_column_width_recalc
+        colspan.downto(1) do |j|
+          cell_length = cell_value.to_s.length
+          if colspan > 1
+            spacing_length = cell_spacing * (colspan - 1)
+            length_in_columns = (cell_length - spacing_length)
+            cell_length = (length_in_columns.to_f / colspan).ceil
+          end
+          if @column_widths[i].to_i < cell_length
+            @column_widths[i] = cell_length
+          end
+          i = i + 1
+        end
+      end
+    end
+    
+    ##
+    # Return headings combined with rows.
+    
+    def headings_with_rows
+      [@headings] + rows
+    end
+    
+    def yield_or_eval &block
+      return unless block
+      if block.arity > 0
+        yield self
+      else
+        self.instance_eval(&block)
+      end
+    end
+
+    def title_cell_options
+      {:value => @title, :alignment => :center, :colspan => number_of_columns}
     end
   end
 end

=== modified file 'lib/terminal-table/version.rb'
--- lib/terminal-table/version.rb	2011-06-17 13:38:26 +0000
+++ lib/terminal-table/version.rb	2013-12-12 07:49:48 +0000
@@ -1,6 +1,6 @@
 
 module Terminal
   class Table
-    VERSION = '1.4.2'
+    VERSION = '1.4.5'
   end
-end
\ No newline at end of file
+end

=== modified file 'metadata.yml'
--- metadata.yml	2011-06-17 13:38:26 +0000
+++ metadata.yml	2013-12-12 07:49:48 +0000
@@ -1,37 +1,34 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
 name: terminal-table
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  version: 1.4.5
+date: 2012-03-15 00:00:00 +00:00
+summary: Simple, feature rich ascii table generation library
+require_paths: 
+- lib
+email: [e-mail]
+homepage: http://github.com/visionmedia/terminal-table
+rubyforge_project: terminal-table
+description: Simple, feature rich ascii table generation library
+autorequire: 
+default_executable: 
+bindir: bin
+has_rdoc: false
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - TJ Holowaychuk
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2010-01-14 00:00:00 -08:00
-default_executable: 
-dependencies: []
-
-description: Simple, feature rich ascii table generation library
-email: [e-mail]
-executables: []
-
-extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-- lib/terminal-table.rb
-- lib/terminal-table/cell.rb
-- lib/terminal-table/core_ext.rb
-- lib/terminal-table/heading.rb
-- lib/terminal-table/import.rb
-- lib/terminal-table/table.rb
-- lib/terminal-table/table_helper.rb
-- lib/terminal-table/version.rb
-- tasks/docs.rake
-- tasks/gemspec.rake
-- tasks/spec.rake
+- Scott J. Goldman
 files: 
 - History.rdoc
 - Manifest
@@ -42,11 +39,13 @@
 - lib/terminal-table.rb
 - lib/terminal-table/cell.rb
 - lib/terminal-table/core_ext.rb
-- lib/terminal-table/heading.rb
 - lib/terminal-table/import.rb
 - lib/terminal-table/table.rb
 - lib/terminal-table/table_helper.rb
 - lib/terminal-table/version.rb
+- lib/terminal-table/row.rb
+- lib/terminal-table/separator.rb
+- lib/terminal-table/style.rb
 - spec/cell_spec.rb
 - spec/core_ext_spec.rb
 - spec/import_spec.rb
@@ -57,11 +56,8 @@
 - tasks/gemspec.rake
 - tasks/spec.rake
 - terminal-table.gemspec
-has_rdoc: true
-homepage: http://github.com/visionmedia/terminal-table
-licenses: []
+test_files: []
 
-post_install_message: 
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -69,26 +65,26 @@
 - Terminal-table
 - --main
 - README.rdoc
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+extra_rdoc_files: 
+- README.rdoc
+- lib/terminal-table.rb
+- lib/terminal-table/cell.rb
+- lib/terminal-table/core_ext.rb
+- lib/terminal-table/import.rb
+- lib/terminal-table/table.rb
+- lib/terminal-table/version.rb
+- lib/terminal-table/row.rb
+- lib/terminal-table/separator.rb
+- lib/terminal-table/style.rb
+- lib/terminal-table/table_helper.rb
+- tasks/docs.rake
+- tasks/gemspec.rake
+- tasks/spec.rake
+executables: []
+
+extensions: []
+
 requirements: []
 
-rubyforge_project: terminal-table
-rubygems_version: 1.3.5
-signing_key: 
-specification_version: 3
-summary: Simple, feature rich ascii table generation library
-test_files: []
+dependencies: []
 

=== modified file 'spec/cell_spec.rb'
--- spec/cell_spec.rb	2011-06-17 13:38:26 +0000
+++ spec/cell_spec.rb	2013-12-12 07:49:48 +0000
@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'term/ansicolor'
+
+class String; include Term::ANSIColor; end
 
 require File.dirname(__FILE__) + '/spec_helper'
 
@@ -5,14 +9,46 @@
   Cell = Terminal::Table::Cell
   
   it "should default alignment to the left" do
-    cell = Cell.new 0, 'foo'
+    cell = Cell.new :value => 'foo', :table => Terminal::Table.new, :index => 0
     cell.value.should == 'foo'
     cell.alignment.should == :left
   end
 
   it "should allow overriding of alignment" do
-    cell = Cell.new 0, :value => 'foo', :alignment => :center
+    cell = Cell.new :value => 'foo', :alignment => :center, :table => Terminal::Table.new, :index => 0
     cell.value.should == 'foo'
     cell.alignment.should == :center
   end
+  
+  it "should allow :left, :right and :center for alignment" do
+    @cell = Cell.new :value => 'foo', :table => Terminal::Table.new, :index => 0
+    @cell.alignment = :left
+    @cell.alignment = :right
+    @cell.alignment = :center
+    lambda { @cell.alignment = "foo" }.should raise_error
+  end
+  
+  it "should allow multiline content" do
+    cell = Cell.new :value => "barrissimo\n"+"foo".yellow, :table => Terminal::Table.new, :index => 0
+    cell.value.should == "barrissimo\n"+"foo".yellow
+    cell.lines.should == ['barrissimo','foo'.yellow]
+    cell.value_for_column_width_recalc.should == 'barrissimo'
+    cell.render(0).should == " barrissimo "
+  end
+  
+  it "should allow colorized content" do
+    cell = Cell.new :value => "foo".red, :table => Terminal::Table.new, :index => 0
+    cell.value.should == "\e[31mfoo\e[0m"
+    cell.value_for_column_width_recalc.should == 'foo'
+    cell.render.should == " \e[31mfoo\e[0m "
+  end
+  
+  it "should render padding properly" do
+    @table = Terminal::Table.new(:rows => [['foo', '2'], ['3', '4']], :style => {:padding_right => 3})
+    cell = @table.rows.first.cells.first
+    cell.value.should == 'foo'
+    cell.alignment.should == :left
+    cell.render.should == " foo   "
+  end
+
 end

=== modified file 'spec/spec_helper.rb'
--- spec/spec_helper.rb	2011-06-17 13:38:26 +0000
+++ spec/spec_helper.rb	2013-12-12 07:49:48 +0000
@@ -3,6 +3,6 @@
 
 class String
   def deindent
-    gsub /^ */, ''
+    strip.gsub(/^ */, '')
   end
 end

=== modified file 'spec/table_spec.rb' (properties changed: +x to -x)
--- spec/table_spec.rb	2011-06-17 13:38:26 +0000
+++ spec/table_spec.rb	2013-12-12 07:49:48 +0000
@@ -19,16 +19,16 @@
       @table.column_with_headings(2).should == [3,6]
     end
 
-    it "should select the columns with colspans > 1 in the index" do
-      @table << [1,{:value => 2, :colspan => 2}]
-      @table << [{:value => 3, :colspan => 2}, 4]
-    end
+    #it "should select the columns with colspans > 1 in the index" do
+    #  @table << [1,{:value => 2, :colspan => 2}]
+    #  @table << [{:value => 3, :colspan => 2}, 4]
+    #end
 
     it "should account for the colspan when selecting columns" do
       @table << [1,2,3]
       @table << [{:value => "4,5", :colspan => 2}, 6]
-      @table.column_with_headings(0).should == [1,{:start_index => 0, :value => "4,5", :colspan => 2}]
-      @table.column_with_headings(1).should == [2,{:start_index => 0, :value => "4,5", :colspan => 2}]
+      @table.column_with_headings(0).should == [1,"4,5"]
+      @table.column_with_headings(1).should == [2,"4,5"]
       @table.column_with_headings(2).should == [3,6]
     end
 
@@ -45,11 +45,6 @@
       EOF
     end
 
-    it "should convert rows to indexes" do
-      @table << [{:value => '7', :colspan => 2}, 88]
-      @table.row_to_index(@table.rows[0], 1).should == 2
-    end
-
     it "should count columns" do
       @table << [1, 2, 3]
       @table.number_of_columns.should == 3
@@ -71,64 +66,27 @@
     it "should select columns when using hashes" do
       @table.headings = ['one', 'two']
       @table.rows = [[{ :value => 'a', :align => :left }, 1], ['b', 2], ['c', 3]]
-      @table.column(0).should == [{ :value => 'a', :align => :left }, 'b', 'c']
-    end
-
-    it "should determine length of largest cell in a column" do
-      @table << ['foo', 'bar']
-      @table << ['big foo', 'big foo bar']
-      @table.length_of_largest_cell_in_column(1).should == 11
-    end
-
-    it "should determine length of largest cell in a column with multi-column rows" do
-      @table << [1,2]
-      @table << [{:value => '123456789', :colspan => 2}]
-      # +-----+-----+
-      # | 1   | 2   |
-      # | 123456789 |
-      #
-      @table.length_of_largest_cell_in_column(0).should == 3
-      @table.length_of_largest_cell_in_column(1).should == 3
-
-      @table.render.should == <<-EOF.deindent
-        +-----+-----+
-        | 1   | 2   |
-        | 123456789 |
-        +-----+-----+
-      EOF
-    end
-
-    it "should determine length of largest cell in a column with multi-column rows, rounding up" do
-      @table << [1,2]
-      @table << [{:value => '1234567890', :colspan => 2}]
-      @table.length_of_largest_cell_in_column(0).should == 4
-      @table.length_of_largest_cell_in_column(1).should == 4
-
-      @table.render.should == <<-EOF.deindent
-        +------+------+
-        | 1    | 2    |
-        | 1234567890  |
-        +------+------+
-      EOF
+      @table.column(0).should == ['a', 'b', 'c']
     end
 
     it "should find column length" do
       @table << ['foo', 'bar', 'a']
       @table << ['big foo', 'big foo bar']
-      @table.length_of_column(1).should == 11
+      @table.column_width(1).should == 11
     end
 
     it "should find column length with headings" do
       @table.headings = ['one', 'super long heading']
       @table << ['foo', 'bar', 'a']
       @table << ['big foo', 'big foo bar']
-      @table.length_of_column(1).should == 18
+      @table.column_width(1).should == 18
     end
 
     it "should render separators" do
       @table.headings = ['Char', 'Num']
       @table << ['a', 1]
-      @table.separator.should == '+------+-----+'
+      separator = Terminal::Table::Separator.new(@table)
+      separator.render.should == '+------+-----+'
     end
 
     it "should add separator" do
@@ -136,11 +94,13 @@
       @table.add_separator
       @table << ['b', 2]
       @table.rows.size.should == 2
-      @table.all_rows.size.should == 3
     end
 
-    it "should bitch and complain when you have no rows" do
-      lambda { @table.render }.should raise_error(Terminal::Table::Error)
+    it "should render an empty table properly" do
+      @table.render.should == <<-EOF.deindent
+        ++
+        ++
+      EOF
     end
 
     it "should render properly" do
@@ -159,6 +119,60 @@
       EOF
     end
 
+    it "should render styles properly" do
+      @table.headings = ['Char', 'Num']
+      @table.style = {:border_x => "=", :border_y => ":", :border_i => "x", :padding_left => 0, :padding_right => 2}
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.style.padding_right.should == 2
+      @table.render.should == <<-EOF.deindent
+        x======x=====x
+        :Char  :Num  :
+        x======x=====x
+        :a     :1    :
+        :b     :2    :
+        :c     :3    :
+        x======x=====x
+      EOF
+    end
+
+    it "should render width properly" do
+      @table.headings = ['Char', 'Num']
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.style.width = 21
+      @table.render.should == <<-EOF.deindent
+        +---------+---------+
+        | Char    | Num     |
+        +---------+---------+
+        | a       | 1       |
+        | b       | 2       |
+        | c       | 3       |
+        +---------+---------+
+      EOF
+    end
+
+    it "should render title properly" do
+      @table.title = "Title"
+      @table.headings = ['Char', 'Num']
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.render.should == <<-EOF.deindent
+        +------+-----+
+        |   Title    |
+        +------+-----+
+        | Char | Num |
+        +------+-----+
+        | a    | 1   |
+        | b    | 2   |
+        | c    | 3   |
+        +------+-----+
+      EOF
+    end
+
     it "should render properly without headings" do
       @table << ['a', 1]
       @table << ['b', 2]
@@ -307,13 +321,13 @@
         t.should == t
       end
 
-      it "should be equal with two empty tables" do
-        table_one = Table.new
-        table_two = Table.new
-
-        table_one.should == table_two
-        table_two.should == table_one
-      end
+     # it "should be equal with two empty tables" do
+     #   table_one = Table.new
+     #   table_two = Table.new
+     # 
+     #   table_one.should == table_two
+     #   table_two.should == table_one
+     # end
 
       it "should not be equal with different headings" do
         table_one = Table.new
@@ -329,8 +343,6 @@
         table_one = Table.new
         table_two = Table.new
 
-        table_one.add_row "a"
-
         table_one.should_not == table_two
         table_two.should_not == table_one
       end
@@ -447,5 +459,67 @@
         +------+---+---+---+
       EOF
     end
+    
+    it "should handle multiple colspan" do
+      @table.headings = [
+        'name',
+        { :value => 'Values', :alignment => :right, :colspan => 2},
+        { :value => 'Other values', :alignment => :right, :colspan => 2},
+        { :value => 'Column 3', :alignment => :right, :colspan => 2}
+      ]
+
+      3.times do |row_index|
+        row = ["row ##{row_index+1}"]
+        6.times do |i|
+          row << row_index*6 + i
+        end
+        @table.add_row(row)
+      end
+
+      @table.render.should == <<-EOF.deindent
+        +--------+----+----+-------+-------+-----+-----+
+        | name   |  Values |  Other values |  Column 3 |
+        +--------+----+----+-------+-------+-----+-----+
+        | row #1 | 0  | 1  | 2     | 3     | 4   | 5   |
+        | row #2 | 6  | 7  | 8     | 9     | 10  | 11  |
+        | row #3 | 12 | 13 | 14    | 15    | 16  | 17  |
+        +--------+----+----+-------+-------+-----+-----+
+      EOF
+    end
+    
+    it "should render a table with only X cell borders" do
+      @table.style = {:border_x => "-", :border_y => "", :border_i => ""}
+
+      @table.headings = ['name', { :value => 'values', :alignment => :right, :colspan => 3}]
+      @table.headings = ['name', { :value => 'values', :colspan => 3}]
+      @table.rows = [['a', 1, 2, 3], ['b', 4, 5, 6], ['c', 7, 8, 9]]
+
+      @table.render.should == <<-EOF.strip
+---------------
+ name  values  
+---------------
+ a     1  2  3 
+ b     4  5  6 
+ c     7  8  9 
+---------------
+      EOF
+    end
+    
+    it "should render a table without cell borders" do
+      @table.style = {:border_x => "", :border_y => "", :border_i => ""}
+
+      @table.headings = ['name', { :value => 'values', :alignment => :right, :colspan => 3}]
+      @table.headings = ['name', { :value => 'values', :colspan => 3}]
+      @table.rows = [['a', 1, 2, 3], ['b', 4, 5, 6], ['c', 7, 8, 9]]
+
+      @table.render.should == <<-EOF
+
+ name  values  
+
+ a     1  2  3 
+ b     4  5  6 
+ c     7  8  9 
+      EOF
+    end
   end
 end

=== modified file 'terminal-table.gemspec'
--- terminal-table.gemspec	2011-06-17 13:38:26 +0000
+++ terminal-table.gemspec	2013-12-12 07:49:48 +0000
@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{terminal-table}
-  s.version = "1.4.2"
+  s.version = "1.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2010-01-14}
+  s.authors = ["TJ Holowaychuk", "Scott J. Goldman"]
+  s.date = %q{2012-3-15}
   s.description = %q{Simple, feature rich ascii table generation library}
   s.email = %q{[e-mail]}
-  s.extra_rdoc_files = ["README.rdoc", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/heading.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]
-  s.files = ["History.rdoc", "Manifest", "README.rdoc", "Rakefile", "Todo.rdoc", "examples/examples.rb", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/heading.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "spec/cell_spec.rb", "spec/core_ext_spec.rb", "spec/import_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/table_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "terminal-table.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/version.rb", "lib/terminal-table/row.rb", "lib/terminal-table/separator.rb", "lib/terminal-table/style.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]
+  s.files = ["History.rdoc", "Manifest", "README.rdoc", "Rakefile", "Todo.rdoc", "examples/examples.rb", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "lib/terminal-table/row.rb", "lib/terminal-table/separator.rb", "lib/terminal-table/style.rb", "spec/cell_spec.rb", "spec/core_ext_spec.rb", "spec/import_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/table_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "terminal-table.gemspec"]
   s.homepage = %q{http://github.com/visionmedia/terminal-table}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Terminal-table", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -18,7 +18,7 @@
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple, feature rich ascii table generation library}
 
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version= then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3