ptools 1.1.1 → 1.1.2

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.1.2 - 28-Apr-2007
+* Fixed a require line that could cause problems on MS Windows.
+* Added a Rakefile which includes tasks for installation and testing.
+* Some cleanup and improvement in the various test files.
+
 == 1.1.1 - 24-Aug-2006
 * Added the File.binary? method, based on code from Ryan Davis.
 

data/README

@@ -4,6 +4,7 @@
    
 == Prerequisites
    Ruby 1.8.0 or later is recommended but not required.
+   On MS Windows you will need win32-file 0.5.4 or later.
 
 == Installation
 === Gem
@@ -60,7 +61,7 @@
    Ruby's
     
 == Copyright
-   (C) 2003-2006 Daniel J. Berger
+   (C) 2003-2007 Daniel J. Berger
    All Rights Reserved.
     
 == Warranty
@@ -70,5 +71,5 @@
 
 == Author
    Daniel J. Berger
-   djberg96 at gmail dot com
+   djberg96 at nospam at gmail dot com
    imperator on IRC (irc.freenode.net)

data/Rakefile

@@ -0,0 +1,91 @@
+require 'rake'
+require 'rake/testtask'
+
+desc 'Install the ptools package (non-gem)'
+task :install do
+   ruby 'install.rb'
+end
+
+Rake::TestTask.new do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/ts_all.rb']
+end
+
+Rake::TestTask.new('test_binary') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_binary.rb']
+end
+
+Rake::TestTask.new('test_constants') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_constants.rb']
+end
+
+Rake::TestTask.new('test_head') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_head.rb']
+end
+
+Rake::TestTask.new('test_middle') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_middle.rb']
+end
+
+Rake::TestTask.new('test_nlconvert') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_nlconvert.rb']
+end
+
+Rake::TestTask.new('test_null') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_null.rb']
+end
+
+Rake::TestTask.new('test_tail') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_tail.rb']
+end
+
+Rake::TestTask.new('test_touch') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_touch.rb']
+end
+
+Rake::TestTask.new('test_wc') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_wc.rb']
+end
+
+Rake::TestTask.new('test_whereis') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_whereis.rb']
+end
+
+Rake::TestTask.new('test_which') do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_which.rb']
+end

data/lib/ptools.rb

@@ -1,7 +1,7 @@
-require 'win32/file/stat' if PLATFORM.match('mswin')
+require 'win32/file' if RUBY_PLATFORM.match('mswin')
 
 class File
-   PTOOLS_VERSION = '1.1.1'
+   PTOOLS_VERSION = '1.1.2'
    IS_WINDOWS     = RUBY_PLATFORM.match('mswin') ? true : false
 
    WIN32EXTS = ENV['PATHEXT'].split(';').map{ |e| e.downcase } rescue %w/.exe .com .bat/

data/test/tc_binary.rb

@@ -1,22 +1,15 @@
-##########################################
+#####################################################################
 # tc_binary.rb
 # 
-# Test case for the File.binary? method.
-##########################################
-base = File.basename(Dir.pwd)
-
-if base == 'test' or base =~ /ptools/
-   Dir.chdir('..') if base == 'test'
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + '/lib')
-   Dir.chdir('test') if Dir.pwd != 'test'
-end
-
+# Test case for the File.binary? method. You should run this test
+# via the 'rake test_binary' task.
+#####################################################################
 require 'test/unit'
 require 'ptools'
 
 class TC_Binary < Test::Unit::TestCase
    def setup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
       @text_file = 'test_file1.txt'
    end
 
@@ -30,9 +23,10 @@ class TC_Binary < Test::Unit::TestCase
    end
 
    def test_binary_expected_errors
-      assert_raises(Errno::ENOENT){ File.binary?('bogus') }
+      assert_raises(Errno::ENOENT, ArgumentError){ File.binary?('bogus') }
    end
 
    def teardown
+      @text_file = nil
    end
 end

data/test/tc_constants.rb

@@ -1,23 +1,15 @@
-##################################################
+#####################################################################
 # tc_constants.rb
 #
-# Tests whatever constant that have been defined
-##################################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# Tests the constants that have been defined for our package. This
+# test case should be run via the 'rake test_constants' task.
+#####################################################################
+require 'test/unit'
+require 'ptools'
 
 class TC_Constants < Test::Unit::TestCase
    def test_version
-      assert_equal("1.1.1", File::PTOOLS_VERSION, "Bad VERSION")
+      assert_equal("1.1.2", File::PTOOLS_VERSION)
    end
 
    def test_windows

data/test/tc_head.rb

@@ -1,22 +1,15 @@
-##########################################
+######################################################################
 # tc_head.rb
 # 
-# Test case for the File.head method.
-##########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# Test case for the File.head method. This test should be run via
+# the 'rake test_head' task.
+######################################################################
+require 'test/unit'
+require 'ptools'
 
 class TC_FileHead < Test::Unit::TestCase
    def setup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
       @test_file = 'test_file1.txt'
 
       @expected_head1 = ["line1\n","line2\n","line3\n","line4\n","line5\n"]

data/test/tc_middle.rb

@@ -1,22 +1,15 @@
-##########################################
+#####################################################################
 # tc_middle.rb
 #
-# Test case for the File.middle method
-##########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# Test case for the File.middle method. You should run this test
+# via the 'rake test_middle' task.
+#####################################################################
+require 'test/unit'
+require 'ptools'
 
 class TC_FileMiddle < Test::Unit::TestCase
    def setup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
       @test_file = 'test_file1.txt'
 
       @expected_middle1 = ["line10\n", "line11\n", "line12\n", "line13\n", "line14\n"]
@@ -54,5 +47,8 @@ class TC_FileMiddle < Test::Unit::TestCase
 
    def teardown
       @test_file = nil
+      @expected_middle1 = nil
+      @expected_middle2 = nil
+      @expected_middle3 = nil
    end
 end

data/test/tc_nlconvert.rb

@@ -1,22 +1,15 @@
-#############################################
+#####################################################################
 # tc_nlconvert.rb
 #
-# Test case for the File.nl_convert method.
-#############################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# Test case for the File.nl_convert method. You should run this
+# test via the 'rake test_nlconvert' task.
+#####################################################################
+require 'test/unit'
+require 'ptools'
 
 class TC_FileNLConvert < Test::Unit::TestCase
    def setup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
       @test_file1 = 'test_file1.txt'
       @test_file2 = 'test_file2.txt'
       @dos_file   = 'dos_test_file.txt'
@@ -42,10 +35,10 @@ class TC_FileNLConvert < Test::Unit::TestCase
    end
 
    def test_nl_convert_to_mac
-      if PLATFORM.match("mswin")
-         msg = "test may fail on MS Windows" 
+      if RUBY_PLATFORM.match("mswin")
+         msg = "** test may fail on MS Windows **" 
       else
-         msg = "mac file should be the same size (or larger), but isn't"
+         msg = "** mac file should be the same size (or larger), but isn't **"
       end
 
       assert_nothing_raised{ File.nl_convert(@test_file1, @mac_file, "mac") }
@@ -77,5 +70,10 @@ class TC_FileNLConvert < Test::Unit::TestCase
       [@dos_file, @mac_file, @unix_file].each{ |file|
          File.delete(file) if File.exists?(file)
       }
+      @dos_file   = nil
+      @mac_file   = nil
+      @unix_file  = nil
+      @test_file1 = nil
+      @test_file2 = nil
    end
 end

data/test/tc_null.rb

@@ -1,19 +1,11 @@
-##########################################
+#####################################################################
 # tc_null.rb
 # 
-# Test case for the File.null method.
-##########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# Test case for the File.null method. You should run this test via
+# the 'rake test_null' task.
+#####################################################################
+require 'test/unit'
+require 'ptools'
 
 class TC_Null < Test::Unit::TestCase
    def setup

data/test/tc_tail.rb

@@ -1,22 +1,15 @@
-########################################
+#####################################################################
 # tc_tail.rb
 #
-# Test case for the File.tail method.
-########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# Test case for the File.tail method. This test should be run via
+# the 'rake test_tail' task.
+#####################################################################
+require 'test/unit'
+require 'ptools'
 
 class TC_FileTail < Test::Unit::TestCase
    def setup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
       @test_file = 'test_file1.txt'
 
       @expected_tail1 = ["line16\n","line17\n","line18\n","line19\n"]
