ptools 1.2.6-universal-mingw32 → 1.2.7-universal-mingw32

data/test/test_touch.rb

@@ -1,52 +1,52 @@
-#####################################################################
-# test_touch.rb
-#
-# Test case for the File.touch method. This test should be run
-# via the 'rake test_touch task'.
-#####################################################################
-require 'test-unit'
-require 'ptools'
-
-class TC_FileTouch < Test::Unit::TestCase
-  def self.startup
-    Dir.chdir('test') if File.exist?('test')
-    File.open('test_file1.txt', 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
-  end
-
-  def setup
-    @test_file = 'delete.this'
-    @xfile = 'test_file1.txt'
-  end
-
-  def test_touch_basic
-    assert_respond_to(File, :touch)
-    assert_nothing_raised{ File.touch(@test_file) }
-  end
-
-  def test_touch_expected_results
-    assert_equal(File, File.touch(@test_file))
-    assert_equal(true, File.exist?(@test_file))
-    assert_equal(0, File.size(@test_file))
-  end
-
-  def test_touch_existing_file
-    stat = File.stat(@xfile)
-    sleep 1
-    assert_nothing_raised{ File.touch(@xfile) }
-    assert_equal(true, File.size(@xfile) == stat.size)
-    assert_equal(false, File.mtime(@xfile) == stat.mtime)
-  end
-
-  def test_touch_expected_errors
-    assert_raises(ArgumentError){ File.touch }
-  end
-
-  def teardown
-    File.delete(@test_file) if File.exist?(@test_file)
-    @test_file = nil
-  end
-
-  def self.shutdown
-    File.delete('test_file1.txt') if File.exist?('test_file1.txt')
-  end
-end
+#####################################################################
+# test_touch.rb
+#
+# Test case for the File.touch method. This test should be run
+# via the 'rake test_touch task'.
+#####################################################################
+require 'test-unit'
+require 'ptools'
+
+class TC_FileTouch < Test::Unit::TestCase
+  def self.startup
+    Dir.chdir('test') if File.exist?('test')
+    File.open('test_file1.txt', 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
+  end
+
+  def setup
+    @test_file = 'delete.this'
+    @xfile = 'test_file1.txt'
+  end
+
+  def test_touch_basic
+    assert_respond_to(File, :touch)
+    assert_nothing_raised{ File.touch(@test_file) }
+  end
+
+  def test_touch_expected_results
+    assert_equal(File, File.touch(@test_file))
+    assert_equal(true, File.exist?(@test_file))
+    assert_equal(0, File.size(@test_file))
+  end
+
+  def test_touch_existing_file
+    stat = File.stat(@xfile)
+    sleep 1
+    assert_nothing_raised{ File.touch(@xfile) }
+    assert_equal(true, File.size(@xfile) == stat.size)
+    assert_equal(false, File.mtime(@xfile) == stat.mtime)
+  end
+
+  def test_touch_expected_errors
+    assert_raises(ArgumentError){ File.touch }
+  end
+
+  def teardown
+    File.delete(@test_file) if File.exist?(@test_file)
+    @test_file = nil
+  end
+
+  def self.shutdown
+    File.delete('test_file1.txt') if File.exist?('test_file1.txt')
+  end
+end

data/test/test_wc.rb

@@ -1,73 +1,73 @@
-#####################################################################
-# test_wc.rb
-#
-# Test case for the File.wc method. This test should be run via
-# the 'rake test_wc' task.
-#####################################################################
-require 'test-unit'
-require 'ptools'
-
-class TC_FileWC < Test::Unit::TestCase
-  def self.startup
-    Dir.chdir('test') if File.exist?('test')
-    File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
-    @@test_file = 'test_file1.txt'
-  end
-
-  def setup
-    @test_file = 'test_file1.txt'
-  end
-
-  test "wc method basic functionality" do
-    assert_respond_to(File, :wc)
-    assert_nothing_raised{ File.wc(@test_file) }
-  end
-
-  test "wc accepts specific optional arguments" do
-    assert_nothing_raised{ File.wc(@test_file, 'bytes') }
-    assert_nothing_raised{ File.wc(@test_file, 'chars') }
-    assert_nothing_raised{ File.wc(@test_file, 'words') }
-    assert_nothing_raised{ File.wc(@test_file, 'lines') }
-  end
-
-  test "argument to wc ignores the case of the option argument" do
-    assert_nothing_raised{ File.wc(@test_file, 'LINES') }
-  end
-
-  test "wc with no option returns expected results" do
-    assert_kind_of(Array, File.wc(@test_file))
-    assert_equal([166,166,25,25], File.wc(@test_file))
-  end
-
-  test "wc with bytes option returns the expected result" do
-    assert_equal(166, File.wc(@test_file, 'bytes'), "Wrong number of bytes")
-  end
-
-  test "wc with chars option returns the expected result" do
-    assert_equal(166, File.wc(@test_file, 'chars'), "Wrong number of chars")
-  end
-
-  test "wc with words option returns the expected result" do
-    assert_equal(25, File.wc(@test_file, 'words'), "Wrong number of words")
-  end
-
-  test "wc with lines option returns the expected result" do
-    assert_equal(25, File.wc(@test_file, 'lines'), "Wrong number of lines")
-  end
-
-  test "wc requires at least on argument" do
-    assert_raises(ArgumentError){ File.wc }
-  end
-
-  test "an invalid option raises an error" do
-    assert_raises(ArgumentError){ File.wc(@test_file, 'bogus') }
-  end
-
-  def teardown
-    @test_file = nil
-  end
-
-  def self.shutdown
-    File.delete(@@test_file) if File.exist?(@@test_file)
-  end
-end
+#####################################################################
+# test_wc.rb
+#
+# Test case for the File.wc method. This test should be run via
+# the 'rake test_wc' task.
+#####################################################################
+require 'test-unit'
+require 'ptools'
+
+class TC_FileWC < Test::Unit::TestCase
+  def self.startup
+    Dir.chdir('test') if File.exist?('test')
+    File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
+    @@test_file = 'test_file1.txt'
+  end
+
+  def setup
+    @test_file = 'test_file1.txt'
+  end
+
+  test "wc method basic functionality" do
+    assert_respond_to(File, :wc)
+    assert_nothing_raised{ File.wc(@test_file) }
+  end
+
+  test "wc accepts specific optional arguments" do
+    assert_nothing_raised{ File.wc(@test_file, 'bytes') }
+    assert_nothing_raised{ File.wc(@test_file, 'chars') }
+    assert_nothing_raised{ File.wc(@test_file, 'words') }
+    assert_nothing_raised{ File.wc(@test_file, 'lines') }
+  end
+
+  test "argument to wc ignores the case of the option argument" do
+    assert_nothing_raised{ File.wc(@test_file, 'LINES') }
+  end
+
+  test "wc with no option returns expected results" do
+    assert_kind_of(Array, File.wc(@test_file))
+    assert_equal([166,166,25,25], File.wc(@test_file))
+  end
+
+  test "wc with bytes option returns the expected result" do
+    assert_equal(166, File.wc(@test_file, 'bytes'), "Wrong number of bytes")
+  end
+
+  test "wc with chars option returns the expected result" do
+    assert_equal(166, File.wc(@test_file, 'chars'), "Wrong number of chars")
+  end
+
+  test "wc with words option returns the expected result" do
+    assert_equal(25, File.wc(@test_file, 'words'), "Wrong number of words")
+  end
+
+  test "wc with lines option returns the expected result" do
+    assert_equal(25, File.wc(@test_file, 'lines'), "Wrong number of lines")
+  end
+
+  test "wc requires at least on argument" do
+    assert_raises(ArgumentError){ File.wc }
+  end
+
+  test "an invalid option raises an error" do
+    assert_raises(ArgumentError){ File.wc(@test_file, 'bogus') }
+  end
+
+  def teardown
+    @test_file = nil
+  end
+
+  def self.shutdown
+    File.delete(@@test_file) if File.exist?(@@test_file)
+  end
+end

data/test/test_which.rb

@@ -1,110 +1,126 @@
-#####################################################################
-# test_which.rb
-#
-# Test case for the File.which method. You should run this test
-# via the 'rake test_which' rake task.
-#
-# NOTE: I make the assumption that Ruby (or JRuby) is in your
-# PATH for these tests.
-#####################################################################
-require 'test-unit'
-require 'rbconfig'
-require 'fileutils'
-require 'ptools'
-
-class TC_FileWhich < Test::Unit::TestCase
-  def self.startup
-    @@windows = File::ALT_SEPARATOR
-    @@dir = File.join(Dir.pwd, 'tempdir')
-    @@non_exe = File.join(Dir.pwd, 'tempfile')
-
-    Dir.mkdir(@@dir) unless File.exist?(@@dir)
-    FileUtils.touch(@@non_exe)
-    File.chmod(775, @@dir)
-    File.chmod(644, @@non_exe)
-  end
-
-  def setup
-    @ruby = RUBY_PLATFORM.match('java') ? 'jruby' : 'ruby'
-    @ruby = 'rbx' if defined?(Rubinius)
-
-    @exe = File.join(
-      RbConfig::CONFIG['bindir'],
-      RbConfig::CONFIG['ruby_install_name']
-    )
-
-    if @@windows
-      @exe.tr!('/','\\')
-      @exe << ".exe"
-    end
-  end
-
-  test "which method basic functionality" do
-    assert_respond_to(File, :which)
-    assert_nothing_raised{ File.which(@ruby) }
-    assert_kind_of(String, File.which(@ruby))
-  end
-
-  test "which accepts an optional path to search" do
-    assert_nothing_raised{ File.which(@ruby, "/usr/bin:/usr/local/bin") }
-  end
-
-  test "which returns nil if not found" do
-    assert_equal(nil, File.which(@ruby, '/bogus/path'))
-    assert_equal(nil, File.which('blahblahblah'))
-  end
-
-  test "which handles executables without extensions on windows" do
-    omit_unless(@@windows, "test skipped unless MS Windows")
-    assert_not_nil(File.which('ruby'))
-    assert_not_nil(File.which('notepad'))
-  end
-
-  test "which handles executables that already contain extensions on windows" do
-    omit_unless(@@windows, "test skipped unless MS Windows")
-    assert_not_nil(File.which('ruby.exe'))
-    assert_not_nil(File.which('notepad.exe'))
-  end
-
-  test "which returns argument if an existent absolute path is provided" do
-    assert_equal(@exe, File.which(@ruby), "=> May fail on a symlink")
-  end
-
-  test "which returns nil if a non-existent absolute path is provided" do
-    assert_nil(File.which('/foo/bar/baz/ruby'))
-  end
-
-  test "which does not pickup files that are not executable" do
-    assert_nil(File.which(@@non_exe))
-  end
-
-  test "which does not pickup executable directories" do
-    assert_nil(File.which(@@dir))
-  end
-
-  test "which accepts a minimum of one argument" do
-    assert_raises(ArgumentError){ File.which }
-  end
-
-  test "which accepts a maximum of two arguments" do
-    assert_raises(ArgumentError){ File.which(@ruby, "foo", "bar") }
-  end
-
-  test "the second argument cannot be nil or empty" do
-    assert_raises(ArgumentError){ File.which(@ruby, nil) }
-    assert_raises(ArgumentError){ File.which(@ruby, '') }
-  end
-
-  def teardown
-    @exe  = nil
-    @ruby = nil
-  end
-
-  def self.shutdown
-    FileUtils.rm(@@non_exe)
-    FileUtils.rm_rf(@@dir)
-    @@windows = nil
-    @@dir = nil
-    @@non_exe = nil
-  end
-end
+#####################################################################
+# test_which.rb
+#
+# Test case for the File.which method. You should run this test
+# via the 'rake test_which' rake task.
+#
+# NOTE: I make the assumption that Ruby (or JRuby) is in your
+# PATH for these tests.
+#####################################################################
+require 'test-unit'
+require 'rbconfig'
+require 'fileutils'
+require 'ptools'
+require 'tempfile'
+
+class TC_FileWhich < Test::Unit::TestCase
+  def self.startup
+    @@windows = File::ALT_SEPARATOR
+    @@dir = File.join(Dir.pwd, 'tempdir')
+    @@non_exe = File.join(Dir.pwd, 'tempfile')
+
+    Dir.mkdir(@@dir) unless File.exist?(@@dir)
+    FileUtils.touch(@@non_exe)
+    File.chmod(775, @@dir)
+    File.chmod(644, @@non_exe)
+  end
+
+  def setup
+    @ruby = RUBY_PLATFORM.match('java') ? 'jruby' : 'ruby'
+    @ruby = 'rbx' if defined?(Rubinius)
+
+    @exe = File.join(
+      RbConfig::CONFIG['bindir'],
+      RbConfig::CONFIG['ruby_install_name']
+    )
+
+    if @@windows
+      @exe.tr!('/','\\')
+      @exe << ".exe"
+    end
+  end
+
+  test "which method basic functionality" do
+    assert_respond_to(File, :which)
+    assert_nothing_raised{ File.which(@ruby) }
+    assert_kind_of(String, File.which(@ruby))
+  end
+
+  test "which accepts an optional path to search" do
+    assert_nothing_raised{ File.which(@ruby, "/usr/bin:/usr/local/bin") }
+  end
+
+  test "which returns nil if not found" do
+    assert_equal(nil, File.which(@ruby, '/bogus/path'))
+    assert_equal(nil, File.which('blahblahblah'))
+  end
+
+  test "which handles executables without extensions on windows" do
+    omit_unless(@@windows, "test skipped unless MS Windows")
+    assert_not_nil(File.which('ruby'))
+    assert_not_nil(File.which('notepad'))
+  end
+
+  test "which handles executables that already contain extensions on windows" do
+    omit_unless(@@windows, "test skipped unless MS Windows")
+    assert_not_nil(File.which('ruby.exe'))
+    assert_not_nil(File.which('notepad.exe'))
+  end
+
+  test "which returns argument if an existent absolute path is provided" do
+    assert_equal(@exe, File.which(@ruby), "=> May fail on a symlink")
+  end
+
+  test "which returns nil if a non-existent absolute path is provided" do
+    assert_nil(File.which('/foo/bar/baz/ruby'))
+  end
+
+  test "which does not pickup files that are not executable" do
+    assert_nil(File.which(@@non_exe))
+  end
+
+  test "which does not pickup executable directories" do
+    assert_nil(File.which(@@dir))
+  end
+
+  test "which accepts a minimum of one argument" do
+    assert_raises(ArgumentError){ File.which }
+  end
+
+  test "which accepts a maximum of two arguments" do
+    assert_raises(ArgumentError){ File.which(@ruby, "foo", "bar") }
+  end
+
+  test "the second argument cannot be nil or empty" do
+    assert_raises(ArgumentError){ File.which(@ruby, nil) }
+    assert_raises(ArgumentError){ File.which(@ruby, '') }
+  end
+
+  test "resolves with with ~" do
+    omit_if(@@windows, "~ tests skipped on MS Windows")
+    begin
+      old_home = ENV['HOME']
+
+      ENV['HOME'] = Dir::Tmpname.tmpdir
+      program = Tempfile.new(['program', '.sh'])
+      File.chmod(755, program.path)
+
+      assert_not_nil(File.which(File.basename(program.path), '~/'))
+    ensure
+      ENV['HOME'] = old_home
+    end
+  end
+
+  def teardown
+    @exe  = nil
+    @ruby = nil
+  end
+
+  def self.shutdown
+    FileUtils.rm(@@non_exe)
+    FileUtils.rm_rf(@@dir)
+    @@windows = nil
+    @@dir = nil
+    @@non_exe = nil
+  end
+end