yummi 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4089a0b7687580a80c189b1a1a5bdcffd0839b57
-  data.tar.gz: 61844b4fa6a5b833419f6b7ef2f114cd38219d3d
+  metadata.gz: 84331096ac770ff2a1f04d8a7aee1aa7cdcc0ea3
+  data.tar.gz: 86b6f4dfd5643ec830049831d4366ed6d0a9cdd4
 SHA512:
-  metadata.gz: c01ce312dd40c5cc027ed3dd6fceb87fb8ca10fce3f347d2052d63be28b727111f7c86d8f1b0fbd67cf7ca04cf56703214f1c01688aacdad4c16df57e81a7dad
-  data.tar.gz: 758f36d1626400b8238810fb189de5bb29c228f08782203af4cc60a025a0981e583b511021826be147e25f3f34b2cf7a52ae5daee2f98f9b13106b1266b49718
+  metadata.gz: 2193710539b5a0ecb3fd18f0c7e78cc38a01363e1dfa128cd1d40e15cbcb59a3b83eb16af6e7307690f41e2361d332f89771c4adf92a20d035a43762fa3f9050
+  data.tar.gz: 82ca682f1c4df69360acf2abb1ebd6be342c66ac51adf122dd7cc2bb9fac917a2e3fb4518a2849badb73257c3cecf6f7e5ac22a5b9518b2cb716ffa404e65bd0

data/README.md

@@ -32,7 +32,7 @@ Examples:
 
     yummi -c intense_red -m "some text"
     echo "some text" | yummi -c intense_red
-    tail -f $JBOSS_HOME/standalone/log/server.log | yummi -p path-to-your-jboss7-mapping.yaml
+    tail -f $JBOSS_HOME/standalone/log/server.log | yummi -p defined-pattern
 
 Line patterns are configured with an yaml file containing:
 
@@ -56,8 +56,7 @@ Yummi provides a set of patterns, check yummi/patterns dir.
 
     tail -f $JBOSS_HOME/standalone/log/server.log | yummi -p jboss
 
-Patterns in ~/.yummi/patterns and provided by yummi may also be used by passing
-only the file name without extension
+User patterns must be in `~/.yummi/patterns` directory with the name `$PATTERN_NAME.yaml`. User patterns can override builtin patterns.
 
 ## Contributing
 

data/bin/yummi

@@ -28,34 +28,38 @@ require 'optparse'
 @params = []
 
 opt = OptionParser::new
-opt.on '-c COLOR', '--color=COLOR', 'Colorize using the given color' do |color|
+opt.on '-c COLOR', '--color=COLOR',
+       'Colorize using the given color' do |color|
   @color = color
 end
-opt.on '-f FORMAT', '--format=FORMAT', 'Sets the format to use (a "%s" means the colorized message)' do |format|
+opt.on '-f FORMAT', '--format=FORMAT',
+       'Sets the format to use (a "%s" means the colorized message)' do |format|
   @format = format
 end
-opt.on '-n LEVEL', '--level=LEVEL', Integer, 'Sets the level to filter the patterns' do |n|
-  @level = n
-end
-opt.on '-p PATTERNS', '--pattern=PATTERNS', Array, 'Sets a pattern to colorize each line' do |patterns|
+opt.on '-p PATTERNS', '--pattern=PATTERNS', Array,
+       'Sets a pattern to colorize each line' do |patterns|
   @colorizer = Yummi::Colorizers.pattern(patterns)
 end
 opt.on '--log', 'Uses the default log pattern to colorize each line' do 
   @colorizer = Yummi::Colorizers.pattern(:log)
 end
-opt.on '-m message', '--message=MESSAGE', 'Colorize the given message' do |message|
+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|
+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|
+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 '-l FILES', '--load=FILES', Array, 'Include the files for extending components' do |files|
+opt.on '-l FILES', '--load=FILES', Array,
+       'Include the files for extending components' do |files|
   files.each do |file|
     load File.expand_path(file)
   end
@@ -79,9 +83,7 @@ end
 
 opt.parse! ARGV
 
-@colorizer.level = @level if @level
-
-def print_out message
+def print_out(message)
   output_text = if @color
     Yummi::colorize message, @color
   elsif @colorizer
@@ -99,7 +101,7 @@ end
 if @message
   print_out @message
 elsif @table_builder
-  abort "Please give the data to print".red unless @data
+  abort 'Please give the data to print'.red unless @data
   table = @table_builder.build_table
   extension = File::extname(@data)[1..-1]
   type = (@data_type or extension).to_sym
@@ -116,6 +118,6 @@ else
       print_out line.chomp
     end
   rescue Interrupt
-    puts "Aborted!".red
+    puts 'Aborted!'.red
   end
 end

data/examples/cash_flow_table.rb

@@ -31,9 +31,9 @@ tablebuilder = Yummi::TableBuilder::new('cash_flow_table.yaml')
 @table = tablebuilder.defaults.build_table
 
 @table.data = [['Initial', nil, 0, nil, nil],
-               ['Deposit', 100.58, 100.58, true, "QAWSEDRFTGH535"],
-               ['Withdraw', -50.23, 50.35, true, "34ERDTF6GYU"],
-               ['Withdraw', -100, -49.65, true, "2344EDRFT5"],
+               ['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, nil],
                ['Deposit', 600, 600.35, false, nil],
                ['Total', nil, 600.35, nil, nil]]

data/examples/license_box.rb

@@ -75,7 +75,7 @@ end
 
 opt.parse! ARGV
 
-@box.add 'The MIT License', :color => :intense_yellow, :align => :center
+@box.add 'The MIT License', :color => 'bold.yellow', :align => :center
 @box.line_break
 @box.add 'Copyright (c) 2013 Marcelo Guimaraes <ataxexe@gmail.com>', :color => :green, :align => :center
 @box.separator

data/examples/list_files.rb

@@ -39,17 +39,17 @@ opt = OptionParser::new
 opt.on '--color TYPE', 'Specify the color type (zebra,file,none)' do |type|
   case type
     when 'zebra'
-      @table.colorize_row :using => Yummi::Colorizers.stripe(:intense_black, :intense_white)
+      @table.colorize_row :using => Yummi::Colorizers.stripe('yellow.bold', 'white.bold')
       @table.bottom do 
-        @table.colorize_row :with => :intense_blue
+        @table.colorize_row :with => 'blue.bold'
         @table.format :size, :using => Yummi::Formatters.byte
       end
     when 'file'
       @table.colorize_row do |data| # or |data, index| if you need the index
-        data[:directory] ? :intense_black : :intense_white
+        data[:directory] ? :intense_black : 'white.bold'
       end
       @table.bottom do 
-        @table.colorize_row :with => :intense_blue
+        @table.colorize_row :with => 'blue.bold'
         @table.format :size, :using => Yummi::Formatters.byte
       end
     when 'none'
@@ -72,6 +72,6 @@ files.each do |f|
   data << [f, File.size(f), File.directory?(f)] # the last value will not be printed
 end
 @table.data = data
-@table << ["Total", @table.column(:size).inject(:+)]
+@table << ['Total', @table.column(:size).inject(:+)]
 
 @table.print

data/examples/logcat_colorizer.rb

@@ -40,7 +40,7 @@ colorizer = Yummi::Colorizers.pattern :prefix => /\[/,
   :suffix => /\]/,
   :patterns => {
     'ERROR' => :red,
-    'FATAL' => :intense_red,
+    'FATAL' => :'red.bold',
     'WARN'  => :yellow,
     'INFO'  => :green,
     'DEBUG' => :black

data/examples/logger.rb

@@ -30,8 +30,8 @@ logger.formatter = Yummi::Formatter::LogFormatter.new do |severity, message|
 end
 
 logger.debug __FILE__
-logger.info "Example started"
-logger.warn "Warning message"
-logger.error "An error has occurred"
-logger.fatal "A fatal exception has occurred"
-logger.unknown "Unknown severity message"
+logger.info 'Example started'
+logger.warn 'Warning message'
+logger.error 'An error has occurred'
+logger.fatal 'A fatal exception has occurred'
+logger.unknown 'Unknown severity message'

data/examples/monitor_table.rb

@@ -27,7 +27,7 @@ opt = OptionParser::new
 
 @table = Yummi::Table::new
 # setting the header sets the aliases automatically
-@table.header = ['Server Name', 'Max Memory', 'Free Memory', "Max Threads", "In Use Threads"]
+@table.header = ['Server Name', 'Max Memory', 'Free Memory', 'Max Threads', 'In Use Threads']
 # sets the title
 @table.title = 'Server Runtime Info'
 # formats memory info for easily reading
@@ -35,7 +35,7 @@ opt = OptionParser::new
 
 @table.bottom do
   @table.format [:max_memory, :free_memory], :using => Yummi::Formatters.byte
-  @table.colorize_row :with => :intense_white
+  @table.colorize_row :with => 'bold.white'
 end
 
 # colorizer for memory
@@ -45,7 +45,7 @@ end
 @thread_colorizer = Yummi::Colorizers.percentage :max => :max_threads,
                                                  :using => :in_use_threads,
                                                  :colors => {
-                                                    :omg => :intense_red
+                                                    :omg => 'bold.red'
                                                   },
                                                  :threshold => {
                                                    :warn => 0.9,
@@ -61,7 +61,7 @@ def full_colors
   @table.colorize :server_name, :with => :magenta
   @table.colorize :free_memory, :using => @memory_colorizer
   @table.colorize :in_use_threads, :using => @thread_colorizer
-  @table.colorize [:max_memory, :max_threads], :with => :black
+  @table.colorize [:max_memory, :max_threads], :with => :white
 end
 
 full_colors
@@ -115,7 +115,7 @@ opt.parse ARGV
 class ServerStatus
   attr_reader :server_name, :max_memory, :free_memory, :max_threads, :in_use_threads
 
-  def initialize server_name, max_memory, free_memory, max_threads, in_use_threads
+  def initialize(server_name, max_memory, free_memory, max_threads, in_use_threads)
     @server_name = server_name
     @max_memory = max_memory
     @free_memory = free_memory

data/lib/yummi.rb

@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 require 'term/ansicolor'
-require_relative "yummi/version"
+require_relative 'yummi/version'
 
 module Yummi
 
@@ -274,8 +274,8 @@ Yummi.no_colors unless Yummi::coloring_supported?
 
 require_relative 'yummi/extensions'
 require_relative 'yummi/data_parser'
-require_relative "yummi/colorizers"
-require_relative "yummi/formatters"
+require_relative 'yummi/colorizers'
+require_relative 'yummi/formatters'
 require_relative 'yummi/table'
 require_relative 'yummi/table_builder'
 require_relative 'yummi/text_box'

data/lib/yummi/colorizers.rb

@@ -85,10 +85,8 @@ module Yummi
     end
 
     # Returns a new instance of #PatternColorizer
-    def self.pattern mappings, level = nil
-      colorizer = PatternColorizer::new(mappings)
-      colorizer.level = level if level
-      colorizer
+    def self.pattern mappings
+      PatternColorizer::new(mappings)
     end
 
     #
@@ -127,7 +125,7 @@ module Yummi
     def self.boolean params = {}
       Yummi::to_colorize do |ctx|
         value = ctx.value
-        if value.to_s.downcase == "true"
+        if value.to_s.downcase == 'true'
           (params[:if_true] or :green)
         else
           (params[:if_false] or :yellow)
@@ -136,10 +134,10 @@ module Yummi
     end
     
     #
-    # A colorizer that uses a set of minimun values to use a color.
+    # A colorizer that uses a set of minimum values to use a color.
     #
     # Parameters:
-    #   - MINIMUN_VALUE: COLOR_TO_USE
+    #   - MINIMUM_VALUE: COLOR_TO_USE
     #
     def self.threshold params
       params = params.dup
@@ -173,7 +171,7 @@ module Yummi
     # :negative => color to use when value is negative
     # :zero => color to use when value is zero
     # :positive => color to use when value is positive
-    # :any => color to use for any value (overridable by the options above)
+    # :any => color to use for any value without specified color
     #
     def self.numeric params
       Yummi::to_format do |ctx|
@@ -228,7 +226,7 @@ module Yummi
     end
 
     #
-    # A colorizer for strings that follows a pattern. This colorizer is usefull
+    # A colorizer for strings that follows a pattern. This colorizer is useful
     # for log files.
     #
     class PatternColorizer
@@ -236,7 +234,7 @@ module Yummi
 
       attr_writer :level
 
-      def initialize mappings = nil
+      def initialize(mappings = nil)
         @patterns = []
         map mappings if mappings
       end
@@ -263,7 +261,7 @@ module Yummi
       #   * $HOME/.yummi/patterns/PATTERN.yaml
       #   * $YUMMI_GEM/yummy/patterns/PATTERN.yaml
       #
-      def map params
+      def map(params)
         if params.is_a? Array
           params.each { |p| map p }
         elsif params.is_a? String or params.is_a? Symbol
@@ -273,14 +271,11 @@ module Yummi
         end
       end
 
-      def call ctx
+      def call(ctx)
         ctx = Yummi::Context::new(ctx) unless ctx.is_a? Context
         text = ctx.value.to_s
         @patterns.each do |config|
-          level = -1
-          config[:patterns].each do |regex, color|
-            level += 1
-            return if @level and level > @level and not @last_color
+          config[:patterns].each_key do |regex|
             if regex.match(text)
               return match(text, config)
             end
@@ -294,16 +289,16 @@ module Yummi
 
       private 
 
-      def config params
+      def config(params)
         Yummi::Helpers.symbolize_keys(params)
-        prefix  = params[:prefix]
-        suffix  = params[:suffix]
+        prefix = params[:prefix]
+        suffix = params[:suffix]
         options = params[:options]
-        mode    = (params[:mode] or :all)
+        mode = (params[:mode] or :all)
 
         patterns = Hash[*(params[:patterns].collect do |pattern, color|
           [
-            Regexp::new("#{prefix}#{pattern.to_s}#{suffix}",options),
+            Regexp::new("#{prefix}#{pattern.to_s}#{suffix}", options),
             color
           ]
         end).flatten]
@@ -350,7 +345,7 @@ module Yummi
         @count = -1
       end
 
-      def call *args
+      def call(*args)
         @count += 1
         @colors[@count % @colors.size]
       end

data/lib/yummi/extensions.rb

@@ -27,7 +27,7 @@ module Yummi
     # Returns the string wrapped in a #Yummi#TextBox. The given parameters will be used
     # to instantiate the TextBox.
     #
-    def on_box params = {}
+    def on_box(params = {})
       box = Yummi::TextBox::new params
       box.add self
       return box
@@ -47,9 +47,9 @@ class String
   # If params is a hash, the keys will be used as a regexp and the
   # result of #gsub will be colorized using the value color.
   #
-  # Otherwise, the params will be sended to Yummi#colorize
+  # Otherwise, the params will be sent to Yummi#colorize
   #
-  def colorize params
+  def colorize(params)
     if params.is_a? Hash
       text = self
       params.each do |regexp, color|
@@ -67,8 +67,8 @@ class Array
   #
   # Colorizes each array item in a new String array
   #
-  def colorize params
-    map {|n| n.to_s.colorize params}
+  def colorize(params)
+    map { |n| n.to_s.colorize params }
   end
 
   #
@@ -83,7 +83,7 @@ class Array
   #
   # The parameters will be used to instantiate the table.
   #
-  def on_table params = {}
+  def on_table(params = {})
     table = Yummi::Table::new params
     table.data = self
     return table

data/lib/yummi/formatters.rb

@@ -52,10 +52,10 @@ module Yummi
     def self.boolean params = {}
       Yummi::to_format do |ctx|
         value = ctx.value
-        if value.to_s.downcase == "true"
-          (params[:if_true] or "Yes")
+        if value.to_s.downcase == 'true'
+          (params[:if_true] or 'Yes')
         else 
-          (params[:if_false] or "No")
+          (params[:if_false] or 'No')
         end
       end
     end
@@ -84,7 +84,7 @@ module Yummi
     # :negative => format to use when value is negative
     # :zero => format to use when value is zero
     # :positive => format to use when value is positive
-    # :any => format to use for any value (overridable by the options above)
+    # :any => format to use for any value without a specific format
     #
     def self.numeric params
       Yummi::to_format do |ctx|

data/lib/yummi/logger.rb

@@ -56,14 +56,14 @@ module Yummi
       # If a block is passed, it will be used to format the message. The block can use
       # the following variables: severity, time, program_name and message.
       #
-      def initialize colors = {}, &block
+      def initialize(colors = {}, &block)
         @colors = {
-          :debug => :blue,
-          :info => :white,
-          :warn => :yellow,
-          :error => :red,
-          :fatal => :intense_red,
-          :any => :intense_black
+            :debug => :blue,
+            :info => :white,
+            :warn => :yellow,
+            :error => :red,
+            :fatal => 'bold.red',
+            :any => 'bold.black'
         }.merge! colors
         @format_block = block
       end
@@ -76,13 +76,13 @@ module Yummi
       end
 
       # Formats the message, override this method instead of #call
-      def output severity, time, program_name, message
+      def output(severity, time, program_name, message)
         if @format_block
           context = {
-            :severity => severity,
-            :time => time,
-            :program_name => program_name,
-            :message => message
+              :severity => severity,
+              :time => time,
+              :program_name => program_name,
+              :message => message
           }
           block_call(context, &@format_block) << $/
         else

data/lib/yummi/patterns/jboss.yaml

@@ -1,3 +1,4 @@
+# A pattern for JBoss AS logs, works for versions 5 and above
 prefix: '(\d{4}-\d{2}-\d{2}\s)?\d{2}:\d{2}:\d{2},\d{3}\s'
 patterns:
   TRACE : cyan

data/lib/yummi/patterns/log.yaml

@@ -1,3 +1,4 @@
+# A common log pattern
 prefix: '.*'
 options: i
 patterns:

data/lib/yummi/patterns/weblogic.yaml

@@ -1,3 +1,4 @@
+# A pattern for weblogic server log (but not for the diagnostic logs)
 prefix: '####<[^>]+>\s<'
 suffix: '>'
 patterns:

data/lib/yummi/patterns/webserver.yaml

@@ -0,0 +1,15 @@
+# Based on NCSA Common log format and applies colors using http status codes
+# The suffix approach is more easy to understand than using a prefix, the two
+# last numbers are http status and the total bytes, so, we only parse the status
+suffix: \d{2}\s\d+$
+patterns:
+  # info
+  1 : white
+  # success
+  2 : green
+  # redirect
+  3 : yellow
+  # client error
+  4 : red
+  # server error
+  5 : bold.red

data/lib/yummi/table.rb

@@ -50,7 +50,7 @@ module Yummi
     attr_reader :layout
     # The table header
     attr_reader :header
-    
+
     #
     # Creates a new table. A hash containing the style properties may be given to override
     # the defaults.
@@ -75,10 +75,10 @@ module Yummi
       @title = (params.title or nil)
       @description = (params.description or nil)
       @style = {
-        :title => (params.style[:title] or "bold.yellow"),
-        :description => (params.style[:description] or "bold.black"),
-        :header => (params.style[:header] or "bold.blue"),
-        :value => (params.style[:color] or nil)
+          :title => (params.style[:title] or 'bold.yellow'),
+          :description => (params.style[:description] or 'bold.black'),
+          :header => (params.style[:header] or 'bold.blue'),
+          :value => (params.style[:color] or nil)
       }
 
       @colspan = (params.colspan or 2)
@@ -98,9 +98,9 @@ module Yummi
     # Indicates that the table should not use colors.
     def no_colors
       @style = {
-        :title => nil,
-        :header => nil,
-        :value => nil
+          :title => nil,
+          :header => nil,
+          :value => nil
       }
       @no_colors = true
     end
@@ -123,7 +123,7 @@ module Yummi
     #   end
     #   table.bottom { table.colorize :total, :with => :white }
     #
-    def bottom params = {}, &block
+    def bottom(params = {}, &block)
       index = @contexts.size
       _context_ index, params, &block
     end
@@ -146,7 +146,7 @@ module Yummi
     #   end
     #   table.top { table.colorize :total, :with => :white }
     #
-    def top params = {}, &block
+    def top(params = {}, &block)
       _context_ 0, params, &block
     end
 
@@ -196,7 +196,7 @@ module Yummi
     #
     # This will create the following aliases: :name, :email, :work_phone and :home_phone
     #
-    def header= (header)
+    def header=(header)
       header = [header] unless header.respond_to? :each
       @header = normalize(header)
       @aliases = header.map do |n|
@@ -219,7 +219,7 @@ module Yummi
     #   table.align :description, :left
     #   table.align [:value, :total], :right
     #
-    def align (indexes, type)
+    def align(indexes, type)
       [*indexes].each do |index|
         index = parse_index(index)
         raise Exception::new "Undefined column #{index}" unless index
@@ -236,13 +236,13 @@ module Yummi
     #
     #   table.colorize_row { |i, row| :red if row[:value] < 0 }
     #
-    def colorize_row (params = nil, &block)
+    def colorize_row(params = nil, &block)
       obj = extract_component(params, &block)
       component[:row_colorizer] = obj
     end
 
     # Sets the table data
-    def data= (data)
+    def data=(data)
       @data = data
     end
 
@@ -250,7 +250,7 @@ module Yummi
     # Adds the given data as a row. If the argument is a hash, its keys will be used
     # to match header alias for building the row data.
     #
-    def add (row)
+    def add(row)
       @data << row
     end
 
@@ -278,7 +278,7 @@ module Yummi
     #   table.colorize :description, :with => :magenta
     #   table.colorize([:value, :total]) { |value| :red if value < 0 }
     #
-    def colorize (indexes, params = {}, &block)
+    def colorize(indexes, params = {}, &block)
       [*indexes].each do |index|
         index = parse_index(index)
         if index
@@ -300,7 +300,7 @@ module Yummi
     #     - :using defines the component to use
     #     - :with defines the format to use
     #
-    def colorize_null (params = {}, &block)
+    def colorize_null(params = {}, &block)
       component[:null_colorizer] = (params[:using] or block)
       component[:null_colorizer] ||= proc do |value|
         params[:with]
@@ -328,7 +328,7 @@ module Yummi
     #   table.format :value, :with => '%.2f'
     #   table.format [:value, :total], :with => '%.2f'
     #
-    def format (indexes, params = {}, &block)
+    def format(indexes, params = {}, &block)
       [*indexes].each do |index|
         index = parse_index(index)
         if index
@@ -352,7 +352,7 @@ module Yummi
     #     - :using defines the component to use
     #     - :with defines the format to use
     #
-    def format_null (params = {}, &block)
+    def format_null(params = {}, &block)
       component[:null_formatter] = (params[:using] or block)
       component[:null_formatter] ||= proc do |value|
         params[:with] % value
@@ -362,7 +362,7 @@ module Yummi
     #
     # Prints the #to_s into the given object.
     #
-    def print (to = $stdout)
+    def print(to = $stdout)
       to.print to_s
     end
 
@@ -373,7 +373,7 @@ module Yummi
       header_output = build_header_output
       data_output = build_data_output
 
-      string = ""
+      string = ''
       string << Yummi.colorize(@title, @style[:title]) << $/ if @title
       string << Yummi.colorize(@description, @style[:description]) << $/ if @description
       table_data = header_output + data_output
@@ -398,7 +398,7 @@ module Yummi
 
     private
 
-    def extract_component params, &block
+    def extract_component(params, &block)
       if params and params[:using]
         params[:using]
       elsif params and params[:with]
@@ -408,15 +408,15 @@ module Yummi
       end
     end
 
-    def _define_ context
+    def _define_(context)
       @components[context] = {
-        :formatters => [],
-        :colorizers => [],
-        :row_colorizer => nil,
+          :formatters => [],
+          :colorizers => [],
+          :row_colorizer => nil,
       }
     end
 
-    def _context_ index, params, &block
+    def _context_(index, params, &block)
       params ||= {}
       rows = (params[:rows] or 1)
       ctx = @contexts.size
@@ -432,7 +432,7 @@ module Yummi
     # Gets the content string for the given color map and content
     #
     def content (data)
-      string = ""
+      string = ''
       data.each_index do |i|
         row = data[i]
         row.each_index do |j|
@@ -531,13 +531,13 @@ module Yummi
         end
 
         _row_data = normalize(
-          _row_data,
-          :extract => proc do |data|
-            data[:value].to_s
-          end,
-          :new => proc do |value, data|
-            {:value => value, :color => data[:color]}
-          end
+            _row_data,
+            :extract => proc do |data|
+              data[:value].to_s
+            end,
+            :new => proc do |value, data|
+              {:value => value, :color => data[:color]}
+            end
         )
         _row_data.each do |_row|
           output << _row
@@ -552,34 +552,36 @@ module Yummi
       if row.is_a? Hash
         @aliases.each_index do |column_index|
           obj = TableContext::new(
-            :obj => row,
-            :row_index => row_index,
-            :column_index => column_index,
-            :value => row[@aliases[column_index]]
+              :obj => row,
+              :row_index => row_index,
+              :column_index => column_index,
+              :value => row[@aliases[column_index]]
           )
           array << obj
         end
       elsif row.is_a? Array
         row.each_index do |column_index|
           obj = TableContext::new(
-            :obj => IndexedData::new(@aliases, row),
-            :row_index => row_index,
-            :column_index => column_index,
-            :value => row[column_index]
+              :obj => IndexedData::new(@aliases, row),
+              :row_index => row_index,
+              :column_index => column_index,
+              :value => row[column_index]
           )
           array << obj
         end
       else
         @aliases.each_index do |column_index|
           obj = TableContext::new(
-            :obj => row,
-            :row_index => row_index,
-            :column_index => column_index,
-            :value => row.send(@aliases[column_index])
+              :obj => row,
+              :row_index => row_index,
+              :column_index => column_index,
+              :value => row.send(@aliases[column_index])
           )
+
           def obj.[] (index)
             obj.send(index)
           end
+
           array << obj
         end
       end
@@ -644,7 +646,7 @@ module Yummi
 
     attr_reader :row_index, :column_index
 
-    def initialize params
+    def initialize(params)
       @row_index = params[:row_index]
       @column_index = params[:column_index]
       @value = params[:value]

data/lib/yummi/table_builder.rb

@@ -25,16 +25,16 @@ module Yummi
 
     attr_accessor :config, :repositories
 
-    def initialize config = {}
+    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_colorizers] = [Yummi::Colorizers]    
+
+      @repositories[:formatters] = [Yummi::Formatters]
+      @repositories[:colorizers] = [Yummi::Colorizers]
+      @repositories[:row_colorizers] = [Yummi::Colorizers]
     end
 
     def defaults
@@ -56,7 +56,7 @@ module Yummi
       @components
     end
 
-    def component keys, params
+    def component(keys, params)
       [*keys].each do |key|
         components[key] = params
       end

data/lib/yummi/text_box.rb

@@ -47,7 +47,7 @@ module Yummi
     #
     #   TextBox::new :align => :center, :border => {:color => :red}, :separator => {:color => :green}
     #
-    def initialize params = {}
+    def initialize(params = {})
       params = OpenStruct::new params
       params.separator ||= {}
       params.border ||= {}
@@ -60,11 +60,11 @@ module Yummi
       @style.separator = {}
       @style.separator[:pattern] = (params.separator[:pattern] or '-')
       @style.separator[:width] = (params.separator[:width] or nil)
-      @style.separator[:color] = (params.separator[:color] or "bold.black")
+      @style.separator[:color] = (params.separator[:color] or 'bold.black')
       @style.separator[:align] = (params.separator[:align] or :left)
 
       @style.border = {}
-      @style.border[:color] = (params.border[:color] or "bold.black")
+      @style.border[:color] = (params.border[:color] or 'bold.black')
       @style.border[:top] = (params.border[:top] or '-')
       @style.border[:bottom] = (params.border[:bottom] or '-')
       @style.border[:left] = (params.border[:left] or '|')
@@ -147,7 +147,7 @@ module Yummi
     def separator (params = {})
       params = style.separator.merge params
       params[:width] ||= style.width
-      raise Exception::new("Define a width for using separators") unless params[:width]
+      raise Exception::new('Define a width for using separators') unless params[:width]
       line = fill(params[:pattern], params[:width])
       #replace the width with the box width to align the separator
       params[:width] = style.width

data/lib/yummi/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Yummi
-  VERSION = "0.9.2"
+  VERSION = '0.9.3'
 end

data/yummi.iml

@@ -7,10 +7,11 @@
       <sourceFolder url="file://$MODULE_DIR$/examples" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/pkg" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.0.0-p247" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.2.3, RVM: ruby-1.9.3-p374) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="term-ansicolor (v1.1.5, RVM: ruby-1.9.3-p374) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.3, RVM: ruby-2.0.0-p247) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="term-ansicolor (v1.3.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tins (v0.12.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">

data/yummi.ipr

@@ -4,9 +4,6 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-  </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
@@ -52,6 +49,7 @@
   <component name="GradleUISettings2">
     <setting name="root" />
   </component>
+  <component name="IdProvider" IDEtalkID="18FE041D1C5C0BC3581F29459CFA0C24" />
   <component name="InspectionProjectProfileManager">
     <profiles>
       <profile version="1.0" is_locked="false">

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Ataxexe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 description: A tool to colorize your console application.
@@ -32,8 +32,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rakeTasks
+- ".gitignore"
+- ".rakeTasks"
 - Gemfile
 - LICENSE
 - README.md
@@ -58,6 +58,7 @@ files:
 - lib/yummi/patterns/jboss.yaml
 - lib/yummi/patterns/log.yaml
 - lib/yummi/patterns/weblogic.yaml
+- lib/yummi/patterns/webserver.yaml
 - lib/yummi/table.rb
 - lib/yummi/table_builder.rb
 - lib/yummi/text_box.rb
@@ -74,12 +75,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []