riel 1.1.2 → 1.1.6

data/lib/riel/text.rb

@@ -26,7 +26,7 @@ module Text
       underscore
       underline
       blink
-      negative                  # not reverse, which is already defined for strings.
+      negative
       concealed
       black
       red
@@ -83,7 +83,7 @@ module Text
 
     attr_reader :colors
     
-    def self.parse_colors(str)
+    def self.parse_colors str
       str.scan(Regexp.new(COLORS_RE)).collect do |color|
         color[0] ? "on_" + color[0] : color[1]
       end
@@ -103,20 +103,23 @@ module Text
       all_colors
     end
 
-    all_colors.each do |name|
-      meth = Array.new
-      meth << "def #{name}(&blk)"
-      meth << "  color(\"#{name}\", &blk)"
-      meth << "end"
+    # todo: change this to use method_missing:
+    if false
+      all_colors.each do |name|
+        meth = Array.new
+        meth << "def #{name}(&blk)"
+        meth << "  color(\"#{name}\", &blk)"
+        meth << "end"
 
-      self.class_eval meth.join("\n")
+        self.class_eval meth.join("\n")
+      end
     end
     
-    def initialize(colors)
+    def initialize colors
       @colors = colors
     end
 
-    def highlight(str)
+    def highlight str
       # implemented by subclasses
     end
 
@@ -124,7 +127,7 @@ module Text
       (@colors || '').join(' ')
     end
 
-    def ==(other)
+    def == other
       return @colors.sort == other.colors.sort
     end
 
@@ -133,8 +136,8 @@ module Text
     # colorized and the stream is reset. Otherwise, only the code for the given
     # color name is returned.
     
-    def color(colorstr, obj = self, &blk)
-      #                        ^^^^ this is the Module self
+    def color colorstr, obj = self, &blk
+      #                       ^^^^ this is the Module self
 
       colornames = self.class.parse_colors(colorstr)
       result     = names_to_code(colornames)
@@ -162,27 +165,25 @@ module Text
     #     underscore bold magenta on cyan
     #     underscore red on cyan
 
-    def code(str)
+    def 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 background(bgcolor)
-      names_to_code("on_" + bgcolor)
+    def background bgcolor
+      names_to_code "on_" + bgcolor
     end
 
     # Returns the code for the given foreground color(s).
-    def foreground(fgcolor)
-      fgcolor.split(/\s+/).collect { |fg| names_to_code(fg) }.join("")
+    def foreground fgcolor
+      fgcolor.split(/\s+/).collect { |fg| names_to_code fg }.join("")
     end
 
   end
 
   # Highlights using ANSI escape sequences.
-
   class ANSIHighlighter < Highlighter
-
     ATTRIBUTES = Hash[
       'none'       => '0', 
       'reset'      => '0',
@@ -212,19 +213,18 @@ module Text
 
     RESET = "\e[0m"
 
-    def self.make(str)
-      colors = parse_colors(str)
-      ANSIHighlighter.new(colors)
+    def self.make str
+      colors = parse_colors str
+      ANSIHighlighter.new colors
     end
 
-    def initialize(colors = DEFAULT_COLORS)
+    def initialize colors = DEFAULT_COLORS
       super
       @code = nil
     end
 
     # Returns the escape sequence for the given names.
-
-    def names_to_code(names)
+    def names_to_code names
       str = ""
       names.each do |name|
         code = ATTRIBUTES[name]
@@ -235,11 +235,11 @@ module Text
       str
     end
 
-    def highlight(str)
+    def highlight str
       @code ||= begin
                   @code = @colors.collect do |color|
-                    names_to_code(color)
-                  end.join("")
+                    names_to_code color
+                  end.join ""
                 end
       
       @code + str + RESET
@@ -255,7 +255,6 @@ module Text
   # Thus, no magenta or cyan.
 
   class HTMLHighlighter < Highlighter
-
     def initialize
       # we need to know what we're resetting from (bold, font, underlined ...)
       @stack = []
@@ -263,7 +262,7 @@ module Text
 
     # Returns the start tag for the given name.
     
-    def start_style(name)
+    def start_style name
       case name
       when "negative"
         "<span style=\"color: white; background-color: black\">"
@@ -282,7 +281,7 @@ module Text
       "</span>"
     end
 
-    def color_value(cname)
+    def color_value cname
       case cname
       when "cyan"
         "#00FFFF"
@@ -294,8 +293,7 @@ module Text
     end
 
     # Returns the code for the given name.
-
-    def names_to_code(names)
+    def names_to_code names
       str = ""
 
       names.each do |name|
@@ -342,42 +340,51 @@ module Text
   # Does no highlighting.
 
   class NonHighlighter < Highlighter
-
     def initialize
-      super(nil)
+      super nil
     end
 
     # Since the NonHighlighter does no highlighting, and thus its name, this
     # returns an empty string.
-
-    def names_to_code(colorname)
+    def names_to_code colorname
       ""
     end
-
   end
 
-
   # An object that can be highlighted. This is used by the String class.
 
   module Highlightable
-
     # The highlighter for the class in which this module is included.
-
     @@highlighter = ANSIHighlighter.new(Text::Highlighter::DEFAULT_COLORS)
 
-    Text::Highlighter::all_colors.each do |name|
-      meth = Array.new
-      meth << "def #{name}(&blk)"
-      meth << "  @@highlighter.color(\"#{name}\", self, &blk)"
-      meth << "end"
+    if false
+      Text::Highlighter::ATTRIBUTES.each do |name|
+        meth = Array.new
+        meth << "def #{name}(&blk)"
+        meth << "  @@highlighter.color(\"#{name}\", self, &blk)"
+        meth << "end"
 
-      self.class_eval meth.join("\n")
+        self.class_eval meth.join("\n")
+      end
+    end
+
+    # this dynamically adds methods for individual colors.
+    def method_missing(meth, *args, &blk)
+      if Text::Highlighter::all_colors.include? meth.to_s
+        methdecl = Array.new
+        methdecl << "def #{meth}(&blk)"
+        methdecl << "  @@highlighter.color(\"#{meth}\", self, &blk)"
+        methdecl << "end"
+        self.class.class_eval methdecl.join("\n")
+        send meth, *args, &blk
+      else
+        super
+      end
     end
 
     # Sets the highlighter for this class. This can be either by type or by
     # String.
-
-    def highlighter=(hl)
+    def highlighter= hl
       $VERBOSE = false
       @@highlighter = case hl
                       when Text::Highlighter
@@ -393,11 +400,8 @@ module Text
                       end
       
     end
-
   end
-
   $HAVE_TEXT_HIGHLIGHT = true
-
 end
 
 # String is extended to support highlighting.

data/lib/riel.rb

@@ -1,13 +1,17 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+riellibdir = File.dirname(__FILE__)
+
+$:.unshift(riellibdir) unless
+  $:.include?(riellibdir) || $:.include?(File.expand_path(riellibdir))
 
 module RIEL
   VERSION = '0.0.1'
 end
 
-rbfiles = Dir[File.dirname(__FILE__) + "/riel/**/*.rb"]
+rbfiles = Dir[riellibdir + "/riel/**/*.rb"]
+
+rieldir = riellibdir + '/riel'
 
 rbfiles.sort.each do |rbfile|
-  rootname = rbfile.match(%r{.*/(\w+)\.rb})[1]
+  rootname = rbfile.sub(Regexp.new('^' + rieldir + '/([\/\w]+)\.rb'), '\1')
   require "riel/" + rootname
 end

data/test/riel/integer_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+require 'riel/integer'
+
+module PVN
+  class TestInteger < Test::Unit::TestCase
+    
+    def setup
+    end
+
+    def assert_true boolean, message = nil
+      assert boolean, message
+    end
+    
+    def assert_false boolean, message = nil
+      assert !boolean, message
+    end
+    
+    def assert_negative_integer val
+      assert_true Integer.negative? val
+    end
+    
+    def assert_not_negative_integer val
+      assert_false Integer.negative? val
+    end
+    
+    def test_negative_integer
+      assert_negative_integer(-3)
+      assert_negative_integer("-3")
+      assert_negative_integer(-10)
+      assert_negative_integer "-15"
+      assert_negative_integer(-100)
+      assert_negative_integer "-9002"
+
+      assert_not_negative_integer 1
+      assert_not_negative_integer "1"
+      assert_not_negative_integer 1.5
+      assert_not_negative_integer "5.1"
+      assert_not_negative_integer 123
+      assert_not_negative_integer "123"
+      assert_not_negative_integer "negative three"
+    end
+  end
+end

data/test/riel/io_test.rb

@@ -4,9 +4,7 @@
 require 'rubyunit'
 require 'riel/io'
 
-
 class IOTestCase < RUNIT::TestCase
-
   def xtest_readlines
     orig = $/
 
@@ -28,10 +26,9 @@ class IOTestCase < RUNIT::TestCase
 
     puts "writelines: <<<#{writelines}>>>"
     
-    IO.writelines(name, writelines)
+    IO.writelines name, writelines
 
-    readlines = IO.readlines name
+    readlines = IO::readlines name
     assert_equal writelines.collect { |line| line + "\n" }, readlines
   end
-
 end

data/test/riel/log_test.rb

@@ -1,9 +1,6 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
 require 'pathname'
 require 'rubyunit'
 require 'stringio'
@@ -39,15 +36,15 @@ class LogTestCase < RUNIT::TestCase
     }
 
     expected_output = [
-      "[log_test.rb    :  33] {test_output_arg     } hello, world?",
-      "[log_test.rb    :  34] {test_output_arg     } hello, world?",
-      "[log_test.rb    :  35] {test_output_arg     } hello, world?",
-      "[log_test.rb    :  36] {test_output_arg     } hello, world?",
-      "[log_test.rb    :  37] {test_output_arg     } hello, world?",
-      "[log_test.rb    :  38] {test_output_arg     } hello, world?",
-      "[log_test.rb    : 165] {call                } ",
-      "[log_test.rb    : 165] {run_test            } ",
-      "[log_test.rb    :  71] {test_output_arg     } ",
+      "[ ...test/riel/log_test.rb:  30] {test_output_arg     } hello, world?",
+      "[ ...test/riel/log_test.rb:  31] {test_output_arg     } hello, world?",
+      "[ ...test/riel/log_test.rb:  32] {test_output_arg     } hello, world?",
+      "[ ...test/riel/log_test.rb:  33] {test_output_arg     } hello, world?",
+      "[ ...test/riel/log_test.rb:  34] {test_output_arg     } hello, world?",
+      "[ ...test/riel/log_test.rb:  35] {test_output_arg     } hello, world?",
+      "[ ...test/riel/log_test.rb: 163] {call                } ",
+      "[ ...test/riel/log_test.rb: 163] {run_test            } ",
+      "[ ...test/riel/log_test.rb:  68] {test_output_arg     } ",
       nil,
       nil,
       nil,
@@ -68,15 +65,16 @@ class LogTestCase < RUNIT::TestCase
       nil,
     ]
 
-    run_test(@verbose_setup, log, *expected_output)
+    run_test @verbose_setup, log, *expected_output
   end
 
   def test_output_block
     log = Proc.new { 
-      Log.log { "hello, world?" }
+      Log.log { "output block" }
     }
     
-    run_test(@verbose_setup, log, "[log_test.rb    :  76] {test_output_block   } hello, world?")
+    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
@@ -99,7 +97,7 @@ class LogTestCase < RUNIT::TestCase
     }
     
     Log.set_widths(-15, 4, -40)
-    run_test(@verbose_setup, log, "[log_test.rb    :  98] {LogTestCase#test_instance_log           } hello, world?")
+    run_test(@verbose_setup, log, "[ ...log_test.rb:  96] {LogTestCase#test_instance_log           } hello, world?")
 
     Log.set_default_widths
   end
@@ -112,40 +110,40 @@ class LogTestCase < RUNIT::TestCase
     }
     
     run_test(@verbose_setup, log,
-             "[log_test.rb    : 109] {LogTestCase#test_col} \e[37mwhite wedding\e[0m",
-             "[log_test.rb    : 110] {LogTestCase#test_col} \e[34mblue iris\e[0m",
-             "[log_test.rb    : 111] {LogTestCase#test_col} \e[46mred\e[0m")
+             "[ ...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 test_format
     log = Proc.new { 
-      Log.log "hello, world?"
+      Log.log "format"
     }
     
     Log.set_default_widths
-    run_test(@verbose_setup, log, "[log_test.rb    : 124] {test_format         } hello, world?")
+    run_test(@verbose_setup, log, "[ ...test/riel/log_test.rb: 122] {test_format         } format")
 
     # Log.set_widths(file_width, line_width, func_width)
     
-    run_format_test(log, -25,    8, 30, "[log_test.rb              :     124] {                   test_format} hello, world?")
-    run_format_test(log,  25,    8, 30, "[              log_test.rb:     124] {                   test_format} hello, world?")
-    run_format_test(log,  25, "08", 30, "[              log_test.rb:00000124] {                   test_format} hello, world?")
+    run_format_test(log, -25,    8, 30, "[ ...test/riel/log_test.rb:     122] {                   test_format} format")
+    run_format_test(log,  25,    8, 30, "[ ...test/riel/log_test.rb:     122] {                   test_format} format")
+    run_format_test(log,  25, "08", 30, "[ ...test/riel/log_test.rb:00000122] {                   test_format} format")
     
     # useless feature of truncating line numbers, but so it goes ...
-    run_format_test(log,   4,   2, -10, "[log_:12] {test_forma} hello, world?")
+    run_format_test(log,   4,   2, -10, "[ ...:12] {test_forma} format")
     
     Log.set_default_widths
   end
 
-  def run_format_test(log, file_width, line_width, func_width, expected)
-    Log.set_widths(file_width, line_width, func_width)
-    run_test(@verbose_setup, log, expected)
+  def run_format_test log, file_width, line_width, func_width, expected
+    Log.set_widths file_width, line_width, func_width
+    run_test @verbose_setup, log, expected
   end    
 
   # the ctor is down here so the lines above are less likely to change.
-  def initialize(test, name)
+  def initialize test, name
     @nonverbose_setup = Proc.new {
       Log.verbose = false
       Log.output  = StringIO.new
@@ -159,16 +157,16 @@ class LogTestCase < RUNIT::TestCase
     super
   end
 
-  def run_test(setup, log, *expected)
+  def run_test setup, log, *expected
     io = setup.call
 
     log.call
 
-    assert_not_nil(io)
+    assert_not_nil io
     str = io.string
     assert_not_nil str
 
-    lines = str.split("\n")
+    lines = str.split "\n"
 
     assert_equals expected.size, lines.size, "number of lines of output"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riel
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 -04:00
+date: 2012-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: 
+description: This library extends the core Ruby libraries.
 email: jpace@incava.org
 executables: []
 
@@ -28,52 +28,63 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/riel.rb
-- lib/riel/filetype.rb
-- lib/riel/rcfile.rb
-- lib/riel/matchdata.rb
-- lib/riel/enumerable.rb
-- lib/riel/size_converter.rb
-- lib/riel/pathname.rb
 - lib/riel/array.rb
-- lib/riel/io.rb
-- lib/riel/regexp.rb
-- lib/riel/ansicolor.rb
-- lib/riel/date.rb
+- lib/riel/size_converter.rb
+- lib/riel/enumerable.rb
+- lib/riel/timer.rb
 - lib/riel/hash.rb
-- lib/riel/optproc.rb
-- lib/riel/command.rb
-- lib/riel/tempfile.rb
-- lib/riel/file.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/pathname.rb
+- lib/riel/file.rb
+- lib/riel/integer.rb
+- lib/riel/ansicolor.rb
+- lib/riel/optproc.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/rcfile.rb
 - lib/riel/log.rb
-- lib/riel/timer.rb
-- lib/riel/string.rb
-- lib/riel/setdiff.rb
-- test/riel/setdiff_test.rb
-- test/riel/command_test.rb
-- test/riel/log_test.rb
-- test/riel/array_test.rb
-- test/riel/optproc_test.rb
-- test/riel/tempfile_test.rb
-- test/riel/timer_test.rb
-- test/riel/regexp_test.rb
-- test/riel/dir_test.rb
+- lib/riel/date.rb
+- lib/riel.rb
 - test/riel/date_test.rb
 - test/riel/size_converter_test.rb
 - test/riel/env_test.rb
-- test/riel/file_test.rb
-- test/riel/filetype_test.rb
+- test/riel/array_test.rb
+- test/riel/matchdata_test.rb
 - test/riel/text_test.rb
-- test/riel/string_test.rb
+- test/riel/dir_test.rb
+- test/riel/file_test.rb
+- test/riel/regexp_test.rb
 - test/riel/enumerable_test.rb
-- test/riel/matchdata_test.rb
 - test/riel/pathname_test.rb
-- test/riel/hash_test.rb
-- test/riel/rcfile_test.rb
+- test/riel/optproc_test.rb
 - test/riel/io_test.rb
+- test/riel/tempfile_test.rb
+- test/riel/filetype_test.rb
+- test/riel/log_test.rb
+- test/riel/integer_test.rb
+- test/riel/rcfile_test.rb
+- test/riel/hash_test.rb
+- test/riel/setdiff_test.rb
+- test/riel/string_test.rb
+- test/riel/command_test.rb
+- test/riel/timer_test.rb
 - README
 has_rdoc: true
 homepage: http://www.incava.org/projects/riel
@@ -105,30 +116,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Set of extensions to core Ruby code.
+summary: Extensions to core Ruby code.
 test_files: 
-- test/riel/setdiff_test.rb
-- test/riel/command_test.rb
-- test/riel/log_test.rb
-- test/riel/array_test.rb
-- test/riel/optproc_test.rb
-- test/riel/tempfile_test.rb
-- test/riel/timer_test.rb
-- test/riel/regexp_test.rb
-- test/riel/dir_test.rb
 - test/riel/date_test.rb
 - test/riel/size_converter_test.rb
 - test/riel/env_test.rb
-- test/riel/file_test.rb
-- test/riel/filetype_test.rb
+- test/riel/array_test.rb
+- test/riel/matchdata_test.rb
 - test/riel/text_test.rb
-- test/riel/string_test.rb
+- test/riel/dir_test.rb
+- test/riel/file_test.rb
+- test/riel/regexp_test.rb
 - test/riel/enumerable_test.rb
-- test/riel/matchdata_test.rb
 - test/riel/pathname_test.rb
-- test/riel/hash_test.rb
-- test/riel/rcfile_test.rb
+- test/riel/optproc_test.rb
 - test/riel/io_test.rb
+- test/riel/tempfile_test.rb
+- test/riel/filetype_test.rb
+- test/riel/log_test.rb
+- test/riel/integer_test.rb
+- test/riel/rcfile_test.rb
+- test/riel/hash_test.rb
+- test/riel/setdiff_test.rb
+- test/riel/string_test.rb
+- test/riel/command_test.rb
+- test/riel/timer_test.rb