ptools 1.1.6 → 1.1.7

data/CHANGES

@@ -1,3 +1,11 @@
+== 1.1.7 - 28-Jul-2009
+* Now compatible with Ruby 1.9.x.
+* Replaced RUBY_PLATFORM with rbconfig check for the sake of other
+  implementations, such as JRuby.
+* Updated the tests to be more friendly to JRuby.
+* Added Test::Unit 2.x as a development dependency.
+* Renamed the test files.
+
 == 1.1.6 - 31-Aug-2007
 * Fixed the File.touch method so that it doesn't whack existing files. Thanks
   go to Thomas Preymesser for the spot.

data/MANIFEST

@@ -4,17 +4,16 @@
 * Rakefile
 * ptools.gemspec
 * lib/ptools.rb
-* test/ts_all.rb
-* test/tc_constants.rb
-* test/tc_head.rb
-* test/tc_image.rb
-* test/tc_middle.rb
-* test/tc_nlconvert.rb
-* test/tc_null.rb
-* test/tc_tail.rb
-* test/tc_touch.rb
-* test/tc_wc.rb
-* test/tc_which.rb
-* test/tc_whereis.rb
+* test/test_constants.rb
+* test/test_head.rb
+* test/test_image.rb
+* test/test_middle.rb
+* test/test_nlconvert.rb
+* test/test_null.rb
+* test/test_tail.rb
+* test/test_touch.rb
+* test/test_wc.rb
+* test/test_which.rb
+* test/test_whereis.rb
 * test/test_file.txt
 * test/test_file2.txt

data/README

@@ -1,9 +1,9 @@
 == Description
-   The ptools (power tools) package is an additional set of commands for the
+   The ptools (power tools) library is an additional set of commands for the
    File class based on Unix command line tools.
    
 == Prerequisites
-   Ruby 1.8.0 or later is recommended but not required.
+   Ruby 1.8.0 or later is recommended.
    On MS Windows you will need win32-file 0.5.4 or later.
 
 == Installation
@@ -35,14 +35,15 @@
 == Known Bugs
    There is a bug in 1.6.x that can cause $\ characters to accumulate when
    converting to DOS or MAC format if nl_convert is run multiple times on
-   the same file.  This appears to be fixed in 1.8.x.
+   the same file. This appears to be fixed in 1.8.x. You're not still running
+   Ruby 1.6.x are you? I would hope not.
 
    One or two of The File.nl_convert tests may fail on Windows.  You can
    ignore these.
 
 == Acknowledgements
    The which() method was adopted from the FileWhich code posted by Michael
-   Granger on http://www.rubygarden.org.  The 'whereis' command is a minor
+   Granger on http://www.rubygarden.org. The 'whereis' command is a minor
    modification of that code as well.
 
    The nl_convert() method was adopted (somewhat) from the nlcvt program
@@ -58,10 +59,10 @@
    Add whatever other tools people think might be useful.
    
 == License
-   Ruby's
+   Artistic 2.0
     
 == Copyright
-   (C) 2003-2007 Daniel J. Berger
+   (C) 2003-2009 Daniel J. Berger
    All Rights Reserved.
     
 == Warranty

data/lib/ptools.rb

@@ -1,11 +1,12 @@
-require 'win32/file' if RUBY_PLATFORM.match('mswin')
+require 'rbconfig'
+require 'win32/file' if Config::CONFIG['host_os'].match('mswin')
 
 class File
-   PTOOLS_VERSION = '1.1.6'
+   PTOOLS_VERSION = '1.1.7'
 
    # :stopdoc:
 
-   if RUBY_PLATFORM.match('mswin')
+   if Config::CONFIG['host_os'].match('mswin')
       IS_WINDOWS = true
       begin
          WIN32EXTS = ENV['PATHEXT'].split(';').map{ |e| e.downcase }
@@ -43,7 +44,7 @@ class File
    # Based on information from  http://en.wikipedia.org/wiki//dev/null
    #
    def self.null
-      case RUBY_PLATFORM
+      case Config::CONFIG['host_os']
          when /mswin/i
             'NUL'
          when /amiga/i
@@ -76,7 +77,7 @@ class File
    # Returns nil if not found. 
    #
    def self.which(program, path=ENV['PATH'])
-      programs = program.to_a
+      programs = [program]
       
       # If no file extension is provided on Windows, try the WIN32EXT's in turn
       if IS_WINDOWS && File.extname(program).empty?
@@ -116,7 +117,7 @@ class File
    #
    def self.whereis(program, path=ENV['PATH'])
       dirs = []
