riel 1.1.7 → 1.1.10

data/lib/riel/ansicolor.rb

@@ -64,12 +64,12 @@ module ANSIColor
 
   # returns the code for the given background color(s)
   def ANSIColor.background bgcolor
-    make_code("on_" + bgcolor)
+    make_code "on_" + bgcolor
   end
 
   # returns the code for the given foreground color(s)
   def ANSIColor.foreground fgcolor
-    make_code(fgcolor)
+    make_code fgcolor
   end
 
   protected
@@ -83,7 +83,7 @@ module ANSIColor
           $stderr.puts "WARNING: ANSIColor::make_code(" + str + "): unknown color: " + s
           return ""
         end
-      end.join("")
+      end.join ""
     else
       ""
     end

data/lib/riel/array.rb

@@ -15,7 +15,7 @@ class Array
 
   # $$$ this is the same as Array.sample
   def rand
-    return self[Kernel.rand(length)]
+    return self[Kernel.rand length]
   end
   
 end

data/lib/riel/date.rb

@@ -9,7 +9,7 @@ class Date
 
   # Returns the number of days in the given month.
   
-  def self.days_in_month(year, month)
+  def self.days_in_month year, month
     (Date.new(year, 12, 31) << (12 - month)).day
   end
 

data/lib/riel/dir.rb

@@ -35,7 +35,7 @@ class Dir
     if dir.readable?
       dir.children.sort.each do |child|
         if child.exist? && child.directory?
-          self.remove_if_empty(child, subargs)
+          self.remove_if_empty child, subargs
         end
       end
       
@@ -45,10 +45,10 @@ class Dir
         can_delete = dir.children.all? do |x| 
           bname = x.basename.to_s
           deletable.any? do |del|
-            if del.kind_of?(String)
+            if del.kind_of? String
               bname == del
-            elsif del.kind_of?(Regexp)
-              del.match(bname)
+            elsif del.kind_of? Regexp
+              del.match bname
             else
               false
             end
@@ -75,15 +75,15 @@ class Dir
 
   # Moves and copies files to the given directory, creating
   # it if it does not exist.
-  def self.move_and_copy_files(dir, move_files, copy_files)
+  def self.move_and_copy_files dir, move_files, copy_files
     dir.mkdir unless dir.exist?
 
     move_files.each do |mfile|
-      File.move(mfile.to_s, dir.to_s)
+      File.move mfile.to_s, dir.to_s
     end
 
     copy_files.each do |cfile|
-      File.copy(cfile.to_s, dir.to_s)
+      File.copy cfile.to_s, dir.to_s
     end
   end
 

data/lib/riel/env.rb

@@ -2,9 +2,7 @@
 # -*- ruby -*-
 
 module Env
-
   # Returns the home directory, for both Unix and Windows.
-
   def self.home_directory
     if hm = ENV["HOME"]
       hm
@@ -38,12 +36,11 @@ module Env
   
   # Reads the environment variable, splitting it according to its quoting.
 
-  def self.split(varname)
+  def self.split varname
     if v = ENV[varname]
       v.scan(REGEXP).collect { |x| x[1] || x[2] }
     else
       []
     end
   end
-
 end

data/lib/riel/file.rb

@@ -15,17 +15,16 @@ path = ENV['PATH'].dup
 $VERBOSE = orig_verbose
 
 class File
-
-  def self.text?(file)
+  def self.text? file
     return File.file?(file) && FileType.instance.text?(file)
   end
 
-  def self.binary?(file)
+  def self.binary? file
     return !self.text?(file)
   end
 
   # Returns whether the given object is a file. Ignores errors.
-  def self.is_file?(fd)
+  def self.is_file? fd
     begin 
       return self.stat(fd).file?
     rescue
@@ -35,7 +34,7 @@ class File
   end
   
   # Returns whether the given file is writable. Ignores errors.
-  def self.is_writable?(file)
+  def self.is_writable? file
     begin 
       return self.stat(file).writable?
     rescue
@@ -45,7 +44,7 @@ class File
   end
   
   # Returns whether the given object is a directory. Ignores errors.
-  def self.is_directory?(fd)
+  def self.is_directory? fd
     begin 
       return self.stat(fd).directory?
     rescue
@@ -55,61 +54,61 @@ class File
   end
 
   # Returns an array of all files under the given directory.
-  def self.find_files(dir)
+  def self.find_files dir
     files = Array.new
     Find.find(dir) { |f| files.push(f) if is_file?(f) }
     files
   end
 
   # Returns an array of all directory under the given directory.
-  def self.find_directories(dir)
+  def self.find_directories dir
     dirs = Array.new
     Find.find(dir) { |d| dirs.push(d) if is_directory?(d) }
     dirs
   end
 
   # Removes the file/directory, including all subelements. Use with caution!
-  def self.remove_recursively(fd)
+  def self.remove_recursively fd
     #$$$ this is rmtree
     if fd.directory?
-      fd.children.each { |x| remove_recursively(x) }
+      fd.children.each { |x| remove_recursively x }
     end
     fd.unlink
   end
 
   # Creates the given directory.
-  def self.mkdir(dir)
-    pn = Pathname.new(dir)
+  def self.mkdir dir
+    pn = Pathname.new dir
     pn.mkdir unless pn.exist?
   end
 
   # Moves the files to the given directory, creating it if it does not exist.
-  def self.move_files(dir, files)
-    mkdir(dir)
+  def self.move_files dir, files
+    mkdir dir
 
     files.each do |file|
-      FileUtils.move(file.to_s, dir.to_s)
+      FileUtils.move file.to_s, dir.to_s
     end
   end
 
   # Copies the files to the given directory, creating it if it does not exist.
-  def self.copy_files(dir, files)
-    mkdir(dir)
+  def self.copy_files dir, files
+    mkdir dir
 
     files.each do |file|
-      FileUtils.copy(file.to_s, dir.to_s)
+      FileUtils.copy file.to_s, dir.to_s
     end
   end
 
   # Converts the argument to a Pathname.
-  def self._to_pathname(file)
+  def self._to_pathname file
     file.kind_of?(Pathname) ? file : Pathname.new(file.to_s)
   end
 
   # Reads a file line by line. Returns the pathname for the file, or nil if it
   # does not exist.
-  def self.read_file(file, &blk)
-    fpn = _to_pathname(file)
+  def self.read_file file, &blk
+    fpn = _to_pathname file
     if fpn.exist?
       fpn.open do |f|
         blk.call f.read
@@ -123,7 +122,7 @@ class File
   # Reads a file line by line, calling the given block. Returns the pathname for
   # the file, or nil if it does not exist.
   def self.read_file_lines(file, &blk)
-    fpn = _to_pathname(file)
+    fpn = _to_pathname file
     if fpn.exist?
       fpn.open do |f|
         f.each_line do |line|
@@ -138,12 +137,11 @@ class File
 
   # Opens a file for writing and delegates to the given block.
   def self.open_writable_file(file, &blk)
-    fpn = _to_pathname(file)
+    fpn = _to_pathname file
     
     fpn.open(File::WRONLY | File::TRUNC | File::CREAT) do |f|
-      blk.call(f)
+      blk.call f
     end
-
     fpn
   end
 
@@ -169,15 +167,15 @@ class File
   def self.open_via_temp_file(file, tempfile = nil, tempdir = Dir::tmpdir, &blk)
     tempname = nil
     
-    fpn = _to_pathname(file)
+    fpn = _to_pathname file
     tempfile ||= fpn.rootname
 
     Tempfile.open(tempfile) do |tf|
-      blk.call(tf)
+      blk.call tf
       tempname = tf.path
     end
     
-    FileUtils.mv(tempname, file.to_s)
+    FileUtils.mv tempname, file.to_s
   end
 
   # Writes a file, using write, buffering it via a temp file.
@@ -197,7 +195,7 @@ class File
   # Returns a file for the given basename, sequentially appending an integer
   # until one is found that does not exist. For example, "foo.3" if "foo",
   # "foo.1", and "foo.2" already exist.
-  def self.get_unused_file_name(basename)
+  def self.get_unused_file_name basename
     tgt = basename
     if tgt.exist?
       i = 1

data/lib/riel/filetype.rb

@@ -71,18 +71,18 @@ class FileType
     set_extensions(false, *NONTEXT_EXTENSIONS)
   end
 
-  def ascii?(c)
+  def ascii? c
     # from ctype.h
     (c.to_i & ~0x7f) == 0
   end
 
-  def type(file)
+  def type file
     begin
       case File.stat(file).ftype
       when "directory"
         DIRECTORY
       when "file"
-        if File.readable?(file)
+        if File.readable? file
           text?(file) ? TEXT : BINARY
         else
           UNREADABLE
@@ -120,12 +120,12 @@ class FileType
     @known.keys.reject { |suf| @known[suf] }
   end
 
-  def text?(file)
+  def text? file
     return false unless File.exists?(file)
     
     if md = EXTENSION_REGEXP.match(file.to_s)
       suffix = md[1]
-      if @known.include?(suffix)
+      if @known.include? suffix
         return @known[suffix]
       end
     end
@@ -135,7 +135,7 @@ class FileType
 
     begin
       File.open(file) do |f|
-        buf = f.read(@test_length)
+        buf = f.read @test_length
         if buf
           buf.each_byte do |ch|
             ntested += 1
@@ -158,20 +158,20 @@ class FileType
     nodd < ntested * @odd_factor
   end
 
-  def self.ascii?(c)
-    return self.instance.ascii?(c)
+  def self.ascii? c
+    return self.instance.ascii? c
   end
 
-  def self.type(file)
-    return self.instance.type(file)
+  def self.type file
+    return self.instance.type file
   end
 
-  def self.set_text(ext)
-    return self.instance.set_text(ext)
+  def self.set_text ext
+    return self.instance.set_text ext
   end
 
-  def self.set_nontext(ext)
-    return self.instance.set_nontext(ext)
+  def self.set_nontext ext
+    return self.instance.set_nontext ext
   end
 
   def self.text_extensions
@@ -182,8 +182,7 @@ class FileType
     return self.instance.nontext_extensions
   end
 
-  def self.text?(file)
-    return self.instance.text?(file)
+  def self.text? file
+    return self.instance.text? file
   end
-
 end

data/lib/riel/log/logger.rb

@@ -163,6 +163,7 @@ module RIEL
         stk = caller depth
         for frame in stk
           print_stack_frame frame, cname, msg, lvl, &blk
+          cname = nil
           msg = ""
         end
       end

data/lib/riel/optproc.rb

@@ -6,7 +6,6 @@ require 'riel/log'
 require 'riel/text'
 require 'riel/enumerable'
 
-
 module OptProc
 
   class Option
@@ -25,7 +24,7 @@ module OptProc
     ARG_TYPES << [ :string,  ARG_STRING  ]
     ARG_TYPES << [ :boolean, ARG_BOOLEAN ]
 
-    def initialize(args = Hash.new, &blk)
+    def initialize args = Hash.new, &blk
       @tags    = args[:tags] || Array.new
       @rc      = args[:rc]
       @rc      = [ @rc ] if @rc.kind_of?(String)
@@ -41,10 +40,8 @@ module OptProc
       @res     = [ @res ] if @res.kind_of?(Regexp)
       
       if args[:arg]
-        # log { "args.class: #{args[:arg].class}" }
         demargs = args[:arg].dup
         while arg = demargs.shift
-          # log { "arg: #{arg}" }
           case arg
           when :required
             @type = "required"
@@ -56,19 +53,13 @@ module OptProc
             @valuere = demargs.shift
           else
             if re = ARG_TYPES.assoc(arg)
-              # log { "re: #{re}" }
               @valuere   = re[1]
               @argtype   = arg
               @type    ||= "required"
-            else
-              # log { "no expression for arg #{arg}" }
             end
           end
         end
       end
-
-      # log { "valuere: #{@valuere}" }
-      # log { "type: #{@type}" }
     end
 
     def inspect
@@ -80,101 +71,76 @@ module OptProc
     end
 
     def to_s
-      @tags.join(" ")
+      @tags.join " "
     end
 
-    def match_rc?(field)
+    def match_rc? field
       @rc && @rc.include?(field)
     end
 
-    def match_value(val)
-      # log { "valuere: #{@valuere.inspect}; val: #{val}" }
+    def match_value val
       @md = @valuere && @valuere.match(val)
-      # log { "md: #{@md.inspect}" }
       @md && @md[1]
     end
 
-    def match_tag(tag)
-      stack { "@rc: #{@rc.inspect}; @tags: #{@tags.inspect}" }
-
+    def match_tag tag
       if tm = @tags.detect do |t|
-          log { "t: #{t}; tag: #{tag}; idx: #{t.index(tag)}" }
           t.index(tag) == 0 && tag.length <= t.length
         end
         
-        log { "tm: #{tm}" }
         if tag.length == tm.length
           1.0
         else
-          len = tag.length.to_f * 0.01 #  / tm.length
-          log { "len: #{len}" }
-          len
+          tag.length.to_f * 0.01
         end
       else
         nil
       end
     end
     
-    def match(args, opt = args[0])
-      return nil unless %r{^-}.match(opt)
-
-      # log { "opt: #{opt.inspect}; args: #{args.inspect}" }
-      # log { "@rc: #{@rc.inspect}; @re: #{@re.inspect}; @tags: #{@tags.inspect}" }
+    def match args, opt = args[0]
+      return nil unless %r{^-}.match opt
 
       tag, val = opt.split('=', 2)
       tag ||= opt
 
-      # log { "opt: #{opt}; opt: #{opt.class}; tag: #{tag}; tags: #{@tags.inspect}" }
-      # log { "res: #{@res.inspect}" }
-
       @md = nil
       
       if @res && (@md = @res.collect { |re| re.match(opt) }.detect)
-        # log { "matched: #{@md}" }
         1.0
       else
-        match_tag(tag)
+        match_tag tag
       end
     end
 
-    def set_value(args, opt = args[0])
-      tag, val = opt.split('=', 2)
+    def set_value args, opt = args[0]
+      tag, val = opt.split '=', 2
       args.shift
-      
-      # log { "opt : #{opt}" }
-      # log { "tag : #{tag}" }
-      # log { "tags: #{@tags.inspect}" }
-      # log { "val : #{val.inspect}" }
-      # log { "md  : #{@md.inspect}" }
 
       if @md
-        # log { "already have match data" }
+        # already have match data
       elsif @type == "required"
         if val
           # already have value
-          # log { "already have value: #{val}" }
         elsif args.size > 0
           val = args.shift
-          # log { "got next value: #{val}" }
         else
           $stderr.puts "value expected"
         end
 
         if val
-          match_value(val)
+          match_value val
         end
       elsif @type == "optional"
         if val
-          # log { "already have value: #{val}" }
-          match_value(val)
+          # already have value
+          match_value val
         elsif args.size > 0
-          if %r{^-}.match(args[0])
-            # log { "skipping next value; apparently option" }
-          elsif match_value(args[0])
-            # log { "value matches: #{val}" }
+          if %r{^-}.match args[0]
+            # skipping next value; apparently option
+          elsif match_value args[0]
+            # value matches
             args.shift
-          else
-            # log { "value does not match" }
           end
         end
       else
@@ -183,7 +149,7 @@ module OptProc
 
       value = value_from_match
 
-      set(value, opt, args)
+      set value, opt, args
     end
 
     def value_from_match
@@ -191,14 +157,14 @@ module OptProc
         if @argtype.nil? || @argtype == :regexp
           @md
         else
-          convert_value(@md[1])
+          convert_value @md[1]
         end
       elsif @argtype == :boolean
         true
       end
     end
 
-    def convert_value(val)
+    def convert_value val
       if val
         case @argtype
         when :string
@@ -208,7 +174,7 @@ module OptProc
         when :float
           val.to_f
         when :boolean
-          to_boolean(val)
+          to_boolean val
         when :regexp
           val
         when nil
@@ -221,11 +187,11 @@ module OptProc
       end
     end
 
-    def to_boolean(val)
+    def to_boolean val
       %w{ yes true on soitenly }.include?(val.downcase)
     end
 
-    def set(val, opt = nil, args = nil)
+    def set val, opt = nil, args = nil
       # log { "argtype: #{@argtype}; md: #{@md.inspect}" }
 
       setargs = [ val, opt, args ].select_with_index { |x, i| i < @set.arity }
@@ -240,14 +206,14 @@ module OptProc
 
     attr_reader :options
     
-    def initialize(data)
+    def initialize data
       @options   = Array.new
       @shortopts = Array.new
       @longopts  = Array.new
       @regexps   = Hash.new
       
       data.each do |optdata|
-        opt = OptProc::Option.new(optdata)
+        opt = OptProc::Option.new optdata
         @options << opt
 
         opt.tags.each do |tag|
@@ -295,12 +261,12 @@ module OptProc
       Regexp.new('^ ( - [a-z] )  ( .+    ) $ ', Regexp::EXTENDED)
     ]
 
-    def process_option(args)
+    def process_option args
       opt = args[0]
 
       # log { "processing option #{opt}" }
 
-      if md = COMBINED_OPTS_RES.collect { |re| re.match(opt) }.detect
+      if md = COMBINED_OPTS_RES.collect { |re| re.match opt }.detect
         lhs = md[1]
         rhs = "-" + md[2]
 
@@ -308,7 +274,7 @@ module OptProc
         
         args[0, 1] = lhs, rhs
         
-        return process_option(args)
+        return process_option args
       elsif opt[0] == 45
         ch = opt[1]
         assocopts = if ch == 45  # 45 = '-'
@@ -333,7 +299,7 @@ module OptProc
         log { "bestmatch: #{@bestmatch}" }
         log { "bestopts : #{@bestopts.inspect}" }
         if @bestopts.size == 1
-          @bestopts[0].set_value(args)
+          @bestopts[0].set_value args
           return @bestopts[0]
         else
           optstr = @bestopts.collect { |x| '(' + x.tags.join(', ') + ')' }.join(', ')
@@ -345,7 +311,7 @@ module OptProc
       nil
     end
 
-    def set_option(optlist, args)
+    def set_option optlist, args
       @bestmatch = nil
       @bestopts  = Array.new
       
@@ -353,7 +319,7 @@ module OptProc
         if mv = option.match(args)
           if mv >= 1.0
             # exact match:
-            option.set_value(args)
+            option.set_value args
             return option
           elsif !@bestmatch || @bestmatch <= mv
             @bestmatch = mv

data/lib/riel/rcfile.rb

@@ -16,7 +16,7 @@ class RCFile
   def initialize(fname, &blk)
     @settings = Array.new
     
-    if File.exists?(fname)
+    if File.exists? fname
       IO::readlines(fname).each do |line|
         line.sub!(/\s*#.*/, "")
         line.chomp!
@@ -26,7 +26,7 @@ class RCFile
           value.strip!
           @settings << [ name, value ]
           if blk
-            blk.call(name, value)
+            blk.call name, value
           end
         end
       end

data/lib/riel/regexp.rb

@@ -4,7 +4,7 @@
 # Negates the given expression.
 class NegatedRegexp < Regexp
 
-  def match(str)
+  def match str
     !super
   end
 
@@ -27,7 +27,7 @@ class Regexp
 
   # Returns a regular expression for the given Unix file system expression.
   
-  def self.unixre_to_string(pat)
+  def self.unixre_to_string pat
     pat.gsub(%r{(\\.)|(.)}) do
       $1 || SH2RE[$2] || $2
     end
@@ -70,7 +70,7 @@ class Regexp
   # Handles negation, whole words, and ignore case (Ruby no longer supports
   # Rexexp.new(/foo/i), as of 1.8).
   
-  def self.create(pat, args = Hash.new)
+  def self.create pat, args = Hash.new
     negated    = args[:negated]
     ignorecase = args[:ignorecase]
     wholewords = args[:wholewords]
@@ -134,19 +134,19 @@ class Regexp
       tot | (val ? flag : 0)
     end
     
-    reclass.new(pattern, flags)
+    reclass.new pattern, flags
   end
 
-  def self.matches_word_start?(pat)
-    WORD_START_RE.match(pat)
+  def self.matches_word_start? pat
+    WORD_START_RE.match pat
   end
 
-  def self.matches_word_end?(pat)
-    WORD_END_RE.match(pat)
+  def self.matches_word_end? pat
+    WORD_END_RE.match pat
   end
 
   # applies Perl-style substitution (s/foo/bar/).
-  def self.perl_subst(pat)
+  def self.perl_subst pat
   end
   
 end

data/lib/riel/setdiff.rb

@@ -5,7 +5,7 @@
 # identical, A contains B, B contains A, or A and B contain common elements.
 
 class SetDiff
-  def SetDiff.new(a, b)
+  def SetDiff.new a, b
     allitems = a | b
 
     a_and_b    = Array.new
@@ -13,8 +13,8 @@ class SetDiff
     b_not_in_a = Array.new
 
     allitems.each do |it|
-      if a.include?(it)
-        if b.include?(it)
+      if a.include? it
+        if b.include? it
           a_and_b
         else
           a_not_in_b
@@ -24,12 +24,12 @@ class SetDiff
       end << it
     end
     
-    super(a_and_b, a_not_in_b, b_not_in_a)
+    super a_and_b, a_not_in_b, b_not_in_a
   end
 
   attr_reader :a_and_b, :a_not_in_b, :b_not_in_a
 
-  def initialize(a_and_b, a_not_in_b, b_not_in_a)
+  def initialize a_and_b, a_not_in_b, b_not_in_a
     @a_and_b    = a_and_b
     @a_not_in_b = a_not_in_b
     @b_not_in_a = b_not_in_a

data/lib/riel/size_converter.rb

@@ -5,7 +5,7 @@ class SizeConverter
   # http://www.gnu.org/software/coreutils/manual/html_node/Block-size.html
 
   # don't round to closest -- just convert
-  def self.convert_to_kilobytes(size, decimal_places = 1)
+  def self.convert_to_kilobytes size, decimal_places = 1
     ### SizeConverter._convert(Human::CONVERSIONS, 2, size, decimal_places)
   end
 
@@ -20,8 +20,8 @@ class SizeConverter
     # returns a string representation of the size. Note that K, G, M are
     # gibibytes, etc., that is, powers of 10.
     
-    def self.convert(size, decimal_places = 1)
-      SizeConverter._convert(CONVERSIONS, 10, size, decimal_places)
+    def self.convert size, decimal_places = 1
+      SizeConverter._convert CONVERSIONS, 10, size, decimal_places
     end
   end
 
@@ -37,26 +37,26 @@ class SizeConverter
     # returns a string representation of the size. Note that K, G, M are
     # gigabytes, etc.
     
-    def self.convert(size, decimal_places = 1)
-      SizeConverter._convert(CONVERSIONS, 2, size, decimal_places)
+    def self.convert size, decimal_places = 1
+      SizeConverter._convert CONVERSIONS, 2, size, decimal_places
     end
   end
 
   # legacy:
 
-  def self.convert(size, decimal_places = 1)
-    Human::convert(size, decimal_places)
+  def self.convert size, decimal_places = 1
+    Human::convert size, decimal_places
   end
 
-  def self._convert(conversions, base, size, decimal_places)
+  def self._convert conversions, base, size, decimal_places
     sizef = size.to_f
     conversions.each do |conv|
       sz = sizef / (base ** conv[0])
       if sz >= 1.0
-        return sprintf("%.*f%s", decimal_places, sz, conv[1])
+        return sprintf "%.*f%s", decimal_places, sz, conv[1]
       end
     end
 
-    sprintf("%.*f", decimal_places, size)
+    sprintf "%.*f", decimal_places, size
   end
 end

data/lib/riel/string.rb

@@ -36,7 +36,7 @@ class String
   # Returns a string based on this instance, with the first occurrance of
   # +other+ removed. +other+ may be a string or regular expression.
   #
-  def -(other)
+  def - other
     sub other, ''
   end
 
@@ -53,8 +53,8 @@ class String
   #
   # A class method for +to_ranges+. Deprecated in favor of the instance method.
   # 
-  def self.to_ranges(str, args = Hash.new)
-    str.to_ranges(args)
+  def self.to_ranges str, args = Hash.new
+    str.to_ranges args
   end
 
   # 
@@ -83,7 +83,7 @@ class String
       md   = section.match(RANGE_REGEXP)
       next unless md
       
-      from = String._matchdata_to_number(md, 1, min)
+      from = String._matchdata_to_number md, 1, min
       to   = String._has_matchdata?(md, 2) ? String._matchdata_to_number(md, 3, max) : from
 
       prevrange = ranges[-1]
@@ -108,7 +108,7 @@ class String
   #
   def highlight re, color
     gsub(re) do |match|
-      HIGHLIGHTER.color(color, match)
+      HIGHLIGHTER.color color, match
     end
   end
 

data/lib/riel/tempfile.rb

@@ -3,11 +3,8 @@
 
 require 'tempfile'
 
-
 class Tempfile
-
   class << self
-
     alias_method :original_open, :open
 
     # this works around the behavior (fixed in 1.9) so that open returns
@@ -24,5 +21,4 @@ class Tempfile
       tempname
     end
   end
-
 end

data/lib/riel/text.rb

@@ -139,13 +139,13 @@ module Text
     def color colorstr, obj = self, &blk
       #                       ^^^^ this is the Module self
 
-      colornames = self.class.parse_colors(colorstr)
-      result     = names_to_code(colornames)
+      colornames = self.class.parse_colors colorstr
+      result     = names_to_code colornames
       
       if blk
         result << blk.call
         result << names_to_code("reset")
-      elsif obj.kind_of?(String)
+      elsif obj.kind_of? String
         result << obj
         result << names_to_code("reset")
       end
@@ -267,10 +267,10 @@ module Text
       when "negative"
         "<span style=\"color: white; background-color: black\">"
       when /on_(\w+)/
-        colval = color_value($1)
+        colval = color_value $1
         "<span style=\"background-color: #{colval}\">"
       else
-        colval = color_value(name)
+        colval = color_value name
         "<span style=\"color: #{colval}\">"
       end
     end
@@ -355,7 +355,7 @@ module Text
 
   module Highlightable
     # The highlighter for the class in which this module is included.
-    @@highlighter = ANSIHighlighter.new(Text::Highlighter::DEFAULT_COLORS)
+    @@highlighter = ANSIHighlighter.new Text::Highlighter::DEFAULT_COLORS
 
     if false
       Text::Highlighter::ATTRIBUTES.each do |name|

data/lib/riel/timer.rb

@@ -5,8 +5,8 @@ require 'riel/log'
 
 class Timer
 
-  def initialize(what, args = Hash.new)
-    if args.kind_of?(Fixnum)
+  def initialize what, args = Hash.new
+    if args.kind_of? Fixnum
       args = { :level => args }
     end
 
@@ -18,18 +18,18 @@ class Timer
     elmsg  = args.include?(:elmsg)    ? args[:elmsg]    : "#{what} elapsed   "
     
     sttime = Time.new
-    logmsg(stmsg,  sttime)
+    logmsg stmsg,  sttime
     
     yield
     
     endtime = Time.new
     
-    logmsg(stmsg,  sttime)
-    logmsg(endmsg, endtime)
-    logmsg(elmsg,  endtime - sttime)
+    logmsg stmsg,  sttime
+    logmsg endmsg, endtime
+    logmsg elmsg,  endtime - sttime
   end
 
-  def logmsg(msg, value)
+  def logmsg msg, value
     if msg
       if @io
         @io.puts "#{msg}: #{value}"
@@ -41,7 +41,7 @@ class Timer
 
 end
 
-def timethis(what)
+def timethis what
   sttime = Time.new
   Log.log "#{what} start time: #{sttime}"
   yield

data/lib/riel.rb

@@ -4,7 +4,7 @@ $:.unshift(riellibdir) unless
   $:.include?(riellibdir) || $:.include?(File.expand_path(riellibdir))
 
 module RIEL
-  VERSION = '0.0.1'
+  VERSION = '1.1.10'
 end
 
 rbfiles = Dir[riellibdir + "/riel/**/*.rb"]

data/test/riel/log_stack_test.rb

@@ -0,0 +1,124 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pathname'
+require 'rubyunit'
+require 'stringio'
+require 'riel/log'
+
+class LogAbyss
+  include Loggable
+
+  def squeal
+    log "hello from the abyss"
+    stack "turtles all the way down"
+  end
+end
+
+class LogDepths
+  include Loggable
+
+  def speak
+    log "hello from the depths"
+    la = LogAbyss.new
+    la.squeal
+  end
+end
+
+class LogInner
+  include Loggable
+
+  def screech
+    ldi = LogDepths.new
+    log "hello from the innerds"
+    ldi.speak
+  end
+end
+
+class LogStackTestCase < RUNIT::TestCase
+  include Loggable
+
+  def test_stack
+    Log.set_widths(-15, 4, -40)
+    
+    log = Proc.new { 
+      li = LogInner.new
+      li.screech
+    }
+
+    expected_output = [
+                       "[            ...:  33] {LogInner#screech                        } hello from the innerds",
+                       "[            ...:  22] {LogDepths#speak                         } hello from the depths",
+                       "[            ...:  13] {LogAbyss#squeal                         } hello from the abyss",
+                       "[            ...:  14] {LogAbyss#squeal                         } turtles all the way down",
+                       "[            ...:  24] {speak                                   } ",
+                       "[            ...:  34] {screech                                 } ",
+                       "[            ...:  46] {test_stack                              } ",
+                       "[            ...: 104] {call                                    } ",
+                       "[            ...: 104] {run_test                                } ",
+                       "[            ...:  82] {test_stack                              } ",
+                       "[ ...testcase.rb:  78] {__send__                                } ",
+                       "[ ...testcase.rb:  78] {run                                     } ",
+                       "[ ...testcase.rb:  42] {run                                     } ",
+                       "[...testsuite.rb:  34] {run                                     } ",
+                       "[...testsuite.rb:  33] {each                                    } ",
+                       "[...testsuite.rb:  33] {run                                     } ",
+                       "[...testsuite.rb:  23] {run                                     } ",
+                       "[...testsuite.rb:  34] {run                                     } ",
+                       "[...testsuite.rb:  33] {each                                    } ",
+                       "[...testsuite.rb:  33] {run                                     } ",
+                       "[            ...:  46] {run_suite                               } ",
+                       "[            ...:  67] {start_mediator                          } ",
+                       "[            ...:  41] {start                                   } ",
+                       "[            ...:  29] {run                                     } ",
+                       "[            ...: 216] {run                                     } ",
+                       "[            ...:  12] {run                                     } ",
+                       # nil means to ignore these lines, which in this case is
+                       # because this is deep in the unit test code:
+                       nil,
+                       nil,
+                      ]
+
+    run_test @verbose_setup, log, *expected_output
+  end
+
+  # the ctor is down here so the lines above are less likely to change.
+  def initialize test, name
+    @nonverbose_setup = Proc.new {
+      Log.verbose = false
+      Log.output  = StringIO.new
+    }
+    
+    @verbose_setup = Proc.new {
+      Log.verbose = true
+      Log.output  = StringIO.new
+    }
+
+    super
+  end
+
+  def run_test setup, log, *expected
+    io = setup.call
+    puts "io: #{io}"
+
+    log.call
+
+    assert_not_nil io
+    str = io.string
+    assert_not_nil str
+
+    lines = str.split "\n"
+
+    puts lines
+
+    assert_equals expected.size, lines.size, "number of lines of output"
+
+    (0 ... expected.size).each do |idx|
+      if expected[idx]
+        assert_equals expected[idx], lines[idx], "index: #{idx}"
+      end
+    end
+
+    Log.output = io
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riel
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 10
+  version: 1.1.10
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-31 00:00:00 -04:00
+date: 2012-11-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
 description: This library extends the core Ruby libraries.
-email: jpace@incava.org
+email: jeugenepace@gmail.com
 executables: []
 
 extensions: []
@@ -80,6 +80,7 @@ files:
 - test/riel/log_test.rb
 - test/riel/integer_test.rb
 - test/riel/rcfile_test.rb
+- test/riel/log_stack_test.rb
 - test/riel/hash_test.rb
 - test/riel/setdiff_test.rb
 - test/riel/string_test.rb
@@ -139,6 +140,7 @@ test_files:
 - test/riel/log_test.rb
 - test/riel/integer_test.rb
 - test/riel/rcfile_test.rb
+- test/riel/log_stack_test.rb
 - test/riel/hash_test.rb
 - test/riel/setdiff_test.rb
 - test/riel/string_test.rb