ptools 1.2.1 → 1.2.2

data/CHANGES

@@ -1,3 +1,11 @@
+== 1.2.2 - 6-Apr-2012
+* Yet another sparse file test fix for OSX, which does not support
+  sparse file generation on HFS+.
+* Fixed a bug in the File.whereis method on Windows when dealing with
+  absolute paths.
+* Some Config vs RbConfig fixes to silence 1.9.3 warnings.
+* Refactored and cleaned up some tests.
+
 == 1.2.1 - 20-May-2011
 * Added an (empty) .gemtest file so that it can be used with test.rubygems.org.
 * Fixed a sparse file test.

data/README

@@ -53,7 +53,7 @@
   Artistic 2.0
     
 == Copyright
-  (C) 2003-2011 Daniel J. Berger
+  (C) 2003-2012 Daniel J. Berger
   All Rights Reserved.
     
 == Warranty

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
-include Config
+include RbConfig
 
 CLEAN.include("**/*.gem", "**/*.rbc", "**/*coverage*")
 

data/lib/ptools.rb

@@ -1,12 +1,9 @@
 require 'rbconfig'
-
-if File::ALT_SEPARATOR
-  require 'win32/file'
-end
+require 'win32/file' if File::ALT_SEPARATOR
 
 class File
   # The version of the ptools library.
-  PTOOLS_VERSION = '1.2.1'
+  PTOOLS_VERSION = '1.2.2'
 
   # :stopdoc:
 
@@ -22,7 +19,7 @@ class File
     MSWINDOWS = false
   end
 
-  IMAGE_EXT = %w/.bmp .gif .jpg .jpeg .png/
+  IMAGE_EXT = %w[.bmp .gif .jpg .jpeg .png]
 
   # :startdoc:
 
@@ -62,7 +59,7 @@ class File
   # http://en.wikipedia.org/wiki//dev/null
   #
   def self.null
-    case Config::CONFIG['host_os']
+    case RbConfig::CONFIG['host_os']
       when /mswin|win32|msdos|cygwin|mingw|windows/i
         'NUL'
       when /amiga/i
@@ -170,9 +167,14 @@ class File
     # Bail out early if an absolute path is provided.
     if program =~ /^\/|^[a-z]:[\\\/]/i
       program += WIN32EXTS if MSWINDOWS && File.extname(program).empty?
+      program = program.tr("\\", '/') if MSWINDOWS
       found = Dir[program]
       if found[0] && File.executable?(found[0]) && !File.directory?(found[0])
-        return found
+        if File::ALT_SEPARATOR
+          return found.map{ |f| f.tr('/', "\\") }
+        else
+          return found
+        end
       else
         return nil
       end
@@ -273,21 +275,22 @@ class File
   # ArgumentError is raised.
   #
   def self.nl_convert(old_file, new_file = old_file, platform = 'dos')
-    unless File.file?(old_file)
+    unless File::Stat.new(old_file).file?
       raise ArgumentError, 'Only valid for plain text files'
     end
 
-    if platform =~ /dos|windows|win32|mswin|cygwin|mingw/i
-      format = "\cM\cJ"
-    elsif platform =~ /unix|linux|bsd/i
-      format = "\cJ"
-    elsif platform =~ /mac|apple|macintosh|osx/i
-      format = "\cM"
-    else
-      raise ArgumentError, "Invalid platform string"
+    case platform
+      when /dos|windows|win32|mswin|cygwin|mingw/i
+        format = "\cM\cJ"
+      when /unix|linux|bsd/i
+        format = "\cJ"
+      when /mac|apple|macintosh|osx/i
+        format = "\cM"
+      else
+        raise ArgumentError, "Invalid platform string"
     end
 
-    orig = $\
+    orig = $\ # AKA $OUTPUT_RECORD_SEPARATOR
     $\ = format
 
     if old_file == new_file
@@ -390,21 +393,19 @@ class File
     end
   end
 
