yummi 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84331096ac770ff2a1f04d8a7aee1aa7cdcc0ea3
-  data.tar.gz: 86b6f4dfd5643ec830049831d4366ed6d0a9cdd4
+  metadata.gz: 944e82fa618cf8b6be32353227a58a1779fe68e9
+  data.tar.gz: 93afaa736b4054cb96732f1e3b575cdd95c40583
 SHA512:
-  metadata.gz: 2193710539b5a0ecb3fd18f0c7e78cc38a01363e1dfa128cd1d40e15cbcb59a3b83eb16af6e7307690f41e2361d332f89771c4adf92a20d035a43762fa3f9050
-  data.tar.gz: 82ca682f1c4df69360acf2abb1ebd6be342c66ac51adf122dd7cc2bb9fac917a2e3fb4518a2849badb73257c3cecf6f7e5ac22a5b9518b2cb716ffa404e65bd0
+  metadata.gz: c564e72e961de304e516de35736e348be15edfed66b2cf8bc09dc6a9fc8fee2645896260d5a908d391240dfb346d9d208c70b694c53e7964b8c8284c439184e5
+  data.tar.gz: 5e775b3e5207fc98c11b81a87bcc1285badcf1ae3aad998079ceb6dbe9f62e6215c32c1463359e04116687cf9b928c3bcebdaecff30111cb23f53d1670409412

data/README.md

@@ -1,7 +1,6 @@
 # Yummi
 
-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.
+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](https://rubygems.org/gems/term-ansicolor).
 
 ## Installation
 
@@ -19,14 +18,11 @@ Or install it yourself as:
 
 ## Ruby Tools
 
-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.
+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 'yummi' program that you can use to colorize texts and apply
-patterns to colorize lines (usefull to tail logs).
+Yummi exposes a 'yummi' program that you can use to colorize texts and apply patterns to colorize lines (usefull to tail logs).
 
 Examples:
 
@@ -52,7 +48,7 @@ Example:
       ERROR : red
       FATAL : intense_red
 
-Yummi provides a set of patterns, check yummi/patterns dir.
+Yummi provides a set of patterns, check `yummi/patterns` dir.
 
     tail -f $JBOSS_HOME/standalone/log/server.log | yummi -p jboss
 

data/bin/yummi

@@ -40,7 +40,7 @@ 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 
+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',
@@ -67,7 +67,7 @@ end
 opt.on '--box', 'Wraps the given text in a box' do
   @box = true
 end
-opt.on '-v', '--version' , 'Shows the yummi version' do
+opt.on '-v', '--version', 'Shows the yummi version' do
   puts Yummi::VERSION
   exit
 end
@@ -106,7 +106,10 @@ elsif @table_builder
   extension = File::extname(@data)[1..-1]
   type = (@data_type or extension).to_sym
   if Yummi::DataParser.respond_to? type
-    table.data = Yummi::DataParser.send(type, File.read(@data))
+    data = Yummi::DataParser.send(type, File.read(@data))
+    data.each do |row|
+      table.add row
+    end
   else
     abort "Unsupported extension #{extension}"
   end

data/examples/cash_flow_table.rb

@@ -39,7 +39,7 @@ tablebuilder = Yummi::TableBuilder::new('cash_flow_table.yaml')
                ['Total', nil, 600.35, nil, nil]]
 
 opt.on '--layout LAYOUT', 'Defines the table layout (horizontal or vertical)' do |layout|
-  @table.layout = layout.to_sym
+  @table.layout = layout
 end
 
 opt.on '--box', 'Prints the table inside a box' do

data/examples/cash_flow_table.yaml

@@ -1,12 +1,14 @@
 title: Cash Flow
 description: How you spend your money
 layout: horizontal
+
 header:
   - Description
   - Value
   - Total
   - Eletronic
   - "Authentication\nCode"
+
 format:
   eletronic: boolean
   value,total:
@@ -15,6 +17,7 @@ format:
       negative: "(%.2f)"
   undefined:
     with: none
+
 color:
   description:
     with: magenta
@@ -31,6 +34,7 @@ color:
       negative: red
   undefined:
     with: red
+
 row_color:
   blessed_income: yellow
 
@@ -40,6 +44,7 @@ top:
         with: "%.2f"
     row_color:
       with: intense_white
+
 bottom:
   - format:
       total:

data/examples/cash_flow_table_data.csv

@@ -1,7 +1,7 @@
-Initial, , 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
-Total, , 600.35
+Initial,,0,
+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
+Total,,600.35

data/examples/cash_flow_table_data.yaml

@@ -1,35 +1,34 @@
-- - Initial
-  - 
-  - 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
-  - 
-- - Total
-  -
-  - 600.35
-  -
-  -
+- description: Initial
+  total: 0
+
+- description: Deposit
+  value: 100.58
+  total: 100.58
+  eletronic: true
+  authentication_code: QAWSEDRFTGH535
+
+- description: Withdraw
+  value: -50.23
+  total: 50.35
+  eletronic: true
+  authentication_code: 34ERDTF6GYU
+
+- description: Withdraw
+  value: -100
+  total: -49.65
+  eletronic: true
+  authentication_code: 2344EDRFT5
+
+- description: Deposit
+  value: 50
+  total: 0.35
+  eletronic: false
+
+- description: Deposit
+  value: 600
+  total: 600.35
+  eletronic: false
+
+- description: Total
+  total: 600.35
+

data/examples/monitor_table.rb

@@ -32,9 +32,15 @@ opt = OptionParser::new
 @table.title = 'Server Runtime Info'
 # formats memory info for easily reading
 @table.format [:max_memory, :free_memory], :using => Yummi::Formatters.byte
+@table.format [:max_threads, :in_use_threads], :using => Yummi::Formatters.numeric(
+    :separator => ','
+)
 
 @table.bottom do
   @table.format [:max_memory, :free_memory], :using => Yummi::Formatters.byte
+  @table.format [:max_threads, :in_use_threads], :using => Yummi::Formatters.numeric(
+      :separator => ','
+  )
   @table.colorize_row :with => 'bold.white'
 end
 
@@ -102,8 +108,8 @@ opt.parse ARGV
   ['Server 2', 1_000_000_000, 700_000_000, 200, 180],
   ['Server 3', 1_000_000_000, 50_000_000, 200, 50],
   ['Server 4', 1_000_000_000, 200_000_000, 200, 100],
-  ['Server 5', 1_000_000_000, 5_000_000, 200, 50],
-  ['Server 6', 1_000_000_000, 750_000_000, 200, 50],
+  ['Server 5', 1_000_000_000, 5_000_000, 2000, 50],
+  ['Server 6', 1_000_000_000, 750_000_000, 200, 0],
 ]
 
 @table.add :server_name => 'Server 7',

data/lib/yummi.rb

@@ -182,7 +182,7 @@ module Yummi
   class IndexedData
 
     def initialize (aliases, data)
-      @aliases = aliases.collect {|a| a.to_s}
+      @aliases = aliases.collect { |a| a.to_s }
       @data = data
     end
 

data/lib/yummi/data_parser.rb

@@ -28,6 +28,10 @@ module Yummi
       YAML::load(input)
     end
 
+    def self.yml(input)
+      YAML::load(input)
+    end
+
     def self.csv(input)
       require 'csv' #autoload will be dead, using require instead
       CSV::parse(input, :converters => :all)

data/lib/yummi/formatters.rb

@@ -26,7 +26,7 @@ module Yummi
   module FormatterBlock
 
     # Calls the :call: method
-    def format (arg)
+    def format(arg)
       arg = Yummi::Context::new(arg) unless arg.is_a? Context
       call value
     end
@@ -34,7 +34,7 @@ module Yummi
   end
 
   # Extends the given block with #FormatterBlock
-  def self.to_format &block
+  def self.to_format(&block)
     block.extend FormatterBlock
   end
 
@@ -49,19 +49,19 @@ module Yummi
     # :if_true => String to use when value is true
     # :if_false => String to use when value is false
     #
-    def self.boolean params = {}
+    def self.boolean(params = {})
       Yummi::to_format do |ctx|
         value = ctx.value
         if value.to_s.downcase == 'true'
           (params[:if_true] or 'Yes')
-        else 
+        else
           (params[:if_false] or 'No')
         end
       end
     end
 
     # A formatter to round float values
-    def self.round precision
+    def self.round(precision)
       Yummi::to_format do |ctx|
         value = ctx.value
         "%.#{precision}f" % value
@@ -69,7 +69,7 @@ module Yummi
     end
 
     # A formatter that uses the given format
-    def self.with format
+    def self.with(format)
       Yummi::to_format do |ctx|
         value = ctx.value
         format % value
@@ -85,8 +85,9 @@ module Yummi
     # :zero => format to use when value is zero
     # :positive => format to use when value is positive
     # :any => format to use for any value without a specific format
+    # :separator => a thousand separator for use instead of the formats above
     #
-    def self.numeric params
+    def self.numeric(params)
       Yummi::to_format do |ctx|
         value = ctx.value
         negative = (params[:negative] or params[:any])
@@ -98,6 +99,12 @@ module Yummi
           positive % value
         elsif zero and value == 0
           zero % value
+        else
+          if params[:separator]
+            value.to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{params[:separator]}")
+          else
+            value
+          end
         end
       end
     end
@@ -108,7 +115,7 @@ module Yummi
     # Parameters:
     #   The precision to use (defaults to 3)
     #
-    def self.percentage precision = 3
+    def self.percentage(precision = 3)
       Yummi::to_format do |ctx|
         value = ctx.value
         "%.#{precision}f%%" % (value * 100)
@@ -117,14 +124,14 @@ module Yummi
 
     # 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
-      }
+        :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
+        }
     }
 
     #
@@ -139,7 +146,7 @@ module Yummi
     #
     # See #BYTE_MODES
     #
-    def self.byte params = {}
+    def self.byte(params = {})
       Yummi::to_format do |ctx|
         value = ctx.value
         value = value.to_i if value.is_a? String
@@ -150,7 +157,8 @@ module Yummi
         result = value
         range.each_index do |i|
           minimun = (step.** i)
-          result = "%.#{params[:precision]}f #{range[i]}" % (value.to_f / minimun) if value >= minimun
+          result = "%.#{params[:precision]}f #{range[i]}" %
+            (value.to_f / minimun) if value >= minimun
         end
         result
       end

data/lib/yummi/row_extractor.rb

@@ -0,0 +1,55 @@
+module Yummi
+  module RowExtractor
+
+    def extract_row_from_hash(row, row_index)
+      array = []
+      @aliases.each_index do |column_index|
+        key = @aliases[column_index]
+        obj = TableContext::new(
+          :obj => row,
+          :row_index => row_index,
+          :column_index => column_index,
+          :value => (row[key.to_sym] or row[key.to_s])
+        )
+        array << obj
+      end
+      array
+    end
+
+    def extract_row_from_range(row, row_index)
+      row.to_a
+    end
+
+    def extract_row_from_array(row, row_index)
+      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]
+        )
+        array << obj
+      end
+      array
+    end
+
+    def extract_row_from_object(row, row_index)
+      array = []
+      @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])
+        )
+        def obj.[] (index)
+          obj.send(index)
+        end
+        array << obj
+      end
+      array
+    end
+
+  end
+end

data/lib/yummi/table.rb

@@ -21,11 +21,13 @@
 # THE SOFTWARE.
 
 require 'ostruct'
+require_relative 'row_extractor'
 
 module Yummi
   # A Table that supports colorizing title, header, values and also formatting the values.
   class Table
     include Yummi::OnBox
+    include Yummi::RowExtractor
 
     # The table title
     attr_accessor :title
@@ -67,7 +69,7 @@ module Yummi
     # * Colspan (colspan): 2
     # * Default Align (align): right and first element to left
     #
-    def initialize params = {}
+    def initialize(params = {})
       params = OpenStruct::new params
       params.style ||= {}
       @data = []
@@ -75,10 +77,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 +100,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
@@ -152,8 +154,8 @@ module Yummi
 
     # Sets the table print layout.
     def layout=(layout)
-      @layout = layout
-      case layout
+      @layout = layout.to_sym
+      case @layout
         when :horizontal
           @default_align = :right
         when :vertical
@@ -194,7 +196,7 @@ module Yummi
     #
     #   table.header = ['Name', 'Email', 'Work Phone', "Home\nPhone"]
     #
-    # This will create the following aliases: :name, :email, :work_phone and :home_phone
+    # This will create the following aliases: :key, :email, :work_phone and :home_phone
     #
     def header=(header)
       header = [header] unless header.respond_to? :each
@@ -410,9 +412,9 @@ module Yummi
 
     def _define_(context)
       @components[context] = {
-          :formatters => [],
-          :colorizers => [],
-          :row_colorizer => nil,
+        :formatters => [],
+        :colorizers => [],
+        :row_colorizer => nil,
       }
     end
 
@@ -507,21 +509,25 @@ module Yummi
         _row_data = []
         row.each_index do |col_index|
           next if not @header.empty? and @header[0].size < col_index + 1
-          color = nil
-          value = nil
           column = row[col_index]
           colorizer = component[:colorizers][col_index]
-          if component[:null_colorizer] and column.nil?
-            color = component[:null_colorizer].call(column)
+          color = if component[:null_colorizer] and column.value.nil?
+            component[:null_colorizer].call(column)
           elsif colorizer
-            color = colorizer.call(column)
+            colorizer.call(column)
           else
-            color = @style[:value]
+            @style[:value]
+          end
+          formatter = if column.value.nil?
+            @null_formatter
+          else
+            component[:formatters][col_index]
+          end
+          value = if formatter
+            formatter.call(column)
+          else
+            column.value
           end
-          formatter = component[:formatters][col_index]
-          formatter = component[:null_formatter] if column.nil? and @null_formatter
-          value = (formatter ? formatter.call(column) : column.value)
-
           _row_data << {:value => value, :color => color}
         end
         row_colorizer = component[:row_colorizer]
@@ -531,13 +537,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
@@ -547,45 +553,9 @@ module Yummi
     end
 
     def row_to_array (row, row_index = nil)
-      array = []
-      row = row.to_a if row.is_a? Range
-      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]]
-          )
-          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]
-          )
-          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])
-          )
-
-          def obj.[] (index)
-            obj.send(index)
-          end
-
-          array << obj
-        end
-      end
-      array
+      message_name = "extract_row_from_#{row.class.to_s.downcase}".to_sym
+      message_name = :extract_row_from_object unless respond_to? message_name
+      send(message_name, row, row_index)
     end
 
     def component

data/lib/yummi/version.rb

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

data/yummi.iml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RUBY_MODULE" version="4">
+  <component name="CompassSettings">
+    <option name="compassSupportEnabled" value="true" />
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -11,7 +14,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <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" />
+    <orderEntry type="library" scope="PROVIDED" name="tins (v1.0.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">

data/yummi.ipr

@@ -43,9 +43,6 @@
     <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>
@@ -55,7 +52,6 @@
       <profile version="1.0" is_locked="false">
         <option name="myName" value="Project Default" />
         <option name="myLocal" value="false" />
-        <inspection_tool class="Fix shebang" enabled="true" level="WARNING" enabled_by_default="true">/bin/sh#/bin/bash</inspection_tool>
         <inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
           <option name="processCode" value="false" />
           <option name="processLiterals" value="false" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Ataxexe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -59,6 +59,7 @@ files:
 - lib/yummi/patterns/log.yaml
 - lib/yummi/patterns/weblogic.yaml
 - lib/yummi/patterns/webserver.yaml
+- lib/yummi/row_extractor.rb
 - lib/yummi/table.rb
 - lib/yummi/table_builder.rb
 - lib/yummi/text_box.rb
@@ -90,3 +91,4 @@ signing_key:
 specification_version: 4
 summary: A tool to colorize your console application.
 test_files: []
+has_rdoc: