pathname2 1.4.2 → 1.4.3

data/CHANGES

@@ -1,3 +1,6 @@
+== 1.4.3 - 3-Mar-2006
+* Added the Pathname#realpath method.
+
 == 1.4.2 - 22-Feb-2006
 * Fixed the Pathname#relative_path_from method for Windows.  This really only
   affected edge cases that you probably never saw anyway.

data/lib/pathname2.rb

@@ -6,8 +6,8 @@
 # All functionality from File, FileTest, and Dir is included, using a facade
 # pattern.
 #
-# This class works on both Unix and Win32, including UNC path names.  Note
-# that forward slashes are converted to backslashes on Win32 systems.
+# This class works on both Unix and Windows, including UNC path names.  Note
+# that forward slashes are converted to backslashes on Windows systems.
 #
 # == Usage
 #
@@ -20,7 +20,7 @@
 # path1 + path2 # "/foo/bar/zap"
 # path1.dirname # "/foo/bar"
 #
-# # Win32
+# # Windows
 # path1 = Pathname.new("C:\\foo\\bar\\baz")
 # path2 = Pathname.new("..\\zap")
 #
@@ -34,7 +34,7 @@
 # imperator on IRC (irc.freenode.net)
 #
 # == Copyright
-# Copyright (c) 2005 Daniel J. Berger.
+# Copyright (c) 2005-2006 Daniel J. Berger.
 # Licensed under the same terms as Ruby itself.
 #
 require "facade"
@@ -48,41 +48,41 @@ class Pathname < String
 
    alias :_plus_ :+ # Used to prevent infinite loops in some cases
    
-   if PLATFORM.match("mswin")
-      require "Win32API"
-      @@PathStripToRoot  = Win32API.new("shlwapi","PathStripToRoot","P","L")
-      @@PathIsUNC        = Win32API.new("shlwapi","PathIsUNC","P","L")
-      @@PathIsURL        = Win32API.new("shlwapi","PathIsURL","P","L")
-      @@PathCanonicalize = Win32API.new("shlwapi","PathCanonicalize","PP","L")
-      @@PathAppend       = Win32API.new("shlwapi","PathAppend","PP","L")     
-      @@PathIsRoot       = Win32API.new("shlwapi","PathIsRoot","P","L")
-      @@PathIsDirectory  = Win32API.new("shlwapi","PathIsDirectory","P","L")
-      @@PathIsRelative   = Win32API.new("shlwapi","PathIsRelative","P","L")
-      @@PathFileExists   = Win32API.new("shlwapi","PathFileExists","P","L")
-      @@PathUndecorate   = Win32API.new("shlwapi","PathUndecorate","P","L")
+   if RUBY_PLATFORM.match('mswin')
+      require 'Win32API'
+      @@PathStripToRoot  = Win32API.new('shlwapi', 'PathStripToRoot', 'P', 'L')
+      @@PathIsUNC        = Win32API.new('shlwapi', 'PathIsUNC', 'P', 'L')
+      @@PathIsURL        = Win32API.new('shlwapi', 'PathIsURL', 'P', 'L')
+      @@PathCanonicalize = Win32API.new('shlwapi', 'PathCanonicalize','PP','L')
+      @@PathAppend       = Win32API.new('shlwapi', 'PathAppend', 'PP', 'L')     
+      @@PathIsRoot       = Win32API.new('shlwapi', 'PathIsRoot', 'P', 'L')
+      @@PathIsDirectory  = Win32API.new('shlwapi', 'PathIsDirectory', 'P', 'L')
+      @@PathIsRelative   = Win32API.new('shlwapi', 'PathIsRelative', 'P', 'L')
+      @@PathFileExists   = Win32API.new('shlwapi', 'PathFileExists', 'P', 'L')
+      @@PathUndecorate   = Win32API.new('shlwapi', 'PathUndecorate', 'P', 'L')
       
       @@GetShortPathName = 
-         Win32API.new("kernel32","GetShortPathName","PPL","L")
+         Win32API.new('kernel32', 'GetShortPathName', 'PPL', 'L')
          
       @@GetLongPathName = 
-         Win32API.new("kernel32","GetLongPathName","PPL","L")
+         Win32API.new('kernel32', 'GetLongPathName', 'PPL', 'L')
 
       @@PathGetDriveNumber =
-         Win32API.new("shlwapi","PathGetDriveNumber","P","L")
+         Win32API.new('shlwapi', 'PathGetDriveNumber', 'P', 'L')
    
       @@PathCreateFromUrl  =
-         Win32API.new("shlwapi", "PathCreateFromUrl", "PPPL", "L")
+         Win32API.new('shlwapi', 'PathCreateFromUrl', 'PPPL', 'L')
    
       @@PathRemoveBackslash =
-         Win32API.new("shlwapi", "PathRemoveBackslash", "P", "P")
+         Win32API.new('shlwapi', 'PathRemoveBackslash', 'P', 'P')
    end
 
-   VERSION  = "1.4.2"
+   VERSION  = '1.4.3'
    MAX_PATH = 260
    
    # Creates and returns a new Pathname object.
    #
-   # On Win32 systems, all forward slashes are replaced with backslashes.
+   # On Windows systems, all forward slashes are replaced with backslashes.
    def initialize(path)
       if path.length > MAX_PATH
          msg = "string too long.  maximum string length is " + MAX_PATH.to_s
@@ -90,7 +90,7 @@ class Pathname < String
       end
 
       @sep = File::ALT_SEPARATOR || File::SEPARATOR
-      @win = PLATFORM.match("mswin")
+      @win = RUBY_PLATFORM.match('mswin')
 
       # Handle File URL's for Windows
       if @win
@@ -109,6 +109,16 @@ class Pathname < String
       path = path.tr("/", @sep) if @win
       super(path)
    end
+
+   # 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.
+   def realpath
+      pwd = Pathname.new(Dir.pwd)
+      File.stat(self)               # Check to ensure that the path exists
+      pwd + self
+   end
    
    # Returns the children of the directory, files and subdirectories, as an
    # array of Pathname objects. If you set +with_directory+ to +false+, then
@@ -132,7 +142,7 @@ class Pathname < String
       result
    end
 
-   # Win32 only
+   # Windows only
    #
    # Removes the decoration from a path string.  For example,
    # C:\Path\File[5].txt would become C:\Path\File.txt.  Non-destructive.
@@ -146,7 +156,7 @@ class Pathname < String
       Pathname.new(buf.split(0.chr).first)
    end
    
-   # Win32 only
+   # Windows only
    #
    # Performs the substitution of Pathname#undecorate in place.
    def undecorate!
@@ -160,7 +170,7 @@ class Pathname < String
       self
    end
    
-   # Win32 only
+   # Windows only
    #
    # Returns the short path for a long path name.  For example,
    # C:\Program Files\Java would return C:\Progra~1\Java.
@@ -174,7 +184,7 @@ class Pathname < String
       Pathname.new(buf.split(0.chr).first)
    end
    
-   # Win32 only
+   # Windows only
    #
    # Returns the long path for a long path name.  For example,
    # C:\Progra~1\Java would return C:\Program Files\Java.
@@ -333,7 +343,7 @@ class Pathname < String
       end
    end
    
-   # Win32 only
+   # Windows only
    #
    # Determines if the string is a valid Universal Naming Convention (UNC)
    # for a server and share path.
@@ -345,7 +355,7 @@ class Pathname < String
       @@PathIsUNC.call(self) > 0
    end
    
-   # Win32 only
+   # Windows only
    #
    # Returns the drive number that corresponds to the root, or nil if not
    # applicable.

data/test/tc_pathname.rb

@@ -24,6 +24,7 @@ require "test/unit"
 
 class TC_Pathname < Test::Unit::TestCase
    def setup
+      @pwd = Dir.pwd
       @abs_path = Pathname.new("/usr/local/bin")
       @rel_path = Pathname.new("usr/local/bin")
       @trl_path = Pathname.new("/usr/local/bin/")
@@ -71,7 +72,13 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.4.2", Pathname::VERSION)
+      assert_equal("1.4.3", Pathname::VERSION)
+   end
+
+   def test_realpath
+      assert_respond_to(@abs_path, :realpath)
+      assert_equal(@pwd, Pathname.new('.').realpath)
+      assert_raises(Errno::ENOENT){ Pathname.new('../bogus').realpath }
    end
 
    # These tests taken directly from Tanaka's pathname.rb. The one failure

data/test/tc_pathname_win.rb

@@ -80,6 +80,12 @@ class TC_Pathname_MSWin < Test::Unit::TestCase
          Pathname.new(to).relative_path_from(from)
       }
    end
+
+   def test_realpath
+      assert_respond_to(@abs_path, :realpath)
+      assert_equal(@cur_path, Pathname.new('.').realpath)
+      assert_raises(Errno::ENOENT){ Pathname.new('../bogus').realpath }
+   end
    
    def test_relative_path_from
       assert_relpath("..\\a", "a", "b")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: pathname2
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
-date: 2006-02-22 00:00:00 -07:00
+  version: 1.4.3
+date: 2006-03-03 00:00:00 -07:00
 summary: An alternate implementation of the Pathname class
 require_paths: 
 - lib