yummi 0.9.0 → 0.9.1

data/README.md

@@ -54,7 +54,6 @@ Example:
 
 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

data/bin/yummi

@@ -57,6 +57,9 @@ opt.on '-l FILES', '--load=FILES', Array, 'Include the files for extending compo
     load File.expand_path(file)
   end
 end
+opt.on '--box', 'Wraps the given text in a box' do
+  @box = true
+end
 opt.on '-h', '--help', 'Display this help message' do
   puts opt
   exit 0
@@ -74,15 +77,18 @@ def print_out message
     Yummi::colorize message, @color
   elsif @colorizer
     @colorizer.colorize message
+  else
+    message
   end
   output_text = "#{@format}" % output_text if @format
+  output_text = output_text.on_box if @box
   puts output_text
 end
 
 if @message
   print_out @message
 elsif @table_builder
-  abort "Please give the data to print" 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
@@ -91,6 +97,7 @@ elsif @table_builder
   else
     abort "Unsupported extension #{extension}"
   end
+  table = table.on_box if @box
   puts table
 else
   begin

data/examples/cash_flow_table.yaml

@@ -11,9 +11,8 @@ format:
   eletronic: boolean
   value,total:
     numeric:
-      positive: "%.2f"
-      zero: "%.2f"
-      negative: "%.2f"
+      any: "%.2f"
+      negative: "(%.2f)"
   undefined:
     with: none
 color:
@@ -38,18 +37,12 @@ row_color:
 top:
   - format:
       total:
-        numeric:
-          positive: "%.2f"
-          zero: "%.2f"
-          negative: "%.2f"
+        with: "%.2f"
     row_color:
       with: intense_white
 bottom:
   - format:
       total:
-        numeric:
-          positive: "%.2f"
-          zero: "%.2f"
-          negative: "%.2f"
+        with: "%.2f"
     row_color:
       with: intense_white

data/lib/yummi.rb

@@ -20,19 +20,32 @@
 # 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
 
+  #
+  # Disable coloring
+  #
+  def self.no_colors
+    Term::ANSIColor::coloring = false
+  end
+
+  #
+  # Enable coloring
+  #
+  def self.colors
+    Term::ANSIColor::coloring = true
+  end
+
   #
   # Checks if the environment is supported by Yummi.
   #
   # Currently (known) unsupported environments are:
   #   * Windows
   #
-  def self.supported?
+  def self.coloring_supported?
     not RUBY_PLATFORM['mingw'] #Windows
   end
 
@@ -262,7 +275,7 @@ module Yummi
 
 end
 
-require_relative 'yummi/no_colors' unless Yummi::supported?
+Yummi.no_colors unless Yummi::coloring_supported?
 
 require_relative 'yummi/extensions'
 require_relative 'yummi/data_parser'
@@ -275,5 +288,5 @@ require_relative 'yummi/logger'
 
 # if the output is being piped, turn off the colors
 unless $stdout.isatty
-  require 'yummi/no_colors'
+  Yummi.no_colors
 end

data/lib/yummi/colorizers.rb

@@ -163,15 +163,28 @@ module Yummi
       PercentageColorizer::new params
     end
 
+    #
+    # A colorizer for numeric values
+    #
+    # === Hash Args
+    #
+    # :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)
+    #
     def self.numeric params
       Yummi::to_format do |ctx|
         value = ctx.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]
+        negative = (params[:negative] or params[:any])
+        positive = (params[:positive] or params[:any])
+        zero = (params[:zero] or params[:any])
+        if negative and value < 0
+          negative
+        elsif positive and value > 0
+          positive
+        elsif zero and value == 0
+          zero
         end
       end
     end

data/lib/yummi/extensions.rb

@@ -20,8 +20,26 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+module Yummi
+  module OnBox
+
+    #
+    # 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
+
+end
+
 class String
   include Term::ANSIColor
+  include Yummi::OnBox
 
   #
   # Colorizes the string using #Yummi#colorize
@@ -42,16 +60,6 @@ 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

data/lib/yummi/formatters.rb

@@ -84,24 +84,28 @@ 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)
     #
     def self.numeric params
       Yummi::to_format do |ctx|
         value = ctx.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
+        negative = (params[:negative] or params[:any])
+        positive = (params[:positive] or params[:any])
+        zero = (params[:zero] or params[:any])
+        if negative and value < 0
+          negative % value.abs
+        elsif positive and value > 0
+          positive % value
+        elsif zero and value == 0
+          zero % value
         end
       end
     end
 
     #
-    # A formatter for percentual values.
+    # A formatter for percent values.
     #
-    # Paramters:
+    # Parameters:
     #   The precision to use (defaults to 3)
     #
     def self.percentage precision = 3
@@ -145,7 +149,7 @@ module Yummi
         params[:precision] ||= 1
         result = value
         range.each_index do |i|
-          minimun = (step ** i)
+          minimun = (step.** i)
           result = "%.#{params[:precision]}f #{range[i]}" % (value.to_f / minimun) if value >= minimun
         end
         result

data/lib/yummi/table.rb

@@ -25,6 +25,8 @@ require 'ostruct'
 module Yummi
   # A Table that supports colorizing title, header, values and also formatting the values.
   class Table
+    include Yummi::OnBox
+
     # The table title
     attr_accessor :title
     # The table description
@@ -197,7 +199,9 @@ module Yummi
     def header= (header)
       header = [header] unless header.respond_to? :each
       @header = normalize(header)
-      @aliases = header.map { |n| n.downcase.gsub(' ', '_').gsub("\n", '_').to_sym } if @aliases.empty?
+      @aliases = header.map do |n|
+        n.downcase.gsub(' ', '_').gsub("\n", '_').to_sym
+      end if @aliases.empty?
     end
 
     #
@@ -329,8 +333,8 @@ module Yummi
         index = parse_index(index)
         if index
           component[:formatters][index] = (params[:using] or block)
-          component[:formatters][index] ||= proc do |value|
-            params[:with] % value
+          component[:formatters][index] ||= proc do |ctx|
+            params[:with] % ctx.value
           end
         else
           format_null params, &block

data/lib/yummi/text_box.rb

@@ -84,8 +84,8 @@ module Yummi
     #
     # === Args
     #
-    # +line_text+::
-    #   The text to add.
+    # +obj+::
+    #   The obj to add (will be converted to string).
     # +params+::
     #   A hash of parameters. Currently supported are:
     #     color: the text color (see #Yummi#COLORS)
@@ -94,7 +94,8 @@ module Yummi
     #     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 = {})
+    def add (obj, params = {})
+      text = obj.to_s
       params = {
         :width => style.width,
         :align => style.align

data/lib/yummi/version.rb

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

data/yummi.iml

@@ -10,6 +10,7 @@
     <orderEntry type="inheritedJdk" />
     <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" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -58,7 +58,6 @@ files:
 - lib/yummi/extensions.rb
 - lib/yummi/formatters.rb
 - lib/yummi/logger.rb
-- lib/yummi/no_colors.rb
 - lib/yummi/patterns/jboss.yaml
 - lib/yummi/patterns/log.yaml
 - lib/yummi/patterns/weblogic.yaml

data/lib/yummi/no_colors.rb

@@ -1,23 +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.
-
-Term::ANSIColor::coloring = false