@@ -46,5 +39,7 @@ class TC_FileTail < Test::Unit::TestCase
 
    def teardown
       @test_file = nil
+      @expected_tail1 = nil
+      @expected_tail2 = nil
    end
 end

data/test/tc_touch.rb

@@ -1,22 +1,15 @@
-###########################################
+#####################################################################
 # tc_touch.rb
 #
-# Test case for the File.touch method.
-###########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# 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 setup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
       @test_file = "delete.this"
    end
 
@@ -37,5 +30,6 @@ class TC_FileTouch < Test::Unit::TestCase
 
    def teardown
       File.delete(@test_file) if File.exists?(@test_file)
+      @test_file = nil
    end
 end

data/test/tc_wc.rb

@@ -1,22 +1,15 @@
-####################################
+#####################################################################
 # tc_wc.rb
 #
-# Test case for the File.wc method.
-####################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# 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 setup
+      Dir.chdir('test') if File.exists?('test')
       @test_file = 'test_file1.txt'
    end
 

data/test/tc_whereis.rb

@@ -1,30 +1,24 @@
-##########################################
+######################################################################
 # tc_whereis.rb
 #
-# Test case for the File.whereis method.
-##########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require "test/unit"
-require "ptools"
+# Test case for the File.whereis method. This test should be run
+# via the 'rake test_whereis' task.
+######################################################################
+require 'test/unit'
+require 'ptools'
+require 'rbconfig'
+include Config
 
 class TC_FileWhereis < Test::Unit::TestCase
-
    def setup
-      # Change this to suit your system
-      @expected_locs = ['/usr/local/bin/ruby','/opt/sfw/bin/ruby']
-      @expected_locs.push('/opt/bin/ruby', '/usr/bin/ruby')
-
-      # MS Windows - change as needed
-      if File::ALT_SEPARATOR
+      @expected_locs = [CONFIG['bindir']]
+      if RUBY_PLATFORM.match('mswin')
          @expected_locs = ["c:\\ruby\\bin\\ruby.exe"]
+      else
+         @expected_locs << '/usr/local/bin/ruby'
+         @expected_locs << '/opt/sfw/bin/ruby'
+         @expected_locs << '/opt/bin/ruby'
+         @expected_locs << '/usr/bin/ruby'
       end
    end
 
@@ -45,7 +39,7 @@ class TC_FileWhereis < Test::Unit::TestCase
 
    def test_whereis_expected_errors
       assert_raises(ArgumentError){ File.whereis }
-      assert_raises(ArgumentError){ File.whereis("ruby","foo","bar") }
+      assert_raises(ArgumentError){ File.whereis("ruby", "foo", "bar") }
    end
 
    def teardown

data/test/tc_which.rb

@@ -1,30 +1,22 @@
-########################################
+#####################################################################
 # tc_which.rb
 #
-# Test case for the File.which method.
-########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" or base =~ /ptools/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd)
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-   Dir.chdir("test") if Dir.pwd != "test"
-end
-
-require 'rbconfig'
+# 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 is in your PATH for these
+# tests.
+#####################################################################
 require 'test/unit'
+require 'rbconfig'
 require 'ptools'
-
-# I make the assumption that Ruby is in your PATH for these tests
+include Config
 
 class TC_FileWhich < Test::Unit::TestCase
-   include Config
-
    def setup
       @exe = File.join(CONFIG["bindir"], CONFIG["ruby_install_name"]) 
 
-      if File::ALT_SEPARATOR
+      if RUBY_PLATFORM.match('mswin')
          @exe.tr!('/','\\')
          @exe << ".exe"
       end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: ptools
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2006-08-23 00:00:00 -06:00
+  version: 1.1.2
+date: 2007-04-28 00:00:00 -06:00
 summary: Extra methods for the File class
 require_paths: 
 - lib
@@ -32,6 +32,7 @@ files:
 - lib/ptools.rb
 - CHANGES
 - MANIFEST
+- Rakefile
 - README
 - test/tc_binary.rb
 - test/tc_constants.rb
@@ -54,6 +55,7 @@ rdoc_options: []
 extra_rdoc_files: 
 - README
 - CHANGES
+- MANIFEST
 executables: []
 
 extensions: []