yummi 0.8.1 → 0.9.0

data/README.md

@@ -1,6 +1,7 @@
 # Yummi
 
-This is a tool to colorize your console app.
+This is a tool to make your console app more tasty. Yummi provides a set of console line elements
+also with a delegator for colorizing Strings using the awesome gem term-ansicolor.
 
 ## Installation
 
@@ -46,7 +47,7 @@ Example:
     patterns:
       TRACE : cyan
       DEBUG : blue
-      INFO  : gray
+      INFO  : black
       WARN  : yellow
       ERROR : red
       FATAL : intense_red

data/bin/yummi

@@ -27,20 +27,10 @@ require 'optparse'
 
 @params = []
 
-def get_input message, default
-  puts(message.colorize(:blue) << ": " << " [#{default}]".colorize(:yellow))
-  input = gets.chomp
-  return default if input.empty?
-  input
-end
-
 opt = OptionParser::new
 opt.on '-c COLOR', '--color=COLOR', 'Colorize using the given color' do |color|
   @color = color
 end
-opt.on '-s STYLE', '--style=STYLE', Array, 'Sets the styles to use (bold, highlight, underline, blink, ...)' do |styles|
-  @styles = styles
-end
 opt.on '-f FORMAT', '--format=FORMAT', 'Sets the format to use (a "%s" means the colorized message)' do |format|
   @format = format
 end
@@ -67,27 +57,6 @@ opt.on '-l FILES', '--load=FILES', Array, 'Include the files for extending compo
     load File.expand_path(file)
   end
 end
-opt.on '--shell-script', 'Outputs a shell script program to colorize texts without a ruby environment' do 
-  abort "Environment not supported" unless Yummi::Color::supported?
-  
-  generator = Yummi::Generator::ShellScript::new
-  puts generator.generate
-  exit 0
-end
-opt.on '--install', 'Installs a shell script program to colorize texts without a ruby environment' do 
-  abort "Environment not supported" unless Yummi::Color::supported?
-
-  puts ".: Yummi shell script installation :.".colorize(:bold_yellow)
-  name = get_input "Program name", "colorize"
-  location = File.expand_path(get_input("Install location", "~/bin"))
-  file = File.join(location, name)
-
-  generator = Yummi::Generator::ShellScript::new
-  generator.install file
-
-  puts "Program installed!".colorize(:bold_green)
-  exit 0
-end
 opt.on '-h', '--help', 'Display this help message' do
   puts opt
   exit 0
@@ -102,7 +71,7 @@ opt.parse! ARGV
 
 def print_out message
   output_text = if @color
-    Yummi::colorize message, @color, @styles
+    Yummi::colorize message, @color
   elsif @colorizer
     @colorizer.colorize message
   end
@@ -129,6 +98,6 @@ else
       print_out line.chomp
     end
   rescue Interrupt
-    puts Yummi::colorize("Aborted!", :red)
+    puts "Aborted!".red
   end
 end

data/examples/cash_flow_table.yaml

@@ -18,9 +18,9 @@ format:
     with: none
 color:
   description:
-    with: purple
+    with: magenta
   authentication_code:
-    with: highlight_gray
+    with: black.on_intense_white
   eletronic:
     boolean:
       if_true: blue
@@ -28,7 +28,7 @@ color:
   value,total:
     numeric:
       positive: green
-      zero: gray
+      zero: white
       negative: red
   undefined:
     with: red
@@ -43,7 +43,7 @@ top:
           zero: "%.2f"
           negative: "%.2f"
     row_color:
-      with: bold_white
+      with: intense_white
 bottom:
   - format:
       total:
@@ -52,4 +52,4 @@ bottom:
           zero: "%.2f"
           negative: "%.2f"
     row_color:
-      with: bold_white
+      with: intense_white

data/examples/license_box.rb

@@ -27,8 +27,8 @@ require_relative '../lib/yummi'
 
 @box.style.width = 70
 @box.style.align = :justify
-@box.style.separator[:color] = :purple
-@box.style.border[:color] = :intense_purple
+@box.style.separator[:color] = :magenta
+@box.style.border[:color] = :intense_magenta
 
 opt = OptionParser::new
 

data/examples/list_files.rb

@@ -39,14 +39,14 @@ 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_gray, :intense_white)
+      @table.colorize_row :using => Yummi::Colorizers.stripe(:intense_black, :intense_white)
       @table.bottom do 
         @table.colorize_row :with => :intense_blue
         @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_gray : :intense_white
+        data[:directory] ? :intense_black : :intense_white
       end
       @table.bottom do 
         @table.colorize_row :with => :intense_blue

data/examples/logcat_colorizer.rb

@@ -43,7 +43,7 @@ colorizer = Yummi::Colorizers.pattern :prefix => /\[/,
     'FATAL' => :intense_red,
     'WARN'  => :yellow,
     'INFO'  => :green,
-    'DEBUG' => :gray
+    'DEBUG' => :black
   }
 
 log.each_line do |line|

data/examples/monitor_table.rb

@@ -54,14 +54,14 @@ end
                                                  }
 
 def zebra_colors
-  @table.colorize_row :using => Yummi::Colorizers.stripe(:yellow, :purple)
+  @table.colorize_row :using => Yummi::Colorizers.stripe(:yellow, :magenta)
 end
 
 def full_colors
-  @table.colorize :server_name, :with => :purple
+  @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 => :gray
+  @table.colorize [:max_memory, :max_threads], :with => :black
 end
 
 full_colors

data/lib/yummi.rb

@@ -20,142 +20,47 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'set'
+require 'term/ansicolor'
 require_relative "yummi/version"
 
 module Yummi
-  # Base for colorizing
-  module Color
-
-    # The Color Schema Definition
-    module Schema
-      # Normal Linux Terminal Colors, used by default in normal color types
-      NORMAL_COLORS = {
-        :colors => [:black, :red, :green, [:yellow, :orange], :blue, [:purple, :magenta], :cyan, [:gray, :white]],
-        :default => :white
-      }
-      # Intense Linux Terminal Colors, used by default in bold color types
-      ALTERNATE_COLORS = {
-        :colors => [:gray, :red, :green, :yellow, :blue, [:purple, :magenta], :cyan, :white],
-        :default => :gray
-      }
-    end
-
-    # Color mappings
-    COLORS = {}
-
-    #
-    # Checks if the environment is supported by Yummi.
-    #
-    # Currently (known) unsupported environments are:
-    #   * Windows
-    #
-    def self.supported?
-      not RUBY_PLATFORM['mingw'] #Windows
-    end
-
-    #
-    # Clears all color mappings and add this ones
-    #
-    # see #add_color_map
-    #
-    def self.load_color_map mappings
-      COLORS.clear
-      add_color_map mappings
-    end
-
-    #
-    # Adds the given color mappings, overriding the already defined.
-    #
-    # Colors are printed using a "[#{type_key_code}:3#{color_key_code}m" prefix.
-    #
-    # === Args
-    #
-    # The mappings is a Hash of Hashes, each parent hash must define a type key and the
-    # child hash must contain the following keys:
-    #
-    # +key_code+::
-    #   The key code to map this type. If the type name is :default, the mapping will not
-    #   use the name "default" (:normal_red will become only :red)
-    # +schema+::
-    #   An array with the color names. Each name will be mapped and their positions
-    #  (1 based) too. (:intense_red and :intense_2, for example)
-    #
-    def self.add_color_map mappings
-      mappings.each do |types, config|
-        [*types].each do |type|
-          schema = config[:schema]
-          schema[:colors].each_with_index do |colors, key_code|
-            [*colors].each do |color|
-              # maps the default color for a type
-              COLORS[type] = "#{config[:key_code]}#{key_code}" if color == schema[:default]
-              # do not use prefix if schema is default
-              prefix = (type == :default ? '' : "#{type}_")
-              # maps the color using color name
-              key = "#{prefix}#{color}"
-              COLORS[key.to_sym] = "#{config[:key_code]}#{key_code}"
-              # maps the color using color key code
-              key = "#{prefix}#{key_code + 1}"
-              COLORS[key.to_sym] = "#{config[:key_code]}#{key_code}"
-              # maps the color using color name if default schema does not defines it
-              # example: yellow and white are present only in strong/intense schema
-              COLORS[color.to_sym] = "#{config[:key_code]}#{key_code}" unless COLORS[color]
-            end
-          end
-        end
-      end
-    end
-
-    # Escape the given text with the given color code
-    def self.escape key
-      return key unless key and COLORS[key.to_sym]
-      "\e[#{COLORS[key.to_sym]}m"
-    end
-
-    # Colorize the given text with the given color
-    def self.colorize string, color
-      return string if color.to_s == 'none'
-      color, end_color = [color, "\e[0;0m"].map { |key| Color.escape(key) }
-      color ? "#{color}#{string}#{end_color}" : string
-    end
 
+  #
+  # Checks if the environment is supported by Yummi.
+  #
+  # Currently (known) unsupported environments are:
+  #   * Windows
+  #
+  def self.supported?
+    not RUBY_PLATFORM['mingw'] #Windows
   end
 
-  # 
-  # Colorizes the text using the given color.
-  # 
-  # Examples:
   #
-  #   Yummi.colorize "message", :red # produces a red text
-  #   Yummi.colorize "message", :bold_red # produces a bold (intensive) red text
-  #   Yummi.colorize "message", :red , :bold # produces a red text
+  # Colorizes the given string with the given color
+  # 
+  # The color may be an integer, a string or a dot
+  # separated color style (ex: "bold.yellow" or 
+  # "underline.bold.green").
   # 
-  # see #Color#colorize
+  # Since this method delegates to Term::ANSIColor,
+  # the given color should be compatible with it.
   #
-  def self.colorize string, color, styles = []
-    styles ||= [] # prevents nil arguments
-    #check if there is more than one color classifier
-    if styles.empty?
-      styles = color.to_s.split(/_/)
-      color = styles.last
-      styles.delete_at(-1)
-    end
-    unless styles.empty?
-      [*styles].each do |style|
-        string = Color.colorize(string, "#{style}_#{color}")
-      end
-      string
+  def self.colorize string, color
+    return string unless color
+    if color.is_a? Fixnum
+      string.color color
+    elsif color.match(/\./)
+      result = string
+      color.to_s.split(/\./).each { |c| result = colorize(result, c) }
+      result
+    elsif color.match(/\d+/)
+      string.color color.to_i
     else
-      Color.colorize string, color
+      string.send color
     end
   end
 
-  #
-  # Extracts the text from a colorized string
-  #
-  def self.uncolorize string
-    string.gsub(/\e\[\d;\d{2}m/, '').gsub(/\e\[0;0m/, '')
-  end
-
   # A module to align texts based on a reference width
   module Aligner
 
@@ -323,7 +228,7 @@ module Yummi
 
     def self.load_resource name, params = {:from => ''}
       file = File.expand_path name.to_s
-      if File.exist? file
+      if File.file? file
         return YAML::load_file(file)
       else
         from = params[:from].to_s
@@ -357,18 +262,16 @@ module Yummi
 
 end
 
-require_relative 'yummi/no_colors' unless Yummi::Color::supported?
+require_relative 'yummi/no_colors' unless Yummi::supported?
 
 require_relative 'yummi/extensions'
 require_relative 'yummi/data_parser'
 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'
-require_relative 'yummi/generator'
 
 # if the output is being piped, turn off the colors
 unless $stdout.isatty

data/lib/yummi/colorizers.rb

@@ -326,6 +326,7 @@ module Yummi
       # Creates a new colorizer using the given colors
       def initialize (*colors)
         @colors = colors.flatten
+        @colors = [nil] if @colors.empty?
         @count = -1
       end
 

data/lib/yummi/extensions.rb

@@ -21,11 +21,16 @@
 # THE SOFTWARE.
 
 class String
+  include Term::ANSIColor
 
-  def uncolorize
-    Yummi::uncolorize self
-  end
-
+  #
+  # Colorizes the string using #Yummi#colorize
+  # 
+  # 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
+  #
   def colorize params
     if params.is_a? Hash
       text = self
@@ -37,4 +42,43 @@ class String
     Yummi::colorize self, params
   end
 
+  #
+  # Returns the string wrapped in a #Yummi#TextBox. The given parameters will be used
+  # to instantiate the TextBox.
+  #
+  def on_box params = {}
+    box = Yummi::TextBox::new params
+    box.add self
+    return box
+  end
+
+end
+
+class Array
+
+  #
+  # Colorizes each array item in a new String array
+  #
+  def colorize params
+    map {|n| n.to_s.colorize params}
+  end
+
+  #
+  # Returns a new array using the items with no color applied
+  #
+  def uncolored
+    map {|n| n.to_s.uncolored}
+  end
+
+  #
+  # Returns a #Yummi#Table using the array content as the data.
+  #
+  # The parameters will be used to instantiate the table.
+  #
+  def on_table params = {}
+    table = Yummi::Table::new params
+    table.data = self
+    return table
+  end
+
 end

data/lib/yummi/logger.rb

@@ -51,7 +51,7 @@ module Yummi
       # * +WARN+: yellow
       # * +ERROR+: red
       # * +FATAL+: red (intense)
-      # * +ANY+: gray (intense)
+      # * +ANY+: black (intense)
       #
       # 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.
@@ -63,7 +63,7 @@ module Yummi
           :warn => :yellow,
           :error => :red,
           :fatal => :intense_red,
-          :any => :intense_gray
+          :any => :intense_black
         }.merge! colors
         @format_block = block
       end
@@ -72,7 +72,7 @@ module Yummi
 
       def call(severity, time, program_name, message)
         color = @colors[severity.downcase.to_sym]
-        Yummi::Color.colorize output(severity, time, program_name, message), color
+        Yummi::colorize output(severity, time, program_name, message), color
       end
 
       # Formats the message, override this method instead of #call

data/lib/yummi/no_colors.rb

@@ -20,14 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module Yummi
-
-  module Color
-
-    def self.colorize(str, color)
-      str
-    end
-
-  end
-
-end
+Term::ANSIColor::coloring = false

data/lib/yummi/patterns/jboss.yaml

@@ -5,4 +5,4 @@ patterns:
   INFO  : white
   WARN  : yellow
   ERROR : red
-  FATAL : intense_red
+  FATAL : bold.red

data/lib/yummi/patterns/log.yaml

@@ -8,4 +8,4 @@ patterns:
   NOTIFICATION : yellow
   ERROR        : red
   SEVERE       : red
-  FATAL        : intense_red
+  FATAL        : bold.red

data/lib/yummi/patterns/weblogic.yaml

@@ -1,12 +1,12 @@
 prefix: '####<[^>]+>\s<'
 suffix: '>'
 patterns:
-  Trace     : purple
+  Trace     : magenta
   Debug     : blue
   Info      : white
   Notice    : cyan
   Warning   : yellow
   Error     : red
-  Critical  : intense_red
-  Alert     : intense_red
-  Emergency : intense_red
+  Critical  : bold.red
+  Alert     : bold.red
+  Emergency : bold.red

data/lib/yummi/table.rb

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'ostruct'
+
 module Yummi
   # A Table that supports colorizing title, header, values and also formatting the values.
   class Table
@@ -47,28 +49,39 @@ module Yummi
     # The table header
     attr_reader :header
     
-    # Creates a new table with the default attributes:
-    #
-    # * Title color: intense_yellow
-    # * Header color: intense_blue
-    # * Values color: none
-    # * Colspan: 2
-    # * Default Align: right and first element to left
-    def initialize
+    #
+    # Creates a new table. A hash containing the style properties may be given to override
+    # the defaults.
+    #
+    # * Title (title): none
+    # * Description (description): none
+    # * Header (header): none
+    #
+    # Hash in "style" key:
+    #
+    # * Title color (title): bold.yellow
+    # * Header color (header): bold.blue
+    # * Values color (color): none
+    # * Colspan (colspan): 2
+    # * Default Align (align): right and first element to left
+    #
+    def initialize params = {}
+      params = OpenStruct::new params
+      params.style ||= {}
       @data = []
       @header = []
-      @title = nil
-      @description = nil
+      @title = (params.title or nil)
+      @description = (params.description or nil)
       @style = {
-        :title => :intense_yellow,
-        :description => :intense_gray,
-        :header => :intense_blue,
-        :value => 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 = 2
-      @layout = :horizontal
-      @default_align = :right
+      @colspan = (params.colspan or 2)
+      @layout = (params.layout or :horizontal)
+      @default_align = (params.align or :right)
       @aliases = []
 
       @align = [:left]
@@ -76,6 +89,8 @@ module Yummi
       @contexts = [:default]
       _define_ :default
       @current_context = :default
+
+      self.header = params.header if params.header
     end
 
     # Indicates that the table should not use colors.
@@ -256,7 +271,7 @@ module Yummi
     #
     # === Example
     #
-    #   table.colorize :description, :with => :purple
+    #   table.colorize :description, :with => :magenta
     #   table.colorize([:value, :total]) { |value| :red if value < 0 }
     #
     def colorize (indexes, params = {}, &block)
@@ -355,8 +370,8 @@ module Yummi
       data_output = build_data_output
 
       string = ""
-      string << Color.colorize(@title, @style[:title]) << $/ if @title
-      string << Color.colorize(@description, @style[:description]) << $/ if @description
+      string << Yummi.colorize(@title, @style[:title]) << $/ if @title
+      string << Yummi.colorize(@description, @style[:description]) << $/ if @description
       table_data = header_output + data_output
       if @layout == :vertical
         # don't use array transpose because the data may differ in each line size
@@ -365,6 +380,18 @@ module Yummi
       string << content(table_data)
     end
 
+    #
+    # Calculates the table width using the rendered lines
+    #
+    def width
+      string = to_s
+      max_width = 0
+      string.each_line do |line|
+        max_width = [max_width, line.uncolored.chomp.size].max
+      end
+      max_width
+    end
+
     private
 
     def extract_component params, &block

data/lib/yummi/text_box.rb

@@ -31,34 +31,48 @@ module Yummi
     #
     # Holds the style information for this box. Supported properties are:
     # 
-    # width: the box width (default: none)
+    # width: the box width (default: bold.black)
     # align: the default alignment to use (default: left)
     # separator: the style for separators, defined as a hash
-    #   color: separator color (default: none)
+    #   color: separator color (default: bold.black)
     #   pattern: separator pattern (default: '-')
     #   width: separator width (default: box width)
     # 
     attr_reader :style    
 
-    def initialize
-      @color = :white
+    #
+    # Initializes a text box using the parameters to define the style
+    #
+    # Example:
+    #
+    #   TextBox::new :align => :center, :border => {:color => :red}, :separator => {:color => :green}
+    #
+    def initialize params = {}
+      params = OpenStruct::new params
+      params.separator ||= {}
+      params.border ||= {}
       @content = []
       @style = OpenStruct::new
+
+      @style.width = (params.width or nil)
+      @style.align = (params.align or :left)
+
       @style.separator = {}
-      @style.separator[:pattern] = '-'
-      @style.separator[:width] = nil
-      @style.separator[:align] = :left
+      @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[:align] = (params.separator[:align] or :left)
 
       @style.border = {}
-      @style.border[:color] = nil
-      @style.border[:top] = '-'
-      @style.border[:bottom] = '-'
-      @style.border[:left] = '|'
-      @style.border[:right] = '|'
-      @style.border[:top_left] = '+'
-      @style.border[:top_right] = '+'
-      @style.border[:bottom_left] = '+'
-      @style.border[:bottom_right] = '+'
+      @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 '|')
+      @style.border[:right] = (params.border[:right] or '|')
+      @style.border[:top_left] = (params.border[:top_left] or '+')
+      @style.border[:top_right] = (params.border[:top_right] or '+')
+      @style.border[:bottom_left] = (params.border[:bottom_left] or '+')
+      @style.border[:bottom_right] = (params.border[:bottom_right] or '+')
     end
 
     def no_border
@@ -77,6 +91,7 @@ module Yummi
     #     color: the text color (see #Yummi#COLORS)
     #     width: the text maximum width. Set this to break the lines automatically.
     #            If the #width is set, this will override the box width for this lines.
+    #     raw:   if true, the entire text will be used as one word to align the text.
     #     align: the text alignment (see #Yummi#Aligner)
     #
     def add (text, params = {})
@@ -86,7 +101,8 @@ module Yummi
       }.merge! params
       if params[:width]
         width = params[:width]
-        words = text.gsub($/, ' ').split(' ')
+        words = text.gsub($/, ' ').split(' ') unless params[:raw]
+        words ||= [text]
         buff = ''
         words.each do |word|
           # go to next line if the current word blows up the width limit
@@ -128,7 +144,7 @@ module Yummi
     #     align: the separator alignment (see #Yummi#Aligner)
     #
     def separator (params = {})
-      params = style.separator.merge! params
+      params = style.separator.merge params
       params[:width] ||= style.width
       raise Exception::new("Define a width for using separators") unless params[:width]
       line = fill(params[:pattern], params[:width])
@@ -151,7 +167,7 @@ module Yummi
       width = 0
       sizes = [] # the real size of each line
       content.each do |line|
-        size = line.chomp.uncolorize.size
+        size = line.chomp.uncolored.size
         sizes << size
         width = [width, size].max
       end

data/lib/yummi/version.rb

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

data/yummi.gemspec

@@ -8,6 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = "A tool to colorize your console application."
   gem.homepage      = "https://github.com/ataxexe/yummi"
 
+  gem.add_dependency 'term-ansicolor', '>=1.1'
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/yummi.iml

@@ -5,12 +5,11 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/examples" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/pkg" />
     </content>
-    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p194" jdkType="RUBY_SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.2.3, RVM: ruby-1.9.3-p374) [gem]" level="application" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">

data/yummi.ipr

@@ -23,7 +23,11 @@
       <entry name="?*.ftl" />
       <entry name="trace.info" />
     </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true" />
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
   </component>
   <component name="CopyrightManager" default="MIT">
     <copyright>
@@ -82,6 +86,11 @@
     <option name="LOCALE" />
     <option name="OPEN_IN_BROWSER" value="true" />
   </component>
+  <component name="Jenkins.Application.Settings">
+    <option name="rssSettings">
+      <RssSettings />
+    </option>
+  </component>
   <component name="ModuleEditorState">
     <option name="LAST_EDITED_MODULE_NAME" />
     <option name="LAST_EDITED_TAB_NAME" />
@@ -218,7 +227,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="RVM: ruby-1.9.3-p194" project-jdk-type="RUBY_SDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="RVM: ruby-1.9.3-p374" project-jdk-type="RUBY_SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="Regex">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
-dependencies: []
+date: 2013-05-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: A tool to colorize your console application.
 email:
 - ataxexe@gmail.com
@@ -37,13 +53,10 @@ files:
 - examples/logger.rb
 - examples/monitor_table.rb
 - lib/yummi.rb
-- lib/yummi/color_mapping.rb
 - lib/yummi/colorizers.rb
 - lib/yummi/data_parser.rb
 - lib/yummi/extensions.rb
 - lib/yummi/formatters.rb
-- lib/yummi/generate/colorize.sh.erb
-- lib/yummi/generator.rb
 - lib/yummi/logger.rb
 - lib/yummi/no_colors.rb
 - lib/yummi/patterns/jboss.yaml

data/lib/yummi/color_mapping.rb

@@ -1,48 +0,0 @@
-#                         The MIT License
-#
-# Copyright (c) 2013 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.
-
-Yummi::Color::load_color_map(
-  :default => {
-    :key_code => '0;3',
-    :schema => Yummi::Color::Schema::NORMAL_COLORS
-  },
-  :reverse => {
-    :key_code => '0;4',
-    :schema => Yummi::Color::Schema::NORMAL_COLORS
-  },
-  [:intense, :strong, :bold] => {
-    :key_code => '1;3',
-    :schema => Yummi::Color::Schema::ALTERNATE_COLORS
-  },
-  [:underline, :underscore, :underscored] => {
-    :key_code => '4;3',
-    :schema => Yummi::Color::Schema::NORMAL_COLORS
-  },
-  [:blink, :blinking] => {
-    :key_code => '5;3',
-    :schema => Yummi::Color::Schema::NORMAL_COLORS
-  },
-  [:highlight, :highlighted] => {
-    :key_code => '7;3',
-    :schema => Yummi::Color::Schema::NORMAL_COLORS
-  }
-)

data/lib/yummi/generate/colorize.sh.erb

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# .:: Generated by Yummi ::.
-
-usage() {
-  echo "Usage: $0 COLOR TEXT [FORMAT]"
-  echo "  COLOR: a name or a number [1..8]. A modifier may also be used in a form $MOD_$COLOR"
-  echo "  TEXT: the text to colorize"
-  echo "  FORMAT: a format to use (defaults to \"%s\\n\")"
-  exit 1
-}
-<% Yummi::Color::COLORS.each do |key, pattern| %>
-function color_<%= key %> {
-  echo "<%= "$1".colorize(key) %>"
-}
-<% end %>
-[ "$#" = "0" ] && usage
-
-format="%s\n"
-
-[ ! -z "$3" ] && format="$3"
-
-printf "$format" $(color_"$@")

data/lib/yummi/generator.rb

@@ -1,47 +0,0 @@
-#                         The MIT License
-#
-# Copyright (c) 2013 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.
-
-require 'erb'
-
-module Yummi
-
-  class Generator
-
-    class ShellScript
-
-      def generate
-        file = File.join(File.dirname(__FILE__), "generate/colorize.sh.erb")
-        content = File.read(file)
-        erb = ERB::new(content, 0, "%<>")
-        erb.result binding
-      end
-
-      def install file
-        File.open(file, "w") { |f| f.write generate }
-        File.chmod(0755, file)
-      end
-
-    end
-
-  end
-
-end