yummi 0.4.3 → 0.5.0

data/README.md

@@ -16,9 +16,47 @@ Or install it yourself as:
 
     $ gem install yummi
 
-## Usage
+## Ruby Tools
 
-Comming soon...
+Yummi module provides a set of tools to colorize inputs. Check docs for more information
+about how to build tables, text boxes, colored log formatters and more. You can also check
+the examples dir to see how to use Yummi features.
+
+## Command Line Tools
+
+Yummi exposes a 'colorize' program that you can use to colorize texts and apply
+patterns to colorize lines (usefull to tail logs).
+
+Examples:
+
+    colorize -c intense_red -m "some text"
+    echo "some text" | colorize -c intense_red
+    tail -f $JBOSS_HOME/standalone/log/server.log | colorize -p path-to-your-jboss7-mapping.yaml
+
+Line patterns are configured with an yaml file containing:
+
+  * prefix (optional): prefix for pattern
+  * suffix (optional): suffix for pattern
+  * patterns: a pattern => color map
+
+Example:
+
+    prefix: '\d{2}:\d{2}:\d{2},\d{3}\s'
+    patterns:
+      TRACE : cyan
+      DEBUG : blue
+      INFO  : gray
+      WARN  : yellow
+      ERROR : red
+      FATAL : intense_red
+
+Yummi provides a set of mappings that you, check yummi/mappings dir.
+
+Mappings provided by yummi can be passed with the file name, example:
+
+    tail -f $JBOSS_HOME/standalone/log/server.log | colorize -p jboss7
+
+Mappings in ~/.yummi dir may also used only with the file name.
 
 ## Contributing
 

data/bin/colorize

@@ -34,35 +34,65 @@ end
 opt.on '-p PATTERN', '--pattern=PATTERN', 'Sets a pattern to colorize each line' do |pattern|
   @colorizer = Yummi::Colorizers.line pattern
 end
-opt.on '-t TEXT', '--text=TEXT', 'Colorize the given text' do |text|
-  @text = text
+opt.on '-m message', '--message=MESSAGE', 'Colorize the given message' do |message|
+  @message = message
+end
+opt.on '-t file', '--table=FILE', 'Defines the file mapping the table to print' do |file|
+  @table_builder = Yummi::TableBuilder::new(file).defaults
+end
+opt.on '-d data', '--data=FILE', 'Defines the file containing the data to print' do |data|
+  @data = File.expand_path(data)
+end
+opt.on '--data-type', 'Defines the data type to parse the values' do |data_type|
+  @data_type = data_type
+end
+opt.on '-e FILES', '--eval=FILES', Array, 'Sets a file to eval for extending components' do |files|
+  files.each do |file|
+    load File.expand_path(file)
+  end
 end
 opt.on '-h', '--help', 'Display this help message' do
   puts opt
   exit 0
 end
+
+if ARGV.empty?
+  puts opt
+  exit 0
+end
+
 opt.parse! ARGV
 
-def print_out text
+def print_out message
   if @color
-    puts Yummi::colorize text, @color
+    puts Yummi::colorize message, @color
   elsif @colorizer
-    puts @colorizer.colorize text
+    puts @colorizer.colorize message
   end
 end
 
-if @color or @colorizer
-  if @text
-    print_out @text
+if @message
+  print_out @message
+elsif @table_builder
+  abort "Please give the data to print" unless @data
+  table = @table_builder.build_table
+  extension = File::extname(@data)[1..-1]
+  table.data = case (@data_type or extension)
+  when "yaml"
+    YAML::load_file(@data)
+  when "csv"
+    require 'csv'
+    CSV::parse(File.read(@data), :converters => :all)
   else
-    begin
-      ARGF.each_line do |line|
-        print_out line.chomp
-      end
-    rescue Interrupt
-      #Do nothing
-    end
+    abort "Unsupported extension #{extension}"
   end
+  puts table
 else
-  abort 'Please give a color or choose a pattern.'
+  begin
+    ARGF.each_line do |line|
+      print_out line.chomp
+    end
+  rescue Interrupt
+    #Do nothing
+  end
 end

data/examples/cash_flow_table.rb

@@ -22,23 +22,14 @@
 
 require 'optparse'
 require_relative '../lib/yummi'
+require_relative 'cash_flow_table_extensions.rb'
 
 opt = OptionParser::new
 
-@table = Yummi::Table::new
-# setting the header sets the aliases automatically
-@table.header = ['Description', 'Value', 'Total', 'Eletronic', "Authentication\nCode"]
-# sets the title
-@table.title = 'Cash Flow'
-@table.description = 'How you spend your money'
-# formats booleans using Yes or No
-@table.format :eletronic, :using => Yummi::Formatters.yes_or_no
-# shows values without minus signal and rounded
-@table.format :value, :using => lambda { |value| "%.2f" % value.abs }
-# shows totals rounded
-@table.format :total, :using => Yummi::Formatters.round(2)
-@table.format_null :with => 'none'
-# table data
+tablebuilder = Yummi::TableBuilder::new('cash_flow_table.yaml')
+
+@table = tablebuilder.defaults.build_table
+
 @table.data = [['Initial', 0, 0, false, nil],
                ['Deposit', 100.58, 100.58, true, "QAWSEDRFTGH535"],
                ['Withdraw', -50.23, 50.35, true, "34ERDTF6GYU"],
@@ -46,50 +37,6 @@ opt = OptionParser::new
                ['Deposit', 50, 0.35, false, nil],
                ['Deposit', 600, 600.35, false, nil]]
 
-def full_colors
-  @table.colorize :description, :with => :purple
-  # Authentication Code will be highlighted
-  @table.colorize :authentication_code, :with => :highlight_gray
-  # colorize booleans based on their values
-  @table.colorize :eletronic do |b|
-    b ? :blue : :cyan
-  end
-  # colorize the values based on comparison
-  red_to_negative = lambda { |value| :red if value < 0 }
-  green_to_positive = lambda { |value| :green if value > 0 }
-  brown_to_zero = lambda { |value| :yellow if value == 0 }
-  @table.colorize [:value, :total], :using => Yummi::Colorizers.join(
-    red_to_negative, green_to_positive, brown_to_zero
-  )
-  # colorize rows that Value is greater than Total
-  @table.row_colorizer do |data| # or |data, index| if you need the index
-    :white if data[:value] > data[:total]
-  end
-  @table.colorize_null :with => :red
-end
-
-def zebra_colors
-  @table.row_colorizer Yummi::Colorizers.stripe :yellow, :purple
-end
-
-def no_colors
-  @table.no_colors
-end
-
-opt.on '--color TYPE', 'Specify the color type (zebra,full,none)' do |type|
-  case type
-    when 'zebra'
-      zebra_colors
-    when 'full'
-      # colorize all values from the Description column to purple
-      full_colors
-    when 'none'
-      no_colors
-    else
-  end
-  @colors = type
-end
-
 opt.on '--layout LAYOUT', 'Defines the table layout (horizontal or vertical)' do |layout|
   @table.layout = layout.to_sym
 end
@@ -104,8 +51,6 @@ end
 
 opt.parse ARGV
 
-full_colors unless @colors
-
 if @box
   @box << @table
   @box.print

data/examples/cash_flow_table.yaml

@@ -0,0 +1,36 @@
+title: Cash Flow
+description: How you spend your money
+layout: horizontal
+header:
+  - Description
+  - Value
+  - Total
+  - Eletronic
+  - "Authentication\nCode"
+format:
+  eletronic: boolean
+  value,total:
+    numeric:
+      positive: "%.2f"
+      zero: "%.2f"
+      negative: "%.2f"
+  undefined:
+    with: none
+color:
+  description:
+    with: purple
+  authentication_code:
+    with: highlight_gray
+  eletronic:
+    boolean:
+      if_true: blue
+      if_false: cyan
+  value,total:
+    numeric:
+      positive: green
+      zero: gray
+      negative: red
+  undefined:
+    with: red
+row_color:
+  blessed_income: white

data/examples/cash_flow_table_data.csv

@@ -0,0 +1,6 @@
+Initial, 0, 0, false
+Deposit, 100.58, 100.58, true, QAWSEDRFTGH535
+Withdraw, -50.23, 50.35, true, 34ERDTF6GYU
+Withdraw, -100, -49.65, true, 2344EDRFT5
+Deposit, 50, 0.35, false
+Deposit, 600, 600.35, false

data/examples/cash_flow_table_data.yaml

@@ -0,0 +1,30 @@
+- - Initial
+  - 0
+  - 0
+  - false
+  - 
+- - Deposit
+  - 100.58
+  - 100.58
+  - true
+  - QAWSEDRFTGH535
+- - Withdraw
+  - -50.23
+  - 50.35
+  - true
+  - 34ERDTF6GYU
+- - Withdraw
+  - -100
+  - -49.65
+  - true
+  - 2344EDRFT5
+- - Deposit
+  - 50
+  - 0.35
+  - false
+  - 
+- - Deposit
+  - 600
+  - 600.35
+  - false
+  - 

data/examples/cash_flow_table_extensions.rb

@@ -0,0 +1,9 @@
+module Yummi
+  module Colorizers
+    def self.blessed_income color
+      Yummi::to_colorize do |data| # or |data, index| if you need the index
+        color if data[:value] > data[:total]
+      end
+    end
+  end
+end

data/examples/license_box.rb

@@ -27,7 +27,7 @@ require_relative '../lib/yummi'
 
 @box.width = 70
 @box.default_align = :justify
-@box.default_separator[:color] = :brown
+@box.default_separator[:color] = :yellow
 
 opt = OptionParser::new
 

data/examples/monitor_table.rb

@@ -35,26 +35,20 @@ opt = OptionParser::new
 @table.format :free_memory, :using => Yummi::Formatters.byte
 
 # colorizer for memory
-memory_colorizer = Yummi::Colorizers.by_data_eval do |free_memory, max_memory|
-  free_memory.to_f / max_memory
-end
-memory_colorizer.use(:red) { |value| value > 0.1 and value < 0.3 }
-memory_colorizer.use(:intense_red) { |value| value <= 0.1 }
+memory_colorizer = Yummi::Colorizers.percentage :max => :max_memory, :free => :free_memory
 
 # colorizer for threads
-thread_colorizer = Yummi::Colorizers.by_data_eval do |max_threads, in_use_threads|
-  in_use_threads.to_f / max_threads
-end
-thread_colorizer.use(:brown) { |value| value > 0.7 and value < 0.9 }
-thread_colorizer.use(:intense_cyan) { |value| value >= 0.9 }
+thread_colorizer = Yummi::Colorizers.percentage :max => :max_threads,
+                                                :using => :in_use_threads,
+                                                :threshold => {
+                                                  :warn => 0.9,
+                                                  :bad => 0.7
+                                                }
 
-opt.on '--color TYPE', 'Specify the color type (zebra,row,cell,none)' do |type|
+opt.on '--color TYPE', 'Specify the color type (zebra,cell,none)' do |type|
   case type
     when 'zebra'
-      @table.row_colorizer Yummi::Colorizers.stripe :brown, :purple
-    when 'row'
-      @table.row_colorizer memory_colorizer
-      @table.row_colorizer thread_colorizer
+      @table.row_colorizer Yummi::Colorizers.stripe :yellow, :purple
     when 'cell'
       @table.using_row do
         @table.colorize :free_memory, :using => memory_colorizer

data/lib/yummi.rb

@@ -202,85 +202,11 @@ module Yummi
 
   end
 
-  # A module used to create an alias method in a formatter block
-  module FormatterBlock
-
-    # Calls the :call: method
-    def format (value)
-      call value
-    end
-
-  end
-
-  # Extends the given block with #FormatterBlock
-  def self.to_format &block
-    block.extend FormatterBlock
-  end
-
-  # A module with useful formatters
-  module Formatters
-
-    # A formatter for boolean values that uses 'Yes' or 'No'
-    def self.yes_or_no
-      Yummi::to_format do |value|
-        value ? "Yes" : "No"
-      end
-    end
-
-    # A formatter to float values that uses the precision to round the value
-    def self.round precision
-      Yummi::to_format do |value|
-        "%.#{precision}f" % value
-      end
-    end
-
-    # Defines the modes to format a byte value
-    BYTE_MODES = {
-      :iec => {
-        :range => %w{B KiB MiB GiB TiB PiB EiB ZiB YiB},
-        :step => 1024
-      },
-      :si => {
-        :range => %w{B KB MB GB TB PB EB ZB YB},
-        :step => 1000
-      }
-    }
-
-    #
-    # Formats a byte value to ensure easily reading
-    #
-    # === Hash Args
-    #
-    # +precision+::
-    #   How many decimal digits should be displayed. (Defaults to 1)
-    # +mode+::
-    #   Which mode should be used to display unit symbols. (Defaults to :iec)
-    #
-    # See #BYTE_MODES
-    #
-    def self.byte params = {}
-      Yummi::to_format do |value|
-        value = value.to_i if value.is_a? String
-        mode = (params[:mode] or :iec)
-        range = BYTE_MODES[mode][:range]
-        step = BYTE_MODES[mode][:step]
-        params[:precision] ||= 1
-        result = value
-        range.each_index do |i|
-          minimun = (step ** i)
-          result = "%.#{params[:precision]}f #{range[i]}" % (value.to_f / minimun) if value >= minimun
-        end
-        result
-      end
-    end
-
-  end
-
   # A class to expose indexed data by numeric indexes and aliases.
   class IndexedData
 
     def initialize (aliases, data)
-      @aliases = aliases
+      @aliases = aliases.collect {|a| a.to_s}
       @data = data
     end
 
@@ -288,7 +214,9 @@ module Yummi
       if value.is_a? Fixnum
         @data[value]
       else
-        @data[@aliases.index(value)]
+        index = @aliases.index(value.to_s)
+        raise Exception::new("Unknow alias #{value}: \nAliases: #{@aliases}") unless index
+        @data[index]
       end
     end
 
@@ -333,13 +261,34 @@ module Yummi
 
   end
 
+  module Helpers
+
+    def self.symbolize_keys hash
+      hash.replace(hash.inject({}) do |h, (k, v)|
+        v = symbolize_keys(v) if v.is_a? Hash
+        if v.is_a? Array
+          v.each do |e|
+            if e.is_a? Hash
+              symbolize_keys(e)
+            end
+          end
+        end
+        k = k.to_sym if k.respond_to? :to_sym
+        h[k] = v
+        h
+      end)
+    end
+  end
+
 end
 
 require_relative 'yummi/no_colors' if RUBY_PLATFORM['mingw'] #Windows
 
 require_relative "yummi/colorizers"
+require_relative "yummi/formatters"
 require_relative 'yummi/color_mapping'
 require_relative 'yummi/table'
+require_relative 'yummi/table_builder'
 require_relative 'yummi/text_box'
 require_relative 'yummi/logger'
 

data/lib/yummi/colorizers.rb

@@ -53,7 +53,7 @@ module Yummi
     # convention, the first argument must be the object to colorize (to_s is called on it
     # for getting the text to colorize).#
     def color_for (*args)
-      call *args
+      call(*args)
     end
 
   end
@@ -100,6 +100,110 @@ module Yummi
       LineColorizer::new mappings
     end
 
+    #
+    # A colorizer that uses the given color.
+    #
+    def self.with color
+      Yummi::to_colorize do |value|
+        color
+      end
+    end
+
+    def self.when params
+      Yummi::to_colorize do |value|
+        color = params[value]
+        return color if color
+        if value.respond_to? :to_sym
+          color = params[value.to_sym]
+        end
+        unless color
+          params.each do |k, v|
+            return v if k.to_s == value.to_s
+          end
+        end
+        color
+      end
+    end
+
+    #
+    # A colorizer for boolean values.
+    #
+    # Parameters:
+    #   - if_true: color used if the value is true (defaults to green)
+    #   - if_false: color used if the value is false (defaults to yellow)
+    #
+    def self.boolean params = {}
+      Yummi::to_colorize do |value|
+        if value.to_s.downcase == "true"
+          (params[:if_true] or :green)
+        else
+          (params[:if_false] or :yellow)
+        end
+      end
+    end
+    
+    #
+    # A colorizer that uses a set of minimun values to use a color.
+    #
+    # Parameters:
+    #   - MINIMUN_VALUE: COLOR_TO_USE
+    #
+    def self.threshold params
+      colorizer = lambda do |value|
+        params.sort.reverse_each do |limit, color|
+          return color if value > limit
+        end
+      end
+      Yummi::to_colorize(&colorizer)
+    end
+
+    def self.percentage params
+      PercentageColorizer::new params
+    end
+
+    def self.numeric params
+      Yummi::to_format do |value|
+        if params[:negative] and value < 0
+          params[:negative]
+        elsif params[:positive] and value > 0
+          params[:positive]
+        elsif params[:zero] and value == 0
+          params[:zero]
+        end
+      end
+    end
+
+    class PercentageColorizer
+      include Yummi::Colorizer
+
+      def initialize(params)
+        @max = params[:max]
+        @free = params[:free]
+        @using = params[:using]
+        @color = params[:color] || {
+          :bad => :red,
+          :warn => :yellow,
+          :good => :green
+        }
+        @threshold = params[:threshold] || {
+          :warn => 0.30,
+          :bad => 0.15
+        }
+      end
+
+      def call(data)
+        max = data[@max.to_sym].to_f
+        free = @using ? max - data[@using.to_sym].to_f : data[@free.to_sym].to_f
+
+        percentage = free / max
+
+        return @color[:bad] if percentage <= @threshold[:bad]
+        return @color[:warn] if percentage <= @threshold[:warn]
+        @color[:good]
+      end
+
+    end
+
     #
     # A colorizer for lines that follows a pattern. This colorizer is usefull
     # for log files.
@@ -169,7 +273,7 @@ module Yummi
 
       # Creates a new colorizer using the given colors
       def initialize (*colors)
-        @colors = colors
+        @colors = colors.flatten
         @count = -1
       end
 
@@ -218,11 +322,11 @@ module Yummi
 
       # Resolves the value using the main block and given arguments
       def resolve_value (*args)
-        @block.call *args
+        @block.call(*args)
       end
 
       def call (*args)
-        value = resolve_value *args
+        value = resolve_value(*args)
         @eval_blocks.each_index do |i|
           return @colors[i] if @eval_blocks[i].call(value)
         end

data/lib/yummi/formatters.rb

@@ -0,0 +1,149 @@
+#                         The MIT License
+#
+# Copyright (c) 2012 Marcelo Guimarães <ataxexe@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Yummi
+
+  # A module used to create an alias method in a formatter block
+  module FormatterBlock
+
+    # Calls the :call: method
+    def format (value)
+      call value
+    end
+
+  end
+
+  # Extends the given block with #FormatterBlock
+  def self.to_format &block
+    block.extend FormatterBlock
+  end
+
+  # A module with useful formatters
+  module Formatters
+
+    #
+    # A formatter for boolean values that uses 'Yes' or 'No' by default
+    #
+    # === Hash Args
+    #
+    # :if_true => String to use when value is true
+    # :if_false => String to use when value is false
+    #
+    def self.boolean params = {}
+      Yummi::to_format do |value|
+        if value.to_s.downcase == "true"
+          (params[:if_true] or "Yes")
+        else 
+          (params[:if_false] or "No")
+        end
+      end
+    end
+
+    # A formatter to round float values
+    def self.round precision
+      Yummi::to_format do |value|
+        "%.#{precision}f" % value
+      end
+    end
+
+    # A formatter that uses the given format
+    def self.with format
+      Yummi::to_format do |value|
+        format % value
+      end
+    end
+
+    #
+    # A formatter for numeric values
+    #
+    # === Hash Args
+    #
+    # :negative => format to use when value is negative
+    # :zero => format to use when value is zero
+    # :positive => format to use when value is positive
+    #
+    def self.numeric params
+      Yummi::to_format do |value|
+        if params[:negative] and value < 0
+          params[:negative] % value.abs
+        elsif params[:positive] and value > 0
+          params[:positive] % value
+        elsif params[:zero] and value == 0
+          params[:zero] % value
+        end
+      end
+    end
+
+    #
+    # A formatter for percentual values.
+    #
+    # Paramters:
+    #   The precision to use (defaults to 3)
+    #
+    def self.percentage precision = 3
+      Yummi::to_format do |value|
+        "%.#{precision}f%%" % (value * 100)
+      end
+    end
+
+    # Defines the modes to format a byte value
+    BYTE_MODES = {
+      :iec => {
+        :range => %w{B KiB MiB GiB TiB PiB EiB ZiB YiB},
+        :step => 1024
+      },
+      :si => {
+        :range => %w{B KB MB GB TB PB EB ZB YB},
+        :step => 1000
+      }
+    }
+
+    #
+    # Formats a byte value to ensure easily reading
+    #
+    # === Hash Args
+    #
+    # +precision+::
+    #   How many decimal digits should be displayed. (Defaults to 1)
+    # +mode+::
+    #   Which mode should be used to display unit symbols. (Defaults to :iec)
+    #
+    # See #BYTE_MODES
+    #
+    def self.byte params = {}
+      Yummi::to_format do |value|
+        value = value.to_i if value.is_a? String
+        mode = (params[:mode] or :iec)
+        range = BYTE_MODES[mode][:range]
+        step = BYTE_MODES[mode][:step]
+        params[:precision] ||= 1
+        result = value
+        range.each_index do |i|
+          minimun = (step ** i)
+          result = "%.#{params[:precision]}f #{range[i]}" % (value.to_f / minimun) if value >= minimun
+        end
+        result
+      end
+    end
+
+  end
+end

data/lib/yummi/table.rb

@@ -46,6 +46,8 @@ module Yummi
     attr_accessor :colors
     # The table layout (horizontal or vertical)
     attr_reader :layout
+    # The table header
+    attr_reader :header
 
     # Creates a new table with the default attributes:
     #
@@ -144,6 +146,7 @@ module Yummi
     def align (indexes, type)
       [*indexes].each do |index|
         index = parse_index(index)
+        raise Exception::new "Undefined column #{index}" unless index
         @align[index] = type
       end
     end
@@ -153,15 +156,12 @@ module Yummi
     # The component must respond to +call+ with the index and the row as the arguments and
     # return a color or +nil+ if default color should be used. A block can also be used.
     #
-    # You can add as much colorizers as you want. The first color returned will be used.
-    #
     # === Example
     #
     #   table.row_colorizer { |i, row| :red if row[:value] < 0 }
     #
     def row_colorizer (colorizer = nil, &block)
-      @row_colorizer ||= Yummi::GroupedComponent::new
-      @row_colorizer << (colorizer or block)
+      @row_colorizer = (colorizer or block)
     end
 
     #
@@ -205,7 +205,6 @@ module Yummi
     # #using_row) as the arguments and return a color or +nil+ if default color should be
     # used. A block can also be used.
     #
-    # You can add as much colorizers as you want. The first color returned will be used.
     #
     # === Args
     #
@@ -224,9 +223,12 @@ module Yummi
     def colorize (indexes, params = {}, &block)
       [*indexes].each do |index|
         index = parse_index(index)
-        @colorizers[index] ||= []
-        obj = (params[:using] or block or (proc { |v| params[:with] }))
-        @colorizers[index] << {:use_row => @using_row, :component => obj}
+        if index
+          obj = (params[:using] or block or (proc { |v| params[:with] }))
+          @colorizers[index] = {:use_row => @using_row, :component => obj}
+        else
+          colorize_null params, &block
+        end
       end
     end
 
@@ -271,9 +273,13 @@ module Yummi
     def format (indexes, params = {}, &block)
       [*indexes].each do |index|
         index = parse_index(index)
-        @formatters[index] = (params[:using] or block)
-        @formatters[index] ||= proc do |value|
-          params[:with] % value
+        if index
+          @formatters[index] = (params[:using] or block)
+          @formatters[index] ||= proc do |value|
+            params[:with] % value
+          end
+        else
+          format_null params, &block
         end
       end
     end
@@ -377,18 +383,12 @@ module Yummi
           color = nil
           value = nil
           column = row[col_index]
-          colorizers = @colorizers[col_index]
+          colorizer = @colorizers[col_index]
           if @null_colorizer and column.nil?
             color = @null_colorizer.call(column)
-          elsif colorizers
-            colorizers.each do |colorizer|
-              arg = colorizer[:use_row] ? IndexedData::new(@aliases, row) : column
-              c = colorizer[:component].call(arg)
-              if c
-                color = c
-                break
-              end
-            end
+          elsif colorizer
+            arg = colorizer[:use_row] ? IndexedData::new(@aliases, row) : column
+            color = colorizer[:component].call(arg)
           else
             color = @colors[:value]
           end
@@ -410,8 +410,7 @@ module Yummi
                               end,
                               :new => proc do |value, data|
                                 {:value => value, :color => data[:color]}
-                              end
-        )
+                              end)
         _row_data.each do |_row|
           output << _row
         end
@@ -444,8 +443,8 @@ module Yummi
     end
 
     def parse_index(value)
-      return @aliases.index(value) unless value.is_a? Fixnum
-      value
+      return value if value.is_a? Fixnum
+      (@aliases.index(value) or @aliases.index(value.to_sym))
     end
 
     def max_width(data, column)

data/lib/yummi/table_builder.rb

