pathname2 1.5.1 → 1.5.2

data/CHANGES

@@ -1,3 +1,15 @@
+== 1.5.2 - 9-Mar-2007
+* Bug fix for the Pathname#realpath method where it was not handling recursive
+   symlinks. The C version was also fixed, but it only affected platforms that
+   don't have the realpath() function.
+* Added a test for recursive symlinks (for Solaris, anyway).
+* Updated the docs for Pathname#realpath.
+* Minor speed enhancements for the C version and the elimination of one
+   (potential) segfault.
+* Added a 'Future Plans' section to the README.
+* Added a Rakefile. You can now build, clean, and test and install (both the
+  pure Ruby and C versions).
+
 == 1.5.1 - 28-Aug-2006
 * Added the Kernel#pn method as a shortcut for Pathname.new.
 * The Pathname#readlink now properly handles symbolic links.  The 'fix'

data/MANIFEST

@@ -1,5 +1,6 @@
 CHANGES
 MANIFEST
+Rakefile
 README
 install.rb
 pathname2.gempsec

data/README

@@ -1,5 +1,5 @@
 == Description
-   A drop in replacement for the current Pathname class.
+   A drop-in replacement for the current Pathname class.
 
 == Prerequisites
    * Ruby 1.8.0 or later
@@ -10,21 +10,16 @@
    
 == Installation, pure Ruby
 === Manual Installation
-   ruby test/tc_pathname.rb (Unix, optional)
-   ruby test/tc_pathname_win.rb (Windows, optional)
-   ruby install.rb
+   rake test (optional)
+   rake install
    
 === Gem Installation
-   ruby test/tc_pathname.rb (Unix, optional)
-   ruby test/tc_pathname_win.rb (Windows, optional)
+   rake test (optional)
    gem install pathname2-<version>.gem
    
 == Installation, C extension
-   cd to the 'ext' directory.
-   ruby extconf.rb
-   make
-   run appropriate test (optional)
-   make install
+   rake test_c (optional)
+   rake install_c
 
 == Synopsis
    require "pathname2"
@@ -98,9 +93,14 @@
    Pathname#glob is not yet implemented in the C version.
    Pathname#find is not implemented properly in the C version.
    
-   In Ruby 1.8.3 and later you will see a failure in the test suite regarding
+   In Ruby 1.8.3 and 1.8.4 you will see a failure in the test suite regarding
    'fu_world_writable?' from FileUtils.  You can ignore this.  That method is
    supposed to be private.  See ruby-core:7383.
+
+== Future Plans
+   Because ftools is more or less deprecated, and FileUtils can generally do
+   everything ftools can do, and better, I'm going to remove ftools in the
+   1.6.0 release.
    
 == License
    Ruby's

data/Rakefile

@@ -0,0 +1,74 @@
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+
+desc "Clean the build files from the pathname2 source"
+task :clean do
+   Dir.chdir('ext') do
+      if RUBY_PLATFORM.match('mswin')
+         sh 'nmake distclean' if File.exists?('pathname2.so')
+      else
+         sh 'make distclean' if File.exists?('pathname2.so')
+      end
+   end
+end
+
+desc "Build the pathname2 package on UNIX systems (but don't install it)"
+task :build => [:clean] do
+   Dir.chdir('ext') do
+      ruby 'extconf.rb'
+      if RUBY_PLATFORM.match('mswin')
+         sh 'nmake'
+      else
+         sh 'make'
+      end
+   end
+end
+
+desc "Install the pure Ruby version of the pathname2 package"
+task :install do
+   cp 'lib/pathname2.rb', Config::CONFIG['sitelibdir']
+end
+
+desc "Install the C version of the pathname2 package"
+task :install_c => [:build] do
+   Dir.chdir('ext') do
+      if RUBY_PLATFORM.match('mswin')
+         sh 'nmake install'
+      else
+         sh 'make install'
+      end
+   end
+end
+
+desc "Run the test suite for the pure Ruby version"
+Rake::TestTask.new('test') do |t|
+   t.libs << 'lib'
+   if RUBY_PLATFORM.match('mswin')
+      t.test_files = FileList['test/tc_pathname_win.rb']
+   else
+      t.test_files = FileList['test/tc_pathname.rb']
+   end
+end
+
+desc "Run the test suite for the C version."
+Rake::TestTask.new('test_c') do |t|
+   task :test_c => :build
+   t.libs << 'ext'
+   t.libs.delete('lib')
+   if RUBY_PLATFORM.match('mswin')
+      t.test_files = FileList['test/tc_pathname_win.rb']
+   else
+      t.test_files = FileList['test/tc_pathname.rb']
+   end
+end
+
+desc "Run the benchmark suite for the pure Ruby version"
+task :benchmark do
+   sh 'ruby -Ilib examples/bench_pathname.rb'
+end
+
+desc "Run the benchmark suite for the C version"
+task :benchmark_c => [:build] do
+   sh 'ruby -Iext examples/bench_pathname.rb c'
+end