-  class << self
-    # Already provided by win32-file on MS Windows
-    unless respond_to?(:sparse?)
-      # Returns whether or not +file+ is a sparse file.
-      #
-      # A sparse file is a any file where its size is greater than the number
-      # of 512k blocks it consumes, i.e. its apparent and actual file size is
-      # not the same.
-      #
-      # See http://en.wikipedia.org/wiki/Sparse_file for more information.
-      #
-      def sparse?(file)
-        stats = File.stat(file)
-        stats.size > stats.blocks * 512
-      end
+  # Already provided by win32-file on MS Windows
+  unless respond_to?(:sparse?)
+    # Returns whether or not +file+ is a sparse file.
+    #
+    # A sparse file is a any file where its size is greater than the number
+    # of 512k blocks it consumes, i.e. its apparent and actual file size is
+    # not the same.
+    #
+    # See http://en.wikipedia.org/wiki/Sparse_file for more information.
+    #
+    def self.sparse?(file)
+      stats = File.stat(file)
+      stats.size > stats.blocks * 512
     end
   end
 

data/ptools.gemspec

@@ -3,14 +3,13 @@ require 'rbconfig'
 
 Gem::Specification.new do |gem|
   gem.name       = 'ptools'
-  gem.version    = '1.2.1'
+  gem.version    = '1.2.2'
   gem.license    = 'Artistic 2.0'
   gem.author     = 'Daniel J. Berger'
   gem.email      = 'djberg96@gmail.com'
   gem.homepage   = 'http://www.rubyforge.org/projects/shards'
   gem.summary    = 'Extra methods for the File class'
   gem.test_files = Dir['test/test*']
-  gem.has_rdoc   = true
   gem.files      = Dir['**/*'] << '.gemtest'
 
   gem.rubyforge_project = 'shards'
@@ -22,10 +21,10 @@ Gem::Specification.new do |gem|
     File.null to return the null device on your platform, and so on.
   EOF
 
-  gem.add_development_dependency('test-unit', '>= 2.0.7')
+  gem.add_development_dependency('test-unit', '>= 2.4.0')
 
-  if Config::CONFIG['host_os'] =~ /mswin|win32|msdos|cygwin|mingw|windows/i
-    gem.platform = Gem::Platform::CURRENT
+  if File::ALT_SEPARATOR
+    gem.platform = Gem::Platform.new(['universal', 'mingw32'])
     gem.add_dependency('win32-file', '>= 0.5.4')
   end
 end

data/test/test_binary.rb

@@ -1,43 +1,47 @@
 #####################################################################
-# tc_binary.rb
-# 
+# test_binary.rb
+#
 # 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 'test-unit'
 require 'ptools'
 
-class TC_Binary < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir('test') if File.exists?('test')
-      File.open('test_file1.txt', 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
-   end
-   
-   def setup
-      @text_file = 'test_file1.txt'
-   end
-
-   def test_binary_basic
-      assert_respond_to(File, :binary?)
-      assert_nothing_raised{ File.binary?(@text_file) }
-   end
-
-   def test_binary_expected_results
-      assert_equal(false, File.binary?(@text_file))
-   end
-
-   def test_binary_expected_errors
-      assert_raise_kind_of(SystemCallError){ File.binary?('bogus') }
-   end
-
-   def teardown
-      @text_file = nil
-   end
-
-   def self.shutdown
-      File.delete('test_file1.txt') if File.exists?('test_file1.txt')
-   end
+class TC_Ptools_Binary < Test::Unit::TestCase
+  def self.startup
+    @@txt_file = 'test_binary.txt'
+
+    if File::ALT_SEPARATOR
+      @@bin_file = File.join(ENV['windir'], 'notepad.exe')
+    else
+      @@bin_file = '/bin/ls'
+    end
+
+    Dir.chdir('test') if File.exists?('test')
+
+    File.open(@@txt_file, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
+  end
+
+  test "File.binary? basic functionality" do
+    assert_respond_to(File, :binary?)
+    assert_nothing_raised{ File.binary?(@@txt_file) }
+  end
+
+  test "File.binary? returns expected results" do
+    assert_false(File.binary?(@@txt_file))
+    assert_true(File.binary?(@@bin_file))
+  end
+
+  test "File.binary? raises an error if the file cannot be found" do
+    assert_raise_kind_of(SystemCallError){ File.binary?('bogus') }
+  end
+
+  test "File.binary? only accepts one argument" do
+    assert_raise_kind_of(ArgumentError){ File.binary?(@@txt_file, @@bin_file) }
+  end
+
+  def self.shutdown
+    File.delete(@@txt_file) if File.exists?(@@txt_file)
+  end
 end

data/test/test_constants.rb

@@ -5,28 +5,34 @@
 # test case should be run via the 'rake test_constants' task.
 #####################################################################
 require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'rbconfig'
 require 'ptools'
 
-class TC_Constants < Test::Unit::TestCase
-   def test_version
-      assert_equal('1.2.1', File::PTOOLS_VERSION)
-   end
+class TC_Ptools_Constants < Test::Unit::TestCase
+  def self.startup
+    @@windows = File::ALT_SEPARATOR
+  end
+
+  test "PTOOLS_VERSION constant is set to expected value" do
+    assert_equal('1.2.2', File::PTOOLS_VERSION)
+  end
+
+  test "IMAGE_EXT constant is set to array of values" do
+    assert_equal(%w[.bmp .gif .jpeg .jpg .png], File::IMAGE_EXT.sort)
+  end
 
-   def test_image_ext
-      assert_equal(%w/.bmp .gif .jpeg .jpg .png/, File::IMAGE_EXT.sort)
-   end
+  test "WINDOWS constant is defined on MS Windows" do
+    omit_unless(@@windows, "Skipping on Unix systems")
+    assert_not_nil(File::MSWINDOWS)
+  end
 
-   def test_windows
-      omit_unless(Config::CONFIG['host_os'].match('mswin'), "Skipping on Unix systems")
-      assert_not_nil(File::IS_WINDOWS)
-   end
+  test "WIN32EXTS constant is defiend on MS Windows" do
+    omit_unless(@@windows, "Skipping on Unix systems")
+    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
+  def self.shutdown
+    @@windows = nil
+  end
 end

data/test/test_is_sparse.rb

@@ -13,17 +13,20 @@ require 'ptools'
 class TC_IsSparse < Test::Unit::TestCase
   def self.startup
     Dir.chdir("test") if File.exists?("test")
-    @@win = Config::CONFIG['host_os'] =~ /windows|mswin|dos|cygwin|mingw/i
-    @@osx = Config::CONFIG['host_os'] =~ /darwin|osx/i
+    @@win = RbConfig::CONFIG['host_os'] =~ /windows|mswin|dos|cygwin|mingw/i
+    @@osx = RbConfig::CONFIG['host_os'] =~ /darwin|osx/i
+    @@sun = RbConfig::CONFIG['host_os'] =~ /sunos|solaris/i
   end
 
   def setup
-    @sparse_file = '/var/log/lastlog'
+    @sparse_file = @@sun ? '/var/adm/lastlog' : '/var/log/lastlog'
     @non_sparse_file = File.expand_path(File.basename(__FILE__))
   end
 
   test "is_sparse basic functionality" do
     omit_if(@@win, "File.sparse? tests skipped on MS Windows")
+    omit_if(@@osx, "File.sparse? tests skipped on OS X")
+
     assert_respond_to(File, :sparse?)
     assert_nothing_raised{ File.sparse?(@sparse_file) }
     assert_boolean(File.sparse?(@sparse_file))
@@ -32,6 +35,7 @@ class TC_IsSparse < Test::Unit::TestCase
   test "is_sparse returns the expected results" do
     omit_if(@@win, "File.sparse? tests skipped on MS Windows")
     omit_if(@@osx, "File.sparse? tests skipped on OS X")
+
     assert_true(File.sparse?(@sparse_file))
     assert_false(File.sparse?(@non_sparse_file))
   end

data/test/test_nlconvert.rb

@@ -5,12 +5,10 @@
 # test via the 'rake test_nlconvert' task.
 #####################################################################
 require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
-class TC_FileNLConvert < Test::Unit::TestCase
+class TC_Ptools_NLConvert < Test::Unit::TestCase
   def self.startup
     Dir.chdir('test') if File.exists?('test')
     @@test_file1 = 'test_nl_convert1.txt'

data/test/test_whereis.rb

@@ -4,27 +4,25 @@
 # Tests for the File.whereis method.
 ######################################################################
 require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 require 'rbconfig'
-include Config
 
-class TC_FileWhereis < Test::Unit::TestCase
+class TC_Ptools_Whereis < Test::Unit::TestCase
   def self.startup
-    @@windows = Config::CONFIG['host_os'] =~ /mswin|win32|msdos|cygwin|mingw/i
+    @@windows = File::ALT_SEPARATOR
     @@ruby = RUBY_PLATFORM == 'java' ? 'jruby' : 'ruby'
   end
 
   def setup
-    @expected_locs = [File.join(CONFIG['bindir'], @@ruby)]
+    @bin_dir = RbConfig::CONFIG['bindir']
+    @expected_locs = [File.join(@bin_dir, @@ruby)]
 
     if @@windows
       @expected_locs[0] << '.exe'
       @expected_locs[0].tr!("/", "\\")
     end
-      
+
     unless @@windows
       @expected_locs << "/usr/local/bin/#{@@ruby}"
       @expected_locs << "/opt/sfw/bin/#{@@ruby}"
@@ -60,8 +58,9 @@ class TC_FileWhereis < Test::Unit::TestCase
   end
 
   test "whereis returns single element array or nil if absolute path is provided" do
-    absolute = File.join(CONFIG['bindir'], @@ruby)
+    absolute = File.join(@bin_dir, @@ruby)
     absolute << '.exe' if @@windows
+
     assert_equal([absolute], File.whereis(absolute))
     assert_nil(File.whereis("/foo/bar/baz/#{@@ruby}"))
   end

data/test/test_which.rb

@@ -17,7 +17,7 @@ require 'ptools'
 
 class TC_FileWhich < Test::Unit::TestCase
   def self.startup
-    @@windows = Config::CONFIG['host_os'] =~ /mswin|msdos|win32|cygwin|mingw/i
+    @@windows = File::ALT_SEPARATOR
     @@dir = File.join(Dir.pwd, 'tempdir')
     @@non_exe = File.join(Dir.pwd, 'tempfile')
 
@@ -31,7 +31,10 @@ class TC_FileWhich < Test::Unit::TestCase
     @ruby = RUBY_PLATFORM.match('java') ? 'jruby' : 'ruby'
     @ruby = 'rbx' if defined?(Rubinius)
 
-    @exe = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+    @exe = File.join(
+      RbConfig::CONFIG['bindir'],
+      RbConfig::CONFIG['ruby_install_name']
+    )
 
     if @@windows
       @exe.tr!('/','\\')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ptools
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -06:00
-default_executable: 
+date: 2012-04-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
         - 2
+        - 4
         - 0
-        - 7
-        version: 2.0.7
+        version: 2.4.0
   type: :development
   version_requirements: *id001
 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"
@@ -45,27 +44,26 @@ extra_rdoc_files:
 - CHANGES
 - MANIFEST
 files: 
+- CHANGES
+- lib/ptools.rb
+- MANIFEST
+- ptools.gemspec
 - Rakefile
 - README
-- ptools.gemspec
-- lib/ptools.rb
-- CHANGES
-- test/test_whereis.rb
-- test/test_middle.rb
 - test/test_binary.rb
-- test/test_nlconvert.rb
-- test/test_touch.rb
-- test/test_which.rb
-- test/test_null.rb
+- test/test_constants.rb
 - test/test_head.rb
-- test/test_is_sparse.rb
-- test/test_wc.rb
 - test/test_image.rb
-- test/test_constants.rb
+- test/test_is_sparse.rb
+- test/test_middle.rb
+- test/test_nlconvert.rb
+- test/test_null.rb
 - test/test_tail.rb
-- MANIFEST
+- test/test_touch.rb
+- test/test_wc.rb
+- test/test_whereis.rb
+- test/test_which.rb
 - .gemtest
-has_rdoc: true
 homepage: http://www.rubyforge.org/projects/shards
 licenses: 
 - Artistic 2.0
@@ -95,21 +93,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extra methods for the File class
 test_files: 
-- test/test_whereis.rb
-- test/test_middle.rb
 - test/test_binary.rb
-- test/test_nlconvert.rb
-- test/test_touch.rb
-- test/test_which.rb
-- test/test_null.rb
+- test/test_constants.rb
 - test/test_head.rb
-- test/test_is_sparse.rb
-- test/test_wc.rb
 - test/test_image.rb
-- test/test_constants.rb
+- test/test_is_sparse.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