@@ -0,0 +1,150 @@
+#                         The MIT License
+#
+# Copyright (c) 2011-2012 Marcelo Guimarães <ataxexe@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Yummi
+  class TableBuilder
+
+    attr_accessor :config, :repositories
+
+    def initialize config = {}
+      if config.is_a? String
+        config = Yummi::Helpers::symbolize_keys(YAML::load_file(config))
+      end
+      @config = config
+      @repositories = {}
+    
+      @repositories[:formatters] = [Yummi::Formatters]    
+      @repositories[:colorizers] = [Yummi::Colorizers]    
+      @repositories[:row_based_colorizers] = [Yummi::Colorizers]    
+      @repositories[:using_row_colorizers] = [Yummi::Colorizers]
+    end
+
+    def defaults
+      component [:color, :colorize], :repository => :colorizers,
+                                     :invoke     => :colorize
+
+      component :format, :repository => :formatters,
+                         :invoke     => :format
+
+      component [:row_color, :colorize_row], :repository => :row_based_colorizers,
+                                             :invoke     => :row_colorizer,
+                                             :row_based  => true
+
+      component [:state, :health], :repository => :using_row_colorizers,
+                                   :invoke     => :colorize,
+                                   :using_row  => true
+      self
+    end
+
+    def components
+      @components ||= {}
+      @components
+    end
+
+    def component keys, params
+      [*keys].each do |key|
+        components[key] = params
+      end
+    end 
+
+    def build_table
+      table = Yummi::Table::new
+      table.title = config[:title]
+      table.description= config[:description]
+      table.aliases = config[:aliases] if config[:aliases]
+      table.header = config[:header] if config[:header]
+      table.layout = config[:layout].to_sym if config[:layout]
+
+      components.each do |key, component_config|
+        block = lambda do |params|
+          if component_config[:using_row]
+            table.using_row do
+              table.send component_config[:invoke], *params
+            end
+          else
+            table.send component_config[:invoke], *params
+          end
+        end
+        if component_config[:row_based]
+          parse_row_based_component config[key], component_config, &block
+        else
+          parse_component config[key], component_config, &block
+        end
+      end
+
+      table
+    end
+
+    def parse_component(definitions, config)
+      if definitions
+        definitions.each do |column, component_config|
+          callback = []
+          column = column.to_s.split(/,/)
+          callback << column
+          component = create_component(component_config, config)
+          callback << {:using => component}
+          yield(callback)
+        end
+      end
+    end
+
+    def parse_row_based_component(definitions, config)
+      if definitions
+        if definitions.is_a? Hash
+          definitions.each do |component_name, params|
+            yield(create_component({component_name => params}, config))
+          end
+        else
+          puts definitions
+          component = create_component(definitions, config)
+          puts component
+          yield(component)
+        end
+      end
+    end
+
+    def create_component(component_config, config)
+      repositories = @repositories[config[:repository]].reverse
+      if component_config.is_a? Hash
+        component_config = Yummi::Helpers::symbolize_keys(component_config)
+        component = Yummi::GroupedComponent::new
+        component_config.each do |component_name, params|
+          repositories.each do |repository|
+            if repository.respond_to? component_name
+              component << repository.send(component_name, params)
+              break
+            end
+          end
+        end
+        return component
+      else
+        repositories.each do |repository|
+          if repository.respond_to? component_config
+            return repository.send(component_config)
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/lib/yummi/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Yummi
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/yummi.ipr

@@ -21,6 +21,7 @@
       <entry name="?*.dtd" />
       <entry name="?*.tld" />
       <entry name="?*.ftl" />
+      <entry name="trace.info" />
     </wildcardResourcePatterns>
     <annotationProcessing enabled="false" useClasspath="true" />
   </component>
@@ -41,6 +42,9 @@
     <option name="SKIP_IMPORT_STATEMENTS" value="false" />
   </component>
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="GradleSettings">
+    <option name="gradleHome" value="$USER_HOME$/build/gradle" />
+  </component>
   <component name="GradleUISettings2">
     <setting name="root" />
   </component>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies: []
 description: A tool to colorize your console application.
 email:
@@ -27,6 +27,10 @@ files:
 - Rakefile
 - bin/colorize
 - examples/cash_flow_table.rb
+- examples/cash_flow_table.yaml
+- examples/cash_flow_table_data.csv
+- examples/cash_flow_table_data.yaml
+- examples/cash_flow_table_extensions.rb
 - examples/license_box.rb
 - examples/list_files.rb
 - examples/logcat_colorizer.rb
@@ -35,12 +39,14 @@ files:
 - lib/yummi.rb
 - lib/yummi/color_mapping.rb
 - lib/yummi/colorizers.rb
+- lib/yummi/formatters.rb
 - lib/yummi/logger.rb
 - lib/yummi/mappings/jboss5.yaml
 - lib/yummi/mappings/jboss7.yaml
 - lib/yummi/mappings/weblogic11g.yaml
 - lib/yummi/no_colors.rb
 - lib/yummi/table.rb
+- lib/yummi/table_builder.rb
 - lib/yummi/text_box.rb
 - lib/yummi/version.rb
 - yummi.gemspec