-      programs = program.to_a
+      programs = [program]
       
       # If no file extension is provided on Windows, try the WIN32EXT's in turn
       if IS_WINDOWS && File.extname(program).empty?
@@ -219,24 +220,32 @@ class File
       $\ = format
 
       if filename == newfilename
-         require "ftools"
-         require "tempfile"
-         tf = Tempfile.new("temp")
-         tf.open
-         IO.foreach(filename){ |line|
-            line.chomp!
-            tf.print line
-         }
-         tf.close
+         require 'fileutils'
+         require 'tempfile'
+
+         begin
+            tf = Tempfile.new('ruby_temp_' + Time.now.to_s)
+            tf.open
+
+            IO.foreach(filename){ |line|
+               line.chomp!
+               tf.print line
+            }
+         ensure
+            tf.close if tf && !tf.closed?
+         end
          File.delete(filename)
-         File.copy(tf.path,filename)
+         FileUtils.cp(tf.path, filename)
       else
-         nf = File.new(newfilename,"w+")  
-         IO.foreach(filename){ |line|
-            line.chomp!
-            nf.print line
-         }
-         nf.close
+         begin
+            nf = File.new(newfilename, 'w')  
+            IO.foreach(filename){ |line|
+               line.chomp!
+               nf.print line
+            }
+         ensure
+            nf.close if nf && !nf.closed?
+         end
       end
 
       $\ = orig

data/test/{tc_binary.rb → test_binary.rb}

@@ -4,12 +4,18 @@
 # Test case for the File.binary? method. You should run this test
 # via the 'rake test_binary' task.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 
 class TC_Binary < Test::Unit::TestCase
+   def self.startup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'      
+   end
+   
    def setup
-      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
       @text_file = 'test_file1.txt'
    end
 

data/test/{tc_constants.rb → test_constants.rb}

@@ -1,28 +1,32 @@
 #####################################################################
-# tc_constants.rb
+# test_constants.rb
 #
 # Tests the constants that have been defined for our package. This
 # test case should be run via the 'rake test_constants' task.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
+require 'rbconfig'
 require 'ptools'
 
 class TC_Constants < Test::Unit::TestCase
    def test_version
-      assert_equal('1.1.6', File::PTOOLS_VERSION)
+      assert_equal('1.1.7', File::PTOOLS_VERSION)
    end
 
    def test_image_ext
       assert_equal(%w/.bmp .gif .jpeg .jpg .png/, File::IMAGE_EXT.sort)
    end
 
-   if RUBY_PLATFORM.match('mswin')
-      def test_windows
-         assert_not_nil(File::IS_WINDOWS)
-      end
+   def test_windows
+      omit_unless(Config::CONFIG['host_os'].match('mswin'), "Skipping on Unix systems")
+      assert_not_nil(File::IS_WINDOWS)
+   end
 
-      def test_win32exts
-         assert_not_nil(File::WIN32EXTS)
-      end
+   def test_win32exts
+      omit_unless(Config::CONFIG['host_os'].match('mswin'), "Skipping on Unix systems")
+      assert_not_nil(File::WIN32EXTS)
    end
 end

data/test/{tc_head.rb → test_head.rb}

@@ -1,20 +1,24 @@
 ######################################################################
-# tc_head.rb
+# test_head.rb
 # 
 # Test case for the File.head method. This test should be run via
 # the 'rake test_head' task.
 ######################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 
 class TC_FileHead < Test::Unit::TestCase
-   def setup
-      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+   def self.startup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'    
+   end
+   
+   def setup  
       @test_file = 'test_file1.txt'
-
       @expected_head1 = ["line1\n","line2\n","line3\n","line4\n","line5\n"]
       @expected_head1.push("line6\n","line7\n","line8\n","line9\n","line10\n")
-
       @expected_head2 = ["line1\n","line2\n","line3\n","line4\n","line5\n"]
    end
 

data/test/{tc_image.rb → test_image.rb}

@@ -1,15 +1,21 @@
 #####################################################################
-# tc_image.rb
+# test_image.rb
 # 
 # Test case for the File.image? method. You should run this test
 # via the 'rake test_image' task.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 
 class TC_Ptools_Image < Test::Unit::TestCase
-   def setup
-      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+   def self.startup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'      
+   end
+   
+   def setup   
       @text_file = 'test_file1.txt'
    end
 

data/test/{tc_middle.rb → test_middle.rb}

@@ -1,15 +1,21 @@
 #####################################################################
-# tc_middle.rb
+# test_middle.rb
 #
 # Test case for the File.middle method. You should run this test
 # via the 'rake test_middle' task.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 
 class TC_FileMiddle < Test::Unit::TestCase
-   def setup
+   def self.startup
       Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+   end
+   
+   def setup   
       @test_file = 'test_file1.txt'
 
       @expected_middle1 = ["line10\n", "line11\n", "line12\n", "line13\n", "line14\n"]

data/test/{tc_nlconvert.rb → test_nlconvert.rb}

@@ -1,15 +1,21 @@
 #####################################################################
-# tc_nlconvert.rb
+# test_nlconvert.rb
 #
 # Test case for the File.nl_convert method. You should run this
 # test via the 'rake test_nlconvert' task.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 
 class TC_FileNLConvert < Test::Unit::TestCase
-   def setup
+   def self.startup
       Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+   end
+   
+   def setup   
       @test_file1 = 'test_file1.txt'
       @test_file2 = 'test_file2.txt'
       @dos_file   = 'dos_test_file.txt'
@@ -35,7 +41,7 @@ class TC_FileNLConvert < Test::Unit::TestCase
    end
 
    def test_nl_convert_to_mac
-      if RUBY_PLATFORM.match("mswin")
+      if Config::CONFIG['host_os'].match("mswin")
          msg = "** test may fail on MS Windows **" 
       else
          msg = "** mac file should be the same size (or larger), but isn't **"

data/test/{tc_null.rb → test_null.rb}

@@ -1,5 +1,5 @@
 #####################################################################
-# tc_null.rb
+# test_null.rb
 # 
 # Test case for the File.null method. You should run this test via
 # the 'rake test_null' task.

data/test/{tc_tail.rb → test_tail.rb}

@@ -1,15 +1,21 @@
 #####################################################################
-# tc_tail.rb
+# test_tail.rb
 #
 # Test case for the File.tail method. This test should be run via
 # the 'rake test_tail' task.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 
 class TC_FileTail < Test::Unit::TestCase
-   def setup
+   def self.startup
       Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+   end
+   
+   def setup     
       @test_file = 'test_file1.txt'
 
       @expected_tail1 = ["line16\n","line17\n","line18\n","line19\n"]

data/test/{tc_touch.rb → test_touch.rb}

@@ -4,12 +4,18 @@
 # Test case for the File.touch method. This test should be run
 # via the 'rake test_touch task'.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 
 class TC_FileTouch < Test::Unit::TestCase
-   def setup
-      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+   def self.startup
+      Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'      
+   end
+   
+   def setup   
       @test_file = 'delete.this'
       @xfile = 'test_file1.txt'
    end

data/test/{tc_wc.rb → test_wc.rb}

@@ -1,5 +1,5 @@
 #####################################################################
-# tc_wc.rb
+# test_wc.rb
 #
 # Test case for the File.wc method. This test should be run via
 # the 'rake test_wc' task.
@@ -8,8 +8,11 @@ require 'test/unit'
 require 'ptools'
 
 class TC_FileWC < Test::Unit::TestCase
-   def setup
-      Dir.chdir('test') if File.exists?('test')
+   def self.startup
+      Dir.chdir('test') if File.exists?('test')      
+   end
+   
+   def setup     
       @test_file = 'test_file1.txt'
    end
 

data/test/{tc_whereis.rb → test_whereis.rb}

@@ -1,9 +1,12 @@
 ######################################################################
-# tc_whereis.rb
+# test_whereis.rb
 #
 # Test case for the File.whereis method. This test should be run
 # via the 'rake test_whereis' task.
 ######################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'ptools'
 require 'rbconfig'
@@ -12,7 +15,8 @@ include Config
 class TC_FileWhereis < Test::Unit::TestCase
    def setup
       @expected_locs = [CONFIG['bindir']]
-      if RUBY_PLATFORM.match('mswin')
+      
+      if Config::CONFIG['host_os'].match('mswin')
          @expected_locs = ["c:\\ruby\\bin\\ruby.exe"]
       else
          @expected_locs << '/usr/local/bin/ruby'

data/test/{tc_which.rb → test_which.rb}

@@ -1,12 +1,15 @@
 #####################################################################
-# tc_which.rb
+# 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 is in your PATH for these
-# tests.
+# NOTE: I make the assumption that Ruby (or JRuby) is in your
+# PATH for these tests.
 #####################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'rbconfig'
 require 'ptools'
@@ -14,9 +17,10 @@ include Config
 
 class TC_FileWhich < Test::Unit::TestCase
    def setup
+      @ruby = RUBY_PLATFORM.match('java') ? 'jruby' : 'ruby'
       @exe = File.join(CONFIG["bindir"], CONFIG["ruby_install_name"]) 
 
-      if RUBY_PLATFORM.match('mswin')
+      if Config::CONFIG['host_os'].match('mswin')
          @exe.tr!('/','\\')
          @exe << ".exe"
       end
@@ -24,23 +28,24 @@ class TC_FileWhich < Test::Unit::TestCase
 
    def test_which_basic
       assert_respond_to(File, :which)
-      assert_nothing_raised{ File.which("ruby") }
-      assert_nothing_raised{ File.which("ruby", "/usr/bin:/usr/local/bin") }
+      assert_nothing_raised{ File.which(@ruby) }
+      assert_nothing_raised{ File.which(@ruby, "/usr/bin:/usr/local/bin") }
    end
 
    def test_which_expected_return_values
-      assert_kind_of(String, File.which("ruby"))
-      assert_equal(@exe, File.which("ruby"))
-      assert_equal(nil, File.which("ruby", "/bogus/path"))
+      assert_kind_of(String, File.which(@ruby))
+      assert_equal(@exe, File.which(@ruby))
+      assert_equal(nil, File.which(@ruby, "/bogus/path"))
       assert_equal(nil, File.which("blahblah"))
    end
 
    def test_which_expected_errors
       assert_raises(ArgumentError){ File.which }
-      assert_raises(ArgumentError){ File.which("ruby", "foo", "bar") }
+      assert_raises(ArgumentError){ File.which(@ruby, "foo", "bar") }
    end
 
    def teardown
-      @exe = nil
+      @exe  = nil
+      @ruby = nil
    end
 end

metadata

@@ -1,67 +1,96 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ptools
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
-date: 2007-08-31 00:00:00 -06:00
-summary: Extra methods for the File class
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/shards
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.1.7
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
-files: 
-- lib/ptools.rb
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-07-28 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+description: "      The ptools (power tools) library provides several handy methods to\n      Ruby's core File class, such as File.which for finding executables,\n      File.null to return the null device on your platform, and so on.\n"
+email: djberg96@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 - CHANGES
 - MANIFEST
-- README
-- Rakefile
-- test/tc_binary.rb
-- test/tc_constants.rb
-- test/tc_head.rb
-- test/tc_image.rb
-- test/tc_middle.rb
-- test/tc_nlconvert.rb
-- test/tc_null.rb
-- test/tc_tail.rb
-- test/tc_touch.rb
-- test/tc_wc.rb
-- test/tc_whereis.rb
-- test/tc_which.rb
+files: 
+- lib/ptools.rb
+- test/test_binary.rb
+- test/test_constants.rb
 - test/test_file1.txt
 - test/test_file2.txt
-- test/ts_all.rb
-test_files: 
-- test/ts_all.rb
-rdoc_options: []
-
-extra_rdoc_files: 
+- test/test_head.rb
+- test/test_image.rb
+- test/test_middle.rb
+- test/test_nlconvert.rb
+- test/test_null.rb
+- test/test_tail.rb
+- test/test_touch.rb
+- test/test_wc.rb
+- test/test_whereis.rb
+- test/test_which.rb
 - README
 - CHANGES
 - MANIFEST
-executables: []
-
-extensions: []
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/shards
+licenses: 
+- Artistic 2.0
+post_install_message: 
+rdoc_options: []
 
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: shards
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Extra methods for the File class
+test_files: 
+- test/test_binary.rb
+- test/test_constants.rb
+- test/test_file1.txt
+- test/test_file2.txt
+- test/test_head.rb
+- test/test_image.rb
+- test/test_middle.rb
+- test/test_nlconvert.rb
+- test/test_null.rb
+- test/test_tail.rb
+- test/test_touch.rb
+- test/test_wc.rb
+- test/test_whereis.rb
+- test/test_which.rb

data/Rakefile

@@ -1,101 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rbconfig'
-include Config
-
-desc 'Install the ptools package (non-gem)'
-task :install do
-   sitelibdir = CONFIG["sitelibdir"]
-   file = "lib/ptools.rb"
-   FileUtils.cp(file, sitelibdir, :verbose => true)
-end
-
-task :install_gem do
-   ruby 'ptools.gemspec'
-   file = Dir["*.gem"].first
-   sh "gem install #{file}"
-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/test/ts_all.rb

@@ -1,20 +0,0 @@
-########################################
-# ts_all.rb
-#
-# All tests for the ptools package.
-########################################
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(Dir.pwd + "/test")
-
-require 'tc_binary'
-require 'tc_constants'
-require 'tc_head'
-require 'tc_image'
-require 'tc_middle'
-require 'tc_nlconvert'
-require 'tc_null'
-require 'tc_tail'
-require 'tc_touch'
-require 'tc_wc'
-require 'tc_which'
-require 'tc_whereis'