data/lib/pathname2.rb

@@ -57,7 +57,7 @@ class Pathname < String
       include Windows::File
    end
 
-   VERSION  = '1.5.1'
+   VERSION  = '1.5.2'
    MAX_PATH = 260
    
    # Creates and returns a new Pathname object.
@@ -107,24 +107,21 @@ class Pathname < String
    # Returns a real (absolute) pathname of +self+ in the actual filesystem.
    #
    # Unlike most Pathname methods, this one assumes that the path actually
-   # exists on your filesystem.  If it doesn't, an error is raised.
+   # exists on your filesystem. If it doesn't, an error is raised. If a
+   # circular symlink is encountered a system error will be raised.
    #
    def realpath
-      File.stat(self)               # Check to ensure that the path exists
+      File.stat(self) # Check to ensure that the path exists
+
       if File.symlink?(self)
-         path = self.class.new(File.readlink(self))
-         if File.symlink?(path)
-            while File.symlink?(path)
-               if path.relative?
-                  path = path + File.dirname(path)
-               else
-                  path = self.class.new(File.readlink(path))
-               end
-            end
-         else
-            path = self.class.new(File.dirname(self)) + path
+         file = self.dup
+
+         while true
+            file = File.join(File.dirname(file), File.readlink(file))
+            break unless File.symlink?(file)
          end
-         path
+
+         self.class.new(file).clean
       else
          self.class.new(Dir.pwd) + self
       end
@@ -861,3 +858,12 @@ module Kernel
       instance_eval{ Pathname.new(yield) }
    end
 end
+
+if $0 == __FILE__
+   path1 = '/dev/fd0'
+   path2 = 'link2'
+
+   path = Pathname.new(path1)
+   path = path.realpath
+   p path
+end

data/test/tc_pathname.rb

@@ -1,24 +1,10 @@
 ##############################################################################
 # tc_pathname.rb
 #
-# Test suite for the pathname package (Unix).  If you pass a 'c' as command
-# line option, it will test against the C extension.  Otherwise, it will run
-# the tests against the pure Ruby version.
+# Test suite for the pathname package (Unix). This test suite should be run
+# via the Rake tasks, i.e. 'rake test_pr' to test the pure Ruby version, or
+# 'rake test_c' to test the C version.
 ##############################################################################
-Dir.chdir '..' if File.basename(Dir.pwd) == 'test'
-
-# Test against the C extension if a 'c' is provided as an argument.
-if ARGV[0] && ARGV[0].chomp.downcase == 'c'
-   $LOAD_PATH.unshift Dir.pwd + '/ext'
-else
-   $LOAD_PATH.unshift Dir.pwd + '/lib'
-end
-
-if PLATFORM.match('mswin')
-   STDERR.puts("Please run 'tc_pathname_win.rb' instead.")
-   exit
-end
-
 require 'pathname2'
 require 'test/unit'
 
@@ -77,7 +63,7 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.5.1', Pathname::VERSION)
+      assert_equal('1.5.2', Pathname::VERSION)
    end
 
    def test_file_url_path
@@ -100,8 +86,13 @@ class TC_Pathname < Test::Unit::TestCase
          when /sunos|solaris/i
             path1 = '/dev/null'
             path2 = '/dev/stdin'
+            path3 = '/dev/fd0'   # Multiple symlinks
+
             assert_equal('/devices/pseudo/mm@0:null', Pathname.new(path1).realpath)
             assert_equal('/dev/fd/0', Pathname.new(path2).realpath)
+            assert_equal('/devices/pci@1f,0/isa@7/dma@0,0/floppy@0,3f0:c',
+               Pathname.new(path3).realpath
+            )
       end
    end
 
@@ -231,6 +222,7 @@ class TC_Pathname < Test::Unit::TestCase
             Dir.pwd + '/CHANGES',
             Dir.pwd + '/MANIFEST',
             Dir.pwd + '/README',
+            Dir.pwd + '/Rakefile',
             Dir.pwd + '/examples',
             Dir.pwd + '/ext',
             Dir.pwd + '/install.rb',
@@ -249,7 +241,7 @@ class TC_Pathname < Test::Unit::TestCase
 
       assert_equal(
          [
-            'CHANGES', 'MANIFEST', 'README', 'examples', 'ext',
+            'CHANGES', 'MANIFEST', 'README', 'Rakefile', 'examples', 'ext',
             'install.rb', 'lib', 'pathname2.gemspec', 'test'
          ],
          children.sort

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: pathname2
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
-date: 2006-08-28 00:00:00 -06:00
+  version: 1.5.2
+date: 2007-03-09 00:00:00 -07:00
 summary: An alternate implementation of the Pathname class
 require_paths: 
 - lib
@@ -33,6 +33,7 @@ files:
 - CHANGES
 - MANIFEST
 - README
+- Rakefile
 - test/tc_pathname.rb
 - test/tc_pathname_win.rb
 test_files: