riel 1.1.16 → 1.1.17

data/test/riel/testlog/log_test.rb

@@ -0,0 +1,254 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pathname'
+require 'test/unit'
+require 'stringio'
+require 'riel/log'
+require 'riel/testlog/logtestee'
+
+class LogTestCase < Test::Unit::TestCase
+  include Loggable
+
+  def test_no_output
+    # I could make this an instance variable, but I want to check the method
+    # names in the output string.
+
+    log = Proc.new { 
+      Log.log   "hello, world?"
+      Log.debug "hello, world?"
+      Log.info  "hello, world?"
+      Log.warn  "EXPECTED OUTPUT TO STDERR: hello, world." # will go to stderr
+      Log.error "EXPECTED OUTPUT TO STDERR: hello, world." # will go to stderr
+      Log.stack "hello, world?"
+    }
+    
+    run_test @nonverbose_setup, log
+  end
+
+  def test_output_arg
+    log = Proc.new { 
+      Log.log   "hello, world?"
+      Log.debug "hello, world?"
+      Log.info  "hello, world?"
+      Log.warn  "hello, world?"
+      Log.error "hello, world?"
+      Log.stack "hello, world?"
+    }
+
+    methname = if RUBY_VERSION == "1.8.7" then "test_output_arg" else "block in test_output_arg" end
+
+    expected = Array.new
+    (1 .. 6).each do |lnum|
+      expected << sprintf("[   ...testlog/log_test.rb:  %2d] {%-20s} hello, world?", 30 + lnum, methname[0 .. 19])
+    end
+    expected << "[   ...testlog/log_test.rb: 234] {call                } "
+    expected << "[   ...testlog/log_test.rb: 234] {run_test            } "
+    expected << "[   ...testlog/log_test.rb:  49] {test_output_arg     } "
+    
+    run_test @verbose_setup, log, *expected
+  end
+
+  def test_output_block
+    log = Proc.new { 
+      Log.log { "output block" }
+    }
+    
+    Log.set_default_widths
+    # run_test @verbose_setup, log, "[ ...test/riel/log_test.rb:  73] {test_output_block   } output block"
+
+    info_setup = Proc.new {
+      Log.level = Log::INFO
+      Log.output  = StringIO.new
+    }
+
+    evaluated = false
+    log = Proc.new { 
+      Log.debug { evaluated = true; "hello, world?" }
+    }
+    
+    # run_test info_setup, log
+    
+    assert_equal false, evaluated
+  end
+
+  def test_instance_log
+    log = Proc.new { 
+      log "hello, world?"
+    }
+    
+    Log.set_widths(-15, 4, -40)
+    # the class name is different in 1.8 and 1.9, so we won't test it.
+    # run_test(@verbose_setup, log, "[ ...log_test.rb:  96] {LogTestCase#test_instance_log           } hello, world?")
+    run_test @verbose_setup, log, nil
+
+    Log.set_default_widths
+  end
+
+  def test_colors
+    log = Proc.new { 
+      white "white wedding"
+      blue "blue iris"
+      on_cyan "red"
+    }
+
+    # test_col has become 'block in test colors' in 1.9
+    # run_test(@verbose_setup, log,
+    #          "[ ...test/riel/log_test.rb: 107] {LogTestCase#test_col} \e[37mwhite wedding\e[0m",
+    #          "[ ...test/riel/log_test.rb: 108] {LogTestCase#test_col} \e[34mblue iris\e[0m",
+    #          "[ ...test/riel/log_test.rb: 109] {LogTestCase#test_col} \e[46mred\e[0m")
+
+    Log.set_default_widths
+  end
+
+  def run_format_test(expected, &blk)
+    Log.verbose = true
+    io = StringIO.new
+    Log.output = io
+    Log.set_default_widths
+
+    blk.call
+
+    lt = LogTestee.new
+    lt.format_test
+
+    puts io.string
+
+    assert_equal expected.join(''), io.string
+    
+    Log.set_default_widths
+  end
+
+  def test_format_default
+    puts "test_format_default"
+
+    expected = Array.new
+    expected << "[  ...testlog/logtestee.rb:  10] {format_test         } tamrof\n"
+
+    run_format_test expected do
+      Log.set_default_widths
+    end
+  end
+
+  def test_format_flush_filename_left
+    puts "test_format_flush_filename_left"
+    
+    expected = Array.new
+    expected << "[  ...test/riel/testlog/logtestee.rb:  10] {format_test         } tamrof\n"
+
+    run_format_test expected do
+      Log.set_widths(-35, Log::DEFAULT_LINENUM_WIDTH, Log::DEFAULT_FUNCTION_WIDTH)
+    end
+  end
+
+  def test_format_flush_linenum_left
+    puts "test_format_flush_linenum_left"
+
+    expected = Array.new
+    expected << "[  ...testlog/logtestee.rb:10        ] {format_test         } tamrof\n"
+
+    run_format_test expected do
+      Log.set_widths(Log::DEFAULT_FILENAME_WIDTH, -10, Log::DEFAULT_FUNCTION_WIDTH)
+    end
+  end
+
+  def test_format_flush_function_right
+    puts "test_format_flush_function_right"
+
+    expected = Array.new
+    expected << "[  ...testlog/logtestee.rb:  10] {                        format_test} tamrof\n"
+
+    run_format_test expected do
+      Log.set_widths(Log::DEFAULT_FILENAME_WIDTH, Log::DEFAULT_LINENUM_WIDTH, 35)
+    end
+  end
+
+  def test_format_pad_linenum_zeros
+    puts "test_format_pad_linenum_zeros"
+    
+    expected = Array.new
+    expected << "[  ...testlog/logtestee.rb:00000010] {format_test         } tamrof\n"
+
+    run_format_test expected do
+      Log.set_widths(Log::DEFAULT_FILENAME_WIDTH, "08", Log::DEFAULT_FUNCTION_WIDTH)
+    end
+  end
+
+  def test_color
+    Log.verbose = true
+    io = StringIO.new
+    Log.output = io
+    Log.set_default_widths
+    
+    expected = Array.new
+    expected << "[  ...testlog/logtestee.rb:   6] {color_test          } azul\n"
+    
+    lt = LogTestee.new
+    lt.color_test
+
+    puts io.string
+
+    assert_equal expected.join(''), io.string
+  end
+
+  # the ctor is down here so the lines above are less likely to change.
+  def initialize test, name = nil
+    @nonverbose_setup = Proc.new {
+      Log.verbose = false
+      Log.output  = StringIO.new
+    }
+    
+    @verbose_setup = Proc.new {
+      Log.verbose = true
+      Log.output  = StringIO.new
+    }
+
+    super test
+  end
+
+  def exec_test setup, log, expected = Array.new
+    io = setup.call
+
+    log.call
+
+    assert_not_nil io
+    str = io.string
+    assert_not_nil str
+
+    lines = str.split "\n"
+
+    unless expected.empty?
+      (0 ... expected.size).each do |idx|
+        if expected[idx]
+          assert_equal expected[idx], lines[idx], "index: #{idx}"
+        end
+      end
+    end
+
+    Log.output = io
+  end
+
+  def run_test setup, log, *expected
+    io = setup.call
+
+    log.call
+
+    assert_not_nil io
+    str = io.string
+    assert_not_nil str
+
+    lines = str.split "\n"
+
+    (0 ... expected.size).each do |idx|
+      if expected[idx]
+        assert_equal expected[idx], lines[idx], "index: #{idx}"
+      end
+    end
+
+    Log.output = io
+  end
+
+  def test_respond_to_color
+    assert Log.respond_to? :blue
+  end
+end

data/test/riel/testlog/loggable_test.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pathname'
+require 'test/unit'
+require 'stringio'
+require 'riel/log/log'
+require 'riel/log/loggable'
+require 'riel/testlog/lgbl_testee'
+
+class LoggableTestCase < Test::Unit::TestCase
+  include RIEL::Loggable
+
+  def test_instance_colors
+    RIEL::Log.verbose = true
+    io = StringIO.new
+    RIEL::Log.output = io
+
+    expected = Array.new
+    expected << "[...testlog/lgbl_testee.rb:  11] {LgblTestee#crystal  } hello!\n"
+    expected << "[...testlog/lgbl_testee.rb:  12] {LgblTestee#crystal  } azul ... \n"
+    expected << "[...testlog/lgbl_testee.rb:  13] {LgblTestee#crystal  } rojo?\n"
+    
+    te = LgblTestee.new
+    te.crystal
+
+    # puts io.string
+
+    assert_equal expected.join(''), io.string
+  end
+end

metadata

@@ -1,184 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: riel
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 1.1.17
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 16
-  version: 1.1.16
 platform: ruby
-authors: 
+authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-15 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
+date: 2013-03-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 description: This library extends the core Ruby libraries.
 email: jeugenepace@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
+- lib/riel.rb
 - lib/riel/array.rb
-- lib/riel/size_converter.rb
+- lib/riel/command.rb
+- lib/riel/date.rb
+- lib/riel/dir.rb
 - lib/riel/enumerable.rb
-- lib/riel/timer.rb
-- lib/riel/hash.rb
+- lib/riel/env.rb
 - lib/riel/fdprocessor.rb
-- lib/riel/dir.rb
-- lib/riel/matchdata.rb
-- lib/riel/regexp.rb
-- lib/riel/text.rb
-- lib/riel/setdiff.rb
-- lib/riel/asciitable/column.rb
-- lib/riel/asciitable/cell.rb
-- lib/riel/asciitable/table.rb
-- lib/riel/asciitable/row.rb
-- lib/riel/io.rb
-- lib/riel/tempfile.rb
-- lib/riel/string.rb
-- lib/riel/command.rb
-- lib/riel/text/non_highlight.rb
-- lib/riel/text/html_highlight.rb
-- lib/riel/text/string.rb
-- lib/riel/text/highlightable.rb
-- lib/riel/text/highlight.rb
-- lib/riel/text/ansi/backgrounds.rb
-- lib/riel/text/ansi/color.rb
-- lib/riel/text/ansi/ansi_color.rb
-- lib/riel/text/ansi/rgb_color.rb
-- lib/riel/text/ansi/attributes.rb
-- lib/riel/text/ansi/rgb_highlighter.rb
-- lib/riel/text/ansi/ansi_highlight.rb
-- lib/riel/text/ansi/grey_palette.rb
-- lib/riel/text/ansi/ansi_palette.rb
-- lib/riel/text/ansi/rgb_palette.rb
-- lib/riel/text/ansi/foregrounds.rb
-- lib/riel/text/ansi/ansi_colors.rb
-- lib/riel/text/ansi/palette.rb
-- lib/riel/text/ansi/grey.rb
-- lib/riel/text/ansi/ansi_list.rb
-- lib/riel/pathname.rb
 - lib/riel/file.rb
+- lib/riel/filetype.rb
+- lib/riel/hash.rb
 - lib/riel/integer.rb
-- lib/riel/ansicolor.rb
-- lib/riel/optproc.rb
+- lib/riel/io.rb
+- lib/riel/log.rb
+- lib/riel/log/log.rb
 - lib/riel/log/loggable.rb
-- lib/riel/log/severity.rb
 - lib/riel/log/logger.rb
-- lib/riel/log/log.rb
-- lib/riel/env.rb
-- lib/riel/filetype.rb
+- lib/riel/log/severity.rb
+- lib/riel/matchdata.rb
+- lib/riel/optproc.rb
+- lib/riel/pathname.rb
 - lib/riel/rcfile.rb
-- lib/riel/log.rb
-- lib/riel/date.rb
-- lib/riel.rb
-- test/riel/date_test.rb
-- test/riel/size_converter_test.rb
-- test/riel/env_test.rb
+- lib/riel/regexp.rb
+- lib/riel/setdiff.rb
+- lib/riel/size_converter.rb
+- lib/riel/string.rb
+- lib/riel/tempfile.rb
+- lib/riel/timer.rb
 - test/riel/array_test.rb
-- test/riel/matchdata_test.rb
-- test/riel/text_test.rb
+- test/riel/command_test.rb
+- test/riel/date_test.rb
 - test/riel/dir_test.rb
-- test/riel/file_test.rb
-- test/riel/regexp_test.rb
 - test/riel/enumerable_test.rb
-- test/riel/asciitable/table_test.rb
-- test/riel/pathname_test.rb
-- test/riel/optproc_test.rb
-- test/riel/io_test.rb
-- test/riel/tempfile_test.rb
+- test/riel/env_test.rb
+- test/riel/file_test.rb
 - test/riel/filetype_test.rb
-- test/riel/log_test.rb
-- test/riel/text/ansi/ansi_palette_test.rb
-- test/riel/text/ansi/rgb_palette_test.rb
-- test/riel/text/ansi/grey_palette_test.rb
-- test/riel/text/ansi/ansi_highlight_test.rb
-- test/riel/text/ansi/rgb_highlighter_test.rb
-- test/riel/text/string_test.rb
-- test/riel/text/highlightable_test.rb
+- test/riel/hash_test.rb
 - test/riel/integer_test.rb
+- test/riel/io_test.rb
+- test/riel/log/format_test.rb
+- test/riel/matchdata_test.rb
+- test/riel/optproc_test.rb
+- test/riel/pathname_test.rb
 - test/riel/rcfile_test.rb
-- test/riel/log_stack_test.rb
-- test/riel/hash_test.rb
+- test/riel/regexp_test.rb
 - test/riel/setdiff_test.rb
+- test/riel/size_converter_test.rb
 - test/riel/string_test.rb
-- test/riel/command_test.rb
+- test/riel/tempfile_test.rb
+- test/riel/testlog/log_stack_test.rb
+- test/riel/testlog/log_test.rb
+- test/riel/testlog/loggable_test.rb
 - test/riel/timer_test.rb
 - README.md
-has_rdoc: true
 homepage: http://www.incava.org/projects/riel
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extensions to core Ruby code.
-test_files: 
-- test/riel/date_test.rb
-- test/riel/size_converter_test.rb
-- test/riel/env_test.rb
+test_files:
 - test/riel/array_test.rb
-- test/riel/matchdata_test.rb
-- test/riel/text_test.rb
+- test/riel/command_test.rb
+- test/riel/date_test.rb
 - test/riel/dir_test.rb
-- test/riel/file_test.rb
-- test/riel/regexp_test.rb
 - test/riel/enumerable_test.rb
-- test/riel/asciitable/table_test.rb
-- test/riel/pathname_test.rb
-- test/riel/optproc_test.rb
-- test/riel/io_test.rb
-- test/riel/tempfile_test.rb
+- test/riel/env_test.rb
+- test/riel/file_test.rb
 - test/riel/filetype_test.rb
-- test/riel/log_test.rb
-- test/riel/text/ansi/ansi_palette_test.rb
-- test/riel/text/ansi/rgb_palette_test.rb
-- test/riel/text/ansi/grey_palette_test.rb
-- test/riel/text/ansi/ansi_highlight_test.rb
-- test/riel/text/ansi/rgb_highlighter_test.rb
-- test/riel/text/string_test.rb
-- test/riel/text/highlightable_test.rb
+- test/riel/hash_test.rb
 - test/riel/integer_test.rb
+- test/riel/io_test.rb
+- test/riel/log/format_test.rb
+- test/riel/matchdata_test.rb
+- test/riel/optproc_test.rb
+- test/riel/pathname_test.rb
 - test/riel/rcfile_test.rb
-- test/riel/log_stack_test.rb
-- test/riel/hash_test.rb
+- test/riel/regexp_test.rb
 - test/riel/setdiff_test.rb
+- test/riel/size_converter_test.rb
 - test/riel/string_test.rb
-- test/riel/command_test.rb
+- test/riel/tempfile_test.rb
+- test/riel/testlog/log_stack_test.rb
+- test/riel/testlog/log_test.rb
+- test/riel/testlog/loggable_test.rb
 - test/riel/timer_test.rb

data/lib/riel/ansicolor.rb

@@ -1,91 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-#     Attribute codes:
-#         00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-#     Text color codes:
-#         30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-#     Background color codes:
-#         40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-
-module ANSIColor
-  ATTRIBUTES = Hash[
-    'none'       => '0', 
-    'reset'      => '0',
-    'bold'       => '1',
-    'underscore' => '4',
-    'underline'  => '4',
-    'blink'      => '5',
-    'reverse'    => '7',
-    'concealed'  => '8',
-    'black'      => '30',
-    'red'        => '31',
-    'green'      => '32',
-    'yellow'     => '33',
-    'blue'       => '34',
-    'magenta'    => '35',
-    'cyan'       => '36',
-    'white'      => '37',
-    'on_black'   => '40',
-    'on_red'     => '41',
-    'on_green'   => '42',
-    'on_yellow'  => '43',
-    'on_blue'    => '44',
-    'on_magenta' => '45',
-    'on_cyan'    => '46',
-    'on_white'   => '47',
-  ]
-
-  ATTRIBUTES.each do |name, val|
-    eval <<-EODEF
-      def ANSIColor.#{name}
-        "\\e[#{val}m"
-      end
-    EODEF
-  end
-
-  def ANSIColor.attributes
-    ATTRIBUTES.collect { |name, val| name }
-  end
-  
-  # returns the code for the given color string, which is in the format:
-  # [foreground] on [background]. Note that the foreground and background sections
-  # can have modifiers (attributes). Examples:
-  #     black
-  #     blue on white
-  #     bold green on yellow
-  #     underscore bold magenta on cyan
-  #     underscore red on bold cyan
-
-  def ANSIColor.code str
-    fg, bg = str.split(/\s*\bon_?\s*/)
-    (fg ? foreground(fg) : "") + (bg ? background(bg) : "")
-  end
-
-  # returns the code for the given background color(s)
-  def ANSIColor.background bgcolor
-    make_code "on_" + bgcolor
-  end
-
-  # returns the code for the given foreground color(s)
-  def ANSIColor.foreground fgcolor
-    make_code fgcolor
-  end
-
-  protected
-
-  def ANSIColor.make_code str
-    if str
-      str.split.collect do |s|
-        if attr = ATTRIBUTES[s]
-          "\e[#{attr}m"
-        else
-          $stderr.puts "WARNING: ANSIColor::make_code(" + str + "): unknown color: " + s
-          return ""
-        end
-      end.join ""
-    else
-      ""
-    end
-  end
-end