command_line_reporter 2.1 → 3.0

data/lib/row.rb

@@ -1,60 +1,78 @@
 require 'column'
-require 'forwardable'
+require 'options_validator'
 
-class Row
-  extend Forwardable
+module CommandLineReporter
+  class Row
+    include OptionsValidator
 
-  attr_accessor :columns, :border
+    VALID_OPTIONS = [:header, :color, :bold]
+    attr_accessor :columns, :border, *VALID_OPTIONS
 
-  def initialize(options = {})
-    self.columns = []
-    self.border = false
-  end
+    def initialize(options = {})
+      self.validate_options(options, *VALID_OPTIONS)
 
-  def_delegator :@columns, :push, :add
+      self.columns = []
+      self.border = false
+      self.header = options[:header] || false
+      self.color = options[:color]
+      self.bold = options[:bold] || false
+    end
 
-  def separator
-    @sep ||= '+' + self.columns.map {|c| '-' * (c.width + 2)}.join('+') + '+'
-  end
+    def add(column)
+      if column.color.nil? && self.color
+        column.color = self.color
+      end
+
+      if self.bold || self.header
+        column.bold = true
+      end
 
-  def output
-    screen_count.times do |sr|
-      line = (self.border) ? '| ' : ''
-      self.columns.size.times do |mc|
-        col = self.columns[mc]
-        # Account for the fact that some columns will have more screen rows than their
-        # counterparts in the row.  An example being:
-        # c1 = Column.new('x' * 50, :width => 10)
-        # c2 = Column.new('x' * 20, :width => 10)
-        #
-        # c1.screen_rows.size == 5
-        # c2.screen_rows.size == 2
-        #
-        # So when we don't have a screen row for c2 we need to fill the screen with the 
-        # proper number of blanks so the layout looks like (parenthesis on the right just
-        # indicate screen row index)
-        #
-        # +-------------+------------+
-        # | xxxxxxxxxxx | xxxxxxxxxx | (0)
-        # | xxxxxxxxxxx | xxxxxxxxxx | (1)
-        # | xxxxxxxxxxx |            | (2)
-        # | xxxxxxxxxxx |            | (3)
-        # | xxxxxxxxxxx |            | (4)
-        # +-------------+------------+
-        if col.screen_rows[sr].nil?
-          line << ' ' * col.width
-        else
-          line <<  self.columns[mc].screen_rows[sr]
+      self.columns << column
+    end
+
+    def separator
+      @sep ||= '+' + self.columns.map {|c| '-' * (c.width + 2)}.join('+') + '+'
+    end
+
+    def output
+      screen_count.times do |sr|
+        line = (self.border) ? '| ' : ''
+        self.columns.size.times do |mc|
+          col = self.columns[mc]
+          # Account for the fact that some columns will have more screen rows than their
+          # counterparts in the row.  An example being:
+          # c1 = Column.new('x' * 50, :width => 10)
+          # c2 = Column.new('x' * 20, :width => 10)
+          #
+          # c1.screen_rows.size == 5
+          # c2.screen_rows.size == 2
+          #
+          # So when we don't have a screen row for c2 we need to fill the screen with the 
+          # proper number of blanks so the layout looks like (parenthesis on the right just
+          # indicate screen row index)
+          #
+          # +-------------+------------+
+          # | xxxxxxxxxxx | xxxxxxxxxx | (0)
+          # | xxxxxxxxxxx | xxxxxxxxxx | (1)
+          # | xxxxxxxxxxx |            | (2)
+          # | xxxxxxxxxxx |            | (3)
+          # | xxxxxxxxxxx |            | (4)
+          # +-------------+------------+
+          if col.screen_rows[sr].nil?
+            line << ' ' * col.width
+          else
+            line <<  self.columns[mc].screen_rows[sr]
+          end
+          line << ' ' + ((self.border) ? '| ' : '')
         end
-        line << ' ' + ((self.border) ? '| ' : '')
+        puts line
       end
-      puts line
     end
-  end
 
-  private
+    private
 
-  def screen_count
-    @sc ||= self.columns.inject(0) {|max,column| column.screen_rows.size > max ? column.screen_rows.size : max}
+    def screen_count
+      @sc ||= self.columns.inject(0) {|max,column| column.screen_rows.size > max ? column.screen_rows.size : max}
+    end
   end
 end

data/lib/table.rb

@@ -1,44 +1,58 @@
 require 'row'
 require 'options_validator'
 
-class Table
-  include OptionsValidator
+module CommandLineReporter
+  class Table
+    include OptionsValidator
 
-  VALID_OPTIONS = [:border]
-  attr_accessor :rows, *VALID_OPTIONS
+    VALID_OPTIONS = [:border]
+    attr_accessor :rows, *VALID_OPTIONS
 
-  def initialize(options = {})
-    self.validate_options(options, *VALID_OPTIONS)
+    def initialize(options = {})
+      self.validate_options(options, *VALID_OPTIONS)
 
-    self.border = options[:border] || false
+      self.border = options[:border] || false
 
-    @rows = []
-  end
+      @rows = []
+    end
 
-  def add(row)
-    # Inheritance from the table
-    row.border = self.border
-
-    # Inherit properties from the first row
-    if self.rows[0]
-      row.columns.each_with_index do |c,i|
-        c.align = self.rows[0].columns[i].align
-        c.padding = self.rows[0].columns[i].padding
-        c.width = self.rows[0].columns[i].width
-        c.size = c.width - 2 * c.padding
+    def add(row)
+      # Inheritance from the table
+      row.border = self.border
+
+      # Inherit properties from the first row
+      if self.rows[0]
+        row.columns.each_with_index do |c,i|
+          # The positional attributes are always required to inheret to make sure the table
+          # displays properly
+          c.align = self.rows[0].columns[i].align
+          c.padding = self.rows[0].columns[i].padding
+          c.width = self.rows[0].columns[i].width
+          c.size = c.width - 2 * c.padding
+
+          # Allow for the fact that the row or column may take precedence
+          unless self.rows[0].header || row.color || c.color
+            c.color = self.rows[0].columns[i].color
+          end
+
+          # Allow for the row to take precendence
+          unless self.rows[0].header || row.bold
+            c.bold = self.rows[0].columns[i].bold
+          end
+        end
       end
-    end
 
-    self.rows << row
-  end
+      self.rows << row
+    end
 
-  def output
-    return if self.rows.size == 0 # we got here with nothing to print to the screen
+    def output
+      return if self.rows.size == 0 # we got here with nothing to print to the screen
 
-    puts self.rows[0].separator if self.border
-    self.rows.each do |row|
-      row.output
       puts self.rows[0].separator if self.border
+      self.rows.each do |row|
+        row.output
+        puts self.rows[0].separator if self.border
+      end
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CommandLineReporter
-  VERSION = '2.1'
+  VERSION = '3.0'
 end