riel 1.1.10 → 1.1.11

data/lib/riel/dir.rb

@@ -6,14 +6,16 @@ require 'pathname'
 class Dir
 
   # Returns the home directory, for both Unix and Windows.
-  def self.home
-    ENV["HOME"] || begin
-                     hd = ENV["HOMEDRIVE"]
-                     hp = ENV["HOMEPATH"]
-                     if hd || hp
-                       (hd || "") + (hp || "\\")
+  unless RUBY_VERSION.index('1.9')
+    def self.home
+      ENV["HOME"] || begin
+                       hd = ENV["HOMEDRIVE"]
+                       hp = ENV["HOMEPATH"]
+                       if hd || hp
+                         (hd || "") + (hp || "\\")
+                       end
                      end
-                   end
+    end
   end
 
   # Removes directories containing no files or files matching only those in

data/lib/riel/io.rb

@@ -6,7 +6,7 @@ require 'riel/file'
 class IO
   # Reads the stream into an array. It works even when $/ == nil, which
   # works around a problem in Ruby 1.8.1.
-  if VERSION == "1.8.1"
+  if RUBY_VERSION == "1.8.1"
     $-w = false
 
     def readlines

data/lib/riel/optproc.rb

@@ -302,7 +302,7 @@ module OptProc
           @bestopts[0].set_value args
           return @bestopts[0]
         else
-          optstr = @bestopts.collect { |x| '(' + x.tags.join(', ') + ')' }.join(', ')
+          optstr = @bestopts.collect { |y| '(' + y.tags.join(', ') + ')' }.join(', ')
           $stderr.puts "ERROR: ambiguous match of '#{args[0]}'; matches options: #{optstr}"
           exit 2
         end

data/lib/riel/pathname.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 require 'riel/string'
-require 'ftools'
+require 'fileutils'
 
 class Pathname
 

data/lib/riel/text.rb

@@ -226,6 +226,7 @@ module Text
     # Returns the escape sequence for the given names.
     def names_to_code names
       str = ""
+      names = [ names ] unless names.kind_of? Array
       names.each do |name|
         code = ATTRIBUTES[name]
         if code
@@ -296,6 +297,8 @@ module Text
     def names_to_code names
       str = ""
 
+      names = [ names ] unless names.kind_of? Array
+
       names.each do |name|
         @stack << name
 

data/lib/riel.rb

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

data/test/riel/array_test.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/array'
 
-class ArrayTestCase < RUNIT::TestCase
+class ArrayTestCase < Test::Unit::TestCase
 
   def test_to_s
     a = %w{ this is a test }

data/test/riel/command_test.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/command'
 
-class CommandTestCase < RUNIT::TestCase
-
+class CommandTestCase < Test::Unit::TestCase
   def test_all
     assert_equal [ "/bin/ls\n" ], Command.run("ls", "/bin/ls")
     assert_equal [ "/bin/grep\n", "/bin/ls\n" ], Command.run("ls", "/bin/ls", "/bin/grep" )
@@ -13,16 +12,15 @@ class CommandTestCase < RUNIT::TestCase
     lnum = 0
     expected = [ "/bin/grep\n", "/bin/ls\n" ]
     lines = Command.run("ls", "/bin/ls", "/bin/grep" ) do |line|
-      assert_equals(expected[lnum], line)
+      assert_equal expected[lnum], line
       lnum += 1
     end
     assert_equal expected, lines
 
     expected = [ "/bin/grep\n", "/bin/ls\n" ]
-    lines = Command.run("ls", "/bin/ls", "/bin/grep" ) do |line, lnum|
-      assert_equals(expected[lnum], line)
+    lines = Command.run("ls", "/bin/ls", "/bin/grep" ) do |line, ln|
+      assert_equal expected[ln], line
     end
     assert_equal expected, lines
   end
-    
 end

data/test/riel/date_test.rb

@@ -1,17 +1,15 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/date'
 
-class DateTestCase < RUNIT::TestCase
-  
-  def test
+class DateTestCase < Test::Unit::TestCase
+  def test_simple
     assert_equal 28, Date.days_in_month(2010, 2)
     assert_equal 31, Date.days_in_month(2010, 1)
     assert_equal 29, Date.days_in_month(2008, 2)
     assert_equal 30, Date.days_in_month(2007, 6)
     assert_equal 31, Date.days_in_month(2010, 12)
   end
-
 end

data/test/riel/dir_test.rb

@@ -1,13 +1,12 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'pathname'
 require 'riel/dir'
 require 'riel/file'
 
-class DirTestCase < RUNIT::TestCase
-
+class DirTestCase < Test::Unit::TestCase
   def test_home
     assert_equal ENV["HOME"], Dir.home
   end
@@ -15,7 +14,7 @@ class DirTestCase < RUNIT::TestCase
   def test_remove_if_empty
     # set up a mess of files in /tmp ...
 
-    tmpdir = Pathname.new('/tmp')
+    tmpdir = Pathname.new '/tmp'
 
     # maybe this isn't Linux (poor devils!):
     return unless tmpdir.exist?
@@ -46,7 +45,7 @@ class DirTestCase < RUNIT::TestCase
       adir.mkdir
     end
 
-    Dir.remove_if_empty(a, :verbose => false)
+    Dir.remove_if_empty a, :verbose => false
 
     assert !a.exist?
 
@@ -65,7 +64,7 @@ class DirTestCase < RUNIT::TestCase
       end
     end
 
-    Dir.remove_if_empty(a)
+    Dir.remove_if_empty a
     assert a.exist?
 
     Dir.remove_if_empty(a, :deletable => [ %r{aa\d+} ])
@@ -87,10 +86,10 @@ class DirTestCase < RUNIT::TestCase
       end
     end
 
-    Dir.remove_if_empty(a)
+    Dir.remove_if_empty a
     assert a.exist?
 
-    Dir.remove_if_empty(a, :deletable => %w{ foo.bar })
+    Dir.remove_if_empty a, :deletable => %w{ foo.bar }
     assert !a.exist?
 
     testdir.delete

data/test/riel/enumerable_test.rb

@@ -1,27 +1,24 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pathname'
-require 'rubyunit'
+require 'test/unit'
 require 'riel/enumerable'
 
-class EnumerableTestCase < RUNIT::TestCase
-
+class EnumerableTestCase < Test::Unit::TestCase
   def test_collect_with_index
-    assert_equals([ 0, 5, 12, 21, 32 ],     (4   ..   8).collect_with_index { |val, idx| val * idx })
-    assert_equals([ "", "b", "cc", "ddd" ], ('a' .. 'd').collect_with_index { |str, idx| str * idx })
+    assert_equal [ 0, 5, 12, 21, 32 ],     (4   ..   8).collect_with_index { |val, idx| val * idx }
+    assert_equal [ "", "b", "cc", "ddd" ], ('a' .. 'd').collect_with_index { |str, idx| str * idx }
   end
   
   def test_select_with_index
-    assert_equals([ 5, 6, 7, 8 ], (4 .. 8).select_with_index { |val, idx| val >= 5 })
-    assert_equals([ 6 ],          (4 .. 8).select_with_index { |val, idx| val * idx == 12 })
-    assert_equals([],             (4 .. 8).select_with_index { |val, idx| idx - val > 0  })
+    assert_equal [ 5, 6, 7, 8 ], (4 .. 8).select_with_index { |val, idx| val >= 5 }
+    assert_equal [ 6 ],          (4 .. 8).select_with_index { |val, idx| val * idx == 12 }
+    assert_equal [],             (4 .. 8).select_with_index { |val, idx| idx - val > 0  }
   end
 
   def test_detect_with_index
-    assert_equals(5,   (4 .. 8).detect_with_index { |val, idx| val >= 5 })
-    assert_equals(6,   (4 .. 8).detect_with_index { |val, idx| val * idx == 12 })
-    assert_equals(nil, (4 .. 8).detect_with_index { |val, idx| idx - val > 0  })
+    assert_equal 5,   (4 .. 8).detect_with_index { |val, idx| val >= 5 }
+    assert_equal 6,   (4 .. 8).detect_with_index { |val, idx| val * idx == 12 }
+    assert_equal nil, (4 .. 8).detect_with_index { |val, idx| idx - val > 0  }
   end
-
 end

data/test/riel/env_test.rb

@@ -1,52 +1,48 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/env'
 
-class EnvTestCase < RUNIT::TestCase
-
+class EnvTestCase < Test::Unit::TestCase
   def test_home_directory
     # Unix
     
     ENV["HOME"] = "/home/me"
     
-    assert_equals "/home/me", Env.home_directory
+    assert_equal "/home/me", Env.home_directory
 
     # Windows
     
     ENV["HOME"] = nil
     ENV["HOMEDRIVE"] = "c:"
     
-    assert_equals "c:\\", Env.home_directory
+    assert_equal "c:\\", Env.home_directory
 
     ENV["HOME"] = nil
     ENV["HOMEDRIVE"] = nil
     ENV["HOMEPATH"] = "\\Program Files\\User"
     
-    assert_equals "\\Program Files\\User", Env.home_directory
+    assert_equal "\\Program Files\\User", Env.home_directory
     
     ENV["HOME"] = nil
     ENV["HOMEDRIVE"] = "c:"
     ENV["HOMEPATH"] = "\\Program Files\\User"
     
-    # assert_equals "c:\\Program Files\\User", Env.home_directory
+    # assert_equal "c:\\Program Files\\User", Env.home_directory
   end
 
-  def do_split_test(expected, input)
+  def run_split_test expected, input
     ENV["FOO"] = input
-    
-    result = Env.split("FOO")
-
-    assert_equals expected, result
+    result = Env.split "FOO"
+    assert_equal expected, result
   end
   
   def test_split
-    do_split_test(%w{ testing }, "testing")
-    do_split_test(%w{ this is }, "this is")
-    do_split_test(%w{ this is }, '"this" "is"')
-    do_split_test(%w{ this is a test }, '"this" "is" \'a\' "test"')
-    do_split_test(%w{ this is a tes't }, '"this" "is" \'a\' "tes\'t"')
+    run_split_test %w{ testing }, "testing"
+    run_split_test %w{ this is }, "this is"
+    run_split_test %w{ this is }, '"this" "is"'
+    run_split_test %w{ this is a test }, '"this" "is" \'a\' "test"'
+    run_split_test %w{ this is a tes't }, '"this" "is" \'a\' "tes\'t"'
   end
-
 end

data/test/riel/file_test.rb

@@ -1,13 +1,12 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/file'
 require 'riel/tempfile'
 require 'pathname'
 
-
-class FileTestCase < RUNIT::TestCase
+class FileTestCase < Test::Unit::TestCase
 
   def get_file_rootname
     Pathname.new(__FILE__).rootname
@@ -28,7 +27,7 @@ class FileTestCase < RUNIT::TestCase
 
     tempname = nil
 
-    if File.exist?(stringio_so)
+    if File.exist? stringio_so
       rootname = Pathname.new(__FILE__).rootname
       tempname = Tempfile.open(rootname) do |tf|
         tf.write IO.read(stringio_so)
@@ -42,12 +41,12 @@ class FileTestCase < RUNIT::TestCase
 
   def test_file_types
     text_file = create_text_file
-    assert(File.text?(text_file))
-    assert(!File.binary?(text_file))
+    assert File.text?(text_file)
+    assert !File.binary?(text_file)
     
     if binary_file = create_binary_file
-      assert(!File.text?(binary_file))
-      assert(File.binary?(binary_file))
+      assert !File.text?(binary_file)
+      assert File.binary?(binary_file)
     end
   end
 
@@ -56,18 +55,17 @@ class FileTestCase < RUNIT::TestCase
 
     dir = Pathname.new(file).dirname
 
-    assert(File.is_file?(file))
-    assert(!File.is_file?(dir))
+    assert File.is_file?(file)
+    assert !File.is_file?(dir)
 
-    assert(!File.is_directory?(file))
-    assert(File.is_directory?(dir))
+    assert !File.is_directory?(file)
+    assert File.is_directory?(dir)
 
     # this should have access only by root:
 
     file = "/var/log/httpd/error_log"
-    assert(!File.is_file?(file))
-    assert(!File.is_directory?(file))
-    
+    assert !File.is_file?(file)
+    assert !File.is_directory?(file)
   end
 
   def test_read_write_file
@@ -82,7 +80,7 @@ class FileTestCase < RUNIT::TestCase
       line = ln
     end
 
-    assert_equal("hello, world", line)
+    assert_equal "hello, world", line
   end
 
   def test_read_put_file
@@ -97,7 +95,7 @@ class FileTestCase < RUNIT::TestCase
       line = ln
     end
 
-    assert_equal("hello, world\n", line)
+    assert_equal "hello, world\n", line
 
     File.put_file(filename) do
       [
@@ -111,13 +109,13 @@ class FileTestCase < RUNIT::TestCase
       lines << ln
     end
 
-    assert_equal([ "hello, world\n", "this is a test\n" ] , lines)
+    assert_equal [ "hello, world\n", "this is a test\n" ] , lines
   end
 
   def test_open_via_temp_file
     fname = "/tmp/test_open_via_temp_file.#{$$}"
 
-    pn = Pathname.new(fname)
+    pn = Pathname.new fname
 
     assert !pn.exist?
     
@@ -166,13 +164,13 @@ class FileTestCase < RUNIT::TestCase
         assert file.exist?
       end
 
-      File.move_files(tgt, srcfiles)
+      File.move_files tgt, srcfiles
 
-      assert_files_existence(false, srcfiles)
+      assert_files_existence false, srcfiles
 
       tgtfiles = fnums.collect { |num| tgt + "movefile#{num}" }
 
-      assert_files_existence(true, tgtfiles)
+      assert_files_existence true, tgtfiles
     ensure
       if tgt && tgt.exist?
         tgt.children.each do |child|
@@ -217,13 +215,13 @@ class FileTestCase < RUNIT::TestCase
         assert file.exist?
       end
 
-      File.copy_files(tgt, srcfiles)
+      File.copy_files tgt, srcfiles
 
-      assert_files_existence(true, srcfiles)
+      assert_files_existence true, srcfiles
 
       tgtfiles = fnums.collect { |num| tgt + "copyfile#{num}" }
 
-      assert_files_existence(true, tgtfiles)
+      assert_files_existence true, tgtfiles
     ensure
       if tgt && tgt.exist?
         tgt.children.each do |child|
@@ -238,5 +236,4 @@ class FileTestCase < RUNIT::TestCase
       end
     end
   end
-
 end

data/test/riel/filetype_test.rb

@@ -1,32 +1,29 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/filetype'
 
-
-class FileTypeTestCase < RUNIT::TestCase
-
+class FileTypeTestCase < Test::Unit::TestCase
   def test_default_extensions
     ft = FileType.instance
 
-    assert(ft.text_extensions.include?("rb"))
+    assert ft.text_extensions.include?("rb")
 
-    assert(!ft.text_extensions.include?("rbx"))
-    assert(!ft.text_extensions.include?("tar"))
-    assert(!ft.text_extensions.include?("jar"))
-    assert(!ft.text_extensions.include?("gz"))
+    assert !ft.text_extensions.include?("rbx")
+    assert !ft.text_extensions.include?("tar")
+    assert !ft.text_extensions.include?("jar")
+    assert !ft.text_extensions.include?("gz")
 
-    assert(ft.nontext_extensions.include?("tar"))
-    assert(ft.nontext_extensions.include?("jar"))
-    assert(ft.nontext_extensions.include?("gz"))
+    assert ft.nontext_extensions.include?("tar")
+    assert ft.nontext_extensions.include?("jar")
+    assert ft.nontext_extensions.include?("gz")
 
-    ft.set_extensions(true, "rbx")
-    assert(ft.text_extensions.include?("rbx"))
+    ft.set_extensions true, "rbx"
+    assert ft.text_extensions.include?("rbx")
 
-    ft.set_extensions(true, "foo", "bar")
-    assert(ft.text_extensions.include?("foo"))
-    assert(ft.text_extensions.include?("bar"))
+    ft.set_extensions true, "foo", "bar"
+    assert ft.text_extensions.include?("foo")
+    assert ft.text_extensions.include?("bar")
   end
-
 end

data/test/riel/hash_test.rb

@@ -1,12 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/hash'
 
-class HashTestCase < RUNIT::TestCase
-
-  def test
+class HashTestCase < Test::Unit::TestCase
+  def test_nothing
   end
-
 end

data/test/riel/integer_test.rb

@@ -8,11 +8,11 @@ module PVN
     def setup
     end
 
-    def assert_true boolean, message = nil
+    def assert_true boolean, message = ""
       assert boolean, message
     end
     
-    def assert_false boolean, message = nil
+    def assert_false boolean, message = ""
       assert !boolean, message
     end
     

data/test/riel/io_test.rb

@@ -1,16 +1,16 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubyunit'
+require 'test/unit'
 require 'riel/io'
 
-class IOTestCase < RUNIT::TestCase
+class IOTestCase < Test::Unit::TestCase
   def xtest_readlines
     orig = $/
 
     $/ = nil
 
-    contents = IO.readlines(__FILE__)
+    contents = IO.readlines __FILE__
     
     assert_not_nil contents
     assert contents.size > 0

data/test/riel/log_stack_test.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'pathname'
-require 'rubyunit'
+require 'test/unit'
 require 'stringio'
 require 'riel/log'
 
@@ -35,7 +35,7 @@ class LogInner
   end
 end
 
-class LogStackTestCase < RUNIT::TestCase
+class LogStackTestCase < Test::Unit::TestCase
   include Loggable
 
   def test_stack
@@ -53,37 +53,13 @@ class LogStackTestCase < RUNIT::TestCase
                        "[            ...:  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
+  def initialize test, name = nil
     @nonverbose_setup = Proc.new {
       Log.verbose = false
       Log.output  = StringIO.new
@@ -94,7 +70,7 @@ class LogStackTestCase < RUNIT::TestCase
       Log.output  = StringIO.new
     }
 
-    super
+    super test
   end
 
   def run_test setup, log, *expected
@@ -111,11 +87,9 @@ class LogStackTestCase < RUNIT::TestCase
 
     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}"
+        assert_equal expected[idx], lines[idx], "index: #{idx}"
       end
     end