yummi 0.4.0 → 0.4.1

data/examples/cash_flow_table.rb

@@ -30,6 +30,7 @@ opt = OptionParser::new
 @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
@@ -45,45 +46,54 @@ 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| :brown 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 :brown, :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'
-      @table.row_colorizer Yummi::Colorizers.stripe :brown, :purple
+      zebra_colors
     when 'full'
       # colorize all values from the Description column to purple
-      @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| :brown if value == 0 }
-      colorizer = Yummi::Colorizers.join(red_to_negative, green_to_positive, brown_to_zero)
-      @table.colorize :value, :using => colorizer
-      @table.colorize :total, :using => colorizer
-      # 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
+      full_colors
     when 'none'
-      @table.no_colors
+      no_colors
     else
   end
+  @colors = type
 end
+
 opt.on '--layout LAYOUT', 'Defines the table layout (horizontal or vertical)' do |layout|
-  case layout
-    when 'horizontal'
-      @table.layout = :horizontal
-    when 'vertical'
-      @table.layout = :vertical
-    else
-  end
+  @table.layout = layout.to_sym
 end
+
 opt.on '--box', 'Prints the table inside a box' do
   @box = Yummi::TextBox::new
 end
@@ -94,6 +104,8 @@ end
 
 opt.parse ARGV
 
+full_colors unless @colors
+
 if @box
   @box << @table
   @box.print

data/examples/list_files.rb

@@ -29,7 +29,7 @@ opt = OptionParser::new
 
 @table = Yummi::Table::new
 # setting the header sets the aliases automatically
-@table.header = ['Name', 'Size']
+@table.header = %w(Name Size)
 @table.aliases << :directory
 # sets the title
 @table.title = 'File List'

data/examples/monitor_table.rb

@@ -92,10 +92,20 @@ opt.parse ARGV
   ['Server 4', 1_000_000, 200_000, 200, 50],
   ['Server 5', 1_000_000, 5_000, 200, 50],
   ['Server 6', 1_000_000, 750_000, 200, 50],
-  ['Server 6', 1_000_000, 200_000, 200, 170],
-  ['Server 6', 1_000_000, 5_000, 200, 180],
 ]
 
+@table.add :server_name => 'Server 7',
+          :max_memory => 1_000_000,
+          :free_memory => 200_000,
+          :max_threads => 200,
+          :in_use_threads => 170
+
+@table.add :server_name => 'Server 8',
+          :max_memory => 1_000_000,
+          :free_memory => 5_000,
+          :max_threads => 200,
+          :in_use_threads => 180
+
 if @box
   @box << @table
   @box.print

data/lib/yummi.rb

@@ -95,18 +95,18 @@ module Yummi
     # Escape the given text with the given color code
     def self.escape key
       return key unless key and COLORS[key.to_sym]
-      "\033[#{COLORS[key.to_sym]}m"
+      "\e[#{COLORS[key.to_sym]}m"
     end
 
     # Colorize the given text with the given color
     def self.colorize string, color
-      color, end_color = [color, "\033[0;0m"].map { |key| Color.escape(key) }
+      color, end_color = [color, "\e[0;0m"].map { |key| Color.escape(key) }
       color ? "#{color}#{string}#{end_color}" : string
     end
 
     # Extracts the text from a colorized string
     def self.raw string
-      string.gsub(/\033\[\d;\d{2}m/, '').gsub(/\033\[0;0m/, '')
+      string.gsub(/\e\[\d;\d{2}m/, '').gsub(/\e\[0;0m/, '')
     end
 
   end
@@ -220,8 +220,19 @@ module Yummi
     # for getting the text to colorize).
     #
     def colorize (*args)
-      color = call *args
-      Yummi.colorize args.first.to_s, color
+      Yummi.colorize args.first.to_s, color_for(args)
+    end
+
+    #
+    # Returns the color for the given value
+    #
+    # === Args
+    #
+    # An array of arguments that will be passed to :call: method to get the color. By
+    # 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
     end
 
   end

data/lib/yummi/table.rb

@@ -27,6 +27,8 @@ module Yummi
     attr_accessor :data
     # The table title
     attr_accessor :title
+    # The table description
+    attr_accessor :description
     # Default align. #Yummi#Aligner should respond to it.
     attr_accessor :default_align
     # Aliases that can be used by formatters and colorizers instead of numeric indexes.
@@ -56,8 +58,10 @@ module Yummi
       @data = []
       @header = []
       @title = nil
+      @description = nil
       @colors = {
         :title => :intense_yellow,
+        :description => :intense_gray,
         :header => :intense_blue,
         :value => nil
       }
@@ -128,18 +132,20 @@ module Yummi
     # === Args
     #
     # +index+::
-    #   The column index or its alias
+    #   The column indexes or its aliases
     # +type+::
     #   The alignment type
     #
     # === Example
     #
     #   table.align :description, :left
-    #   table.align :value, :right
+    #   table.align [:value, :total], :right
     #
-    def align (index, type)
-      index = parse_index(index)
-      @align[index] = type
+    def align (indexes, type)
+      [*indexes].each do |index|
+        index = parse_index(index)
+        @align[index] = type
+      end
     end
 
     #
@@ -175,6 +181,23 @@ module Yummi
       @using_row = false
     end
 
+    #
+    # 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 << (row)
+      if row.is_a? Hash
+        array = []
+        aliases.each do |header_alias|
+          array << row[header_alias]
+        end
+        row = array
+      end
+      @data << row
+    end
+
+    alias_method :add, :<<
+
     #
     # Sets a component to colorize a column.
     #
@@ -186,8 +209,8 @@ module Yummi
     #
     # === Args
     #
-    # +index+::
-    #   The column index or its alias
+    # +indexes+::
+    #   The column indexes or its aliases
     # +params+::
     #   A hash with params in case a block is not given:
     #     - :using defines the component to use
@@ -196,13 +219,15 @@ module Yummi
     # === Example
     #
     #   table.colorize :description, :with => :purple
-    #   table.colorize(:value) { |value| :red if value < 0 }
-    #
-    def colorize (index, params = {}, &block)
-      index = parse_index(index)
-      @colorizers[index] ||= []
-      obj = (params[:using] or block or (proc { |v| params[:with] }))
-      @colorizers[index] << {:use_row => @using_row, :component => obj}
+    #   table.colorize([:value, :total]) { |value| :red if value < 0 }
+    #
+    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}
+      end
     end
 
     #
@@ -231,8 +256,8 @@ module Yummi
     #
     # === Args
     #
-    # +index+::
-    #   The column index or its alias
+    # +indexes+::
+    #   The column indexes or its aliases
     # +params+::
     #   A hash with params in case a block is not given:
     #     - :using defines the component to use
@@ -241,12 +266,15 @@ module Yummi
     # === Example
     #
     #   table.format :value, :with => '%.2f'
-    #
-    def format (index, params = {}, &block)
-      index = parse_index(index)
-      @formatters[index] = (params[:using] or block)
-      @formatters[index] ||= proc do |value|
-        params[:with] % value
+    #   table.format [:value, :total], :with => '%.2f'
+    #
+    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
+        end
       end
     end
 
@@ -283,6 +311,7 @@ module Yummi
 
       string = ""
       string << Color.colorize(@title, @colors[:title]) << $/ if @title
+      string << Color.colorize(@description, @colors[: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

data/lib/yummi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies: []
 description: A tool to colorize your console application.
 email: