pathname2 1.8.3 → 2.0.0

data/lib/pathname2.rb

@@ -1,7 +1,7 @@
 # == Synopsis
 #
-# Pathname represents a path name on a filesystem. A Pathname can be
-# relative or absolute.  It does not matter whether the path exists or not.
+# Pathname2 represents a path name on a filesystem. A path name can be
+# relative or absolute. It does not matter whether the path exists or not.
 #
 # All functionality from File, FileTest, and Dir is included, using a facade
 # pattern.
@@ -14,15 +14,15 @@
 # require "pathname2"
 #
 # # Unix
-# path1 = Pathname.new("/foo/bar/baz")
-# path2 = Pathname.new("../zap")
+# path1 = Pathname2.new("/foo/bar/baz")
+# path2 = Pathname2.new("../zap")
 #
 # path1 + path2 # "/foo/bar/zap"
 # path1.dirname # "/foo/bar"
 #
 # # Windows
-# path1 = Pathname.new("C:\\foo\\bar\\baz")
-# path2 = Pathname.new("..\\zap")
+# path1 = Pathname2.new("C:\\foo\\bar\\baz")
+# path2 = Pathname2.new("..\\zap")
 #
 # path1 + path2 # "C:\\foo\\bar\\zap"
 # path1.exists? # Does the path exist?
@@ -37,44 +37,41 @@ if File::ALT_SEPARATOR
     # Convenience method for converting strings to UTF-16LE for wide character
     # functions that require it.
     def wincode
-      if self.encoding.name != 'UTF-16LE'
-        temp = self.dup
+      if encoding.name != 'UTF-16LE'
+        temp = dup
         (temp.tr(File::SEPARATOR, File::ALT_SEPARATOR) << 0.chr).encode('UTF-16LE')
       end
     end
   end
 end
 
-# You're mine now.
-Object.send(:remove_const, :Pathname) if defined?(Pathname)
-
-class Pathname < String
+class Pathname2 < String
   class Error < StandardError; end
   extend Facade
 
   undef_method :pretty_print
 
-  facade File, File.methods(false).map{ |m| m.to_sym } - [
-    :chmod, :lchmod, :chown, :lchown, :dirname, :fnmatch, :fnmatch?,
-    :link, :open, :realpath, :rename, :symlink, :truncate, :utime,
-    :basename, :expand_path, :join
+  facade File, File.methods(false).map(&:to_sym) - %i[
+    chmod lchmod chown lchown dirname fnmatch fnmatch?
+    link open realpath rename symlink truncate utime
+    basename expand_path join
   ]
 
-  facade Dir, Dir.methods(false).map{ |m| m.to_sym } - [
-    :chdir, :entries, :glob, :foreach, :mkdir, :open, :children
+  facade Dir, Dir.methods(false).map(&:to_sym) - %i[
+    chdir entries glob foreach mkdir open children
   ]
 
-  private
+  alias _plus_ + # Used to prevent infinite loops in some cases
 
-  alias :_plus_ :+ # Used to prevent infinite loops in some cases
+  protected :_plus_
 
   if File::ALT_SEPARATOR
     extend FFI::Library
     ffi_lib :shlwapi
 
-    attach_function :PathAppendW, [:pointer, :pointer], :bool
-    attach_function :PathCanonicalizeW, [:pointer, :buffer_in], :bool
-    attach_function :PathCreateFromUrlW, [:buffer_in, :pointer, :pointer, :ulong], :long
+    attach_function :PathAppendW, %i[pointer pointer], :bool
+    attach_function :PathCanonicalizeW, %i[pointer buffer_in], :bool
+    attach_function :PathCreateFromUrlW, %i[buffer_in pointer pointer ulong], :long
     attach_function :PathGetDriveNumberW, [:buffer_in], :int
     attach_function :PathIsRelativeW, [:buffer_in], :bool
     attach_function :PathIsRootW, [:buffer_in], :bool
@@ -86,21 +83,26 @@ class Pathname < String
 
     ffi_lib :kernel32
 
-    attach_function :GetLongPathNameW, [:buffer_in, :buffer_out, :ulong], :ulong
-    attach_function :GetShortPathNameW, [:buffer_in, :pointer, :ulong], :ulong
+    attach_function :GetLongPathNameW, %i[buffer_in buffer_out ulong], :ulong
+    attach_function :GetShortPathNameW, %i[buffer_in pointer ulong], :ulong
+
+    private_class_method :PathAppendW, :PathCanonicalizeW, :PathCreateFromUrlW
+    private_class_method :PathGetDriveNumberW, :PathIsRelativeW, :PathIsRelativeW
+    private_class_method :PathIsRootW, :PathIsUNCW, :PathIsURLW, :PathRemoveBackslashW
+    private_class_method :PathStripToRootW, :PathUndecorateW, :GetLongPathNameW, :GetShortPathNameW
   end
 
   public
 
   # The version of the pathname2 library
-  VERSION = '1.8.3'.freeze
+  VERSION = '2.0.0'.freeze
 
   # The maximum length of a path
   MAXPATH = 1024 unless defined? MAXPATH # Yes, I willfully violate POSIX
 
   # Returns the expanded path of the current working directory.
   #
-  # Synonym for Pathname.new(Dir.pwd).
+  # Synonym for Pathname2.new(Dir.pwd).
   #
   def self.pwd
     new(Dir.pwd)
@@ -110,25 +112,25 @@ class Pathname < String
     alias getwd pwd
   end
 
-  # Creates and returns a new Pathname object.
+  # Creates and returns a new Pathname2 object.
   #
   # On platforms that define File::ALT_SEPARATOR, all forward slashes are
   # replaced with the value of File::ALT_SEPARATOR. On MS Windows, for
   # example, all forward slashes are replaced with backslashes.
   #
-  # File URL's will be converted to Pathname objects, e.g. the file URL
+  # File URL's will be converted to Pathname2 objects, e.g. the file URL
   # "file:///C:/Documents%20and%20Settings" will become 'C:\Documents and Settings'.
   #
   # Examples:
   #
-  #   Pathname.new("/foo/bar/baz")
-  #   Pathname.new("foo")
-  #   Pathname.new("file:///foo/bar/baz")
-  #   Pathname.new("C:\\Documents and Settings\\snoopy")
+  #   Pathname2.new("/foo/bar/baz")
+  #   Pathname2.new("foo")
+  #   Pathname2.new("file:///foo/bar/baz")
+  #   Pathname2.new("C:\\Documents and Settings\\snoopy")
   #
   def initialize(path)
     if path.length > MAXPATH
-      msg = "string too long.  maximum string length is " + MAXPATH.to_s
+      msg = 'string too long.  maximum string length is ' + MAXPATH.to_s
       raise ArgumentError, msg
     end
 
@@ -154,8 +156,8 @@ class Pathname < String
       end
     else
       if path.index('file:///', 0)
-        require 'uri'
-        path = URI::Parser.new.unescape(path)[7..-1]
+        require 'addressable'
+        path = Addressable::URI.unescape(path)[7..-1]
       end
     end
 
@@ -167,7 +169,7 @@ 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
+  # Unlike most Pathname2 methods, this one assumes that the path actually
   # exists on your filesystem. If it doesn't, an error is raised. If a
   # circular symlink is encountered a system error will be raised.
   #
@@ -175,15 +177,15 @@ class Pathname < String
   #
   #    Dir.pwd                      # => /usr/local
   #    File.exists?('foo')          # => true
-  #    Pathname.new('foo').realpath # => /usr/local/foo
+  #    Pathname2.new('foo').realpath # => /usr/local/foo
   #
   def realpath
     File.stat(self) # Check to ensure that the path exists
 
     if File.symlink?(self)
-      file = self.dup
+      file = dup
 
-      while true
+      loop do
         file = File.join(File.dirname(file), File.readlink(file))
         break unless File.symlink?(file)
       end
@@ -195,7 +197,7 @@ class Pathname < String
   end
 
   # Returns the children of the directory, files and subdirectories, as an
-  # array of Pathname objects. If you set +with_directory+ to +false+, then
+  # array of Pathname2 objects. If you set +with_directory+ to +false+, then
   # the returned pathnames will contain the filename only.
   #
   # Note that the result never contain the entries '.' and '..' in the
@@ -204,21 +206,21 @@ class Pathname < String
   #
   # Example:
   #
-  # path = Pathname.new('/usr/bin')
+  # path = Pathname2.new('/usr/bin')
   # path.children        # => ['/usr/bin/ruby', '/usr/bin/perl', ...]
   # path.children(false) # => ['ruby', 'perl', ...]
   #
   def children(with_directory = true)
     with_directory = false if self == '.'
     result = []
-    Dir.foreach(self) { |file|
+    Dir.foreach(self) do |file|
       next if file == '.' || file == '..'
       if with_directory
         result << self.class.new(File.join(self, file))
       else
         result << self.class.new(file)
       end
-    }
+    end
     result
   end
 
@@ -228,15 +230,15 @@ class Pathname < String
   #
   # Example:
   #
-  # path = Pathname.new('C:\Path\File[5].txt')
+  # path = Pathname2.new('C:\Path\File[5].txt')
   # path.undecorate # => C:\Path\File.txt.
   #
   def undecorate
     unless @win
-      raise NotImplementedError, "not supported on this platform"
+      raise NotImplementedError, 'not supported on this platform'
     end
 
-    wpath = FFI::MemoryPointer.from_string(self.wincode)
+    wpath = FFI::MemoryPointer.from_string(wincode)
 
     PathUndecorateW(wpath)
 
@@ -245,10 +247,10 @@ class Pathname < String
 
   # Windows only
   #
-  # Performs the substitution of Pathname#undecorate in place.
+  # Performs the substitution of Pathname2#undecorate in place.
   #
   def undecorate!
-    self.replace(undecorate)
+    replace(undecorate)
   end
 
   # Windows only
@@ -257,14 +259,14 @@ class Pathname < String
   #
   # Example:
   #
-  #    path = Pathname.new('C:\Program Files\Java')
+  #    path = Pathname2.new('C:\Program Files\Java')
   #    path.short_path # => C:\Progra~1\Java.
   #
   def short_path
-    raise NotImplementedError, "not supported on this platform" unless @win
+    raise NotImplementedError, 'not supported on this platform' unless @win
 
     buf = FFI::MemoryPointer.new(:char, MAXPATH)
-    wpath = self.wincode
+    wpath = wincode
 
     size = GetShortPathNameW(wpath, buf, buf.size)
 
@@ -279,14 +281,14 @@ class Pathname < String
   #
   # Example:
   #
-  #    path = Pathname.new('C:\Progra~1\Java')
+  #    path = Pathname2.new('C:\Progra~1\Java')
   #    path.long_path # => C:\Program Files\Java.
   #
   def long_path
-    raise NotImplementedError, "not supported on this platform" unless @win
+    raise NotImplementedError, 'not supported on this platform' unless @win
 
     buf = FFI::MemoryPointer.new(:char, MAXPATH)
-    wpath = self.wincode
+    wpath = wincode
 
     size = GetLongPathNameW(wpath, buf, buf.size)
 
@@ -299,14 +301,14 @@ class Pathname < String
   #
   # Example:
   #
-  #    path = Pathname.new('/usr/local/')
+  #    path = Pathname2.new('/usr/local/')
   #    path.pstrip # => '/usr/local'
   #
   def pstrip
-    str = self.dup
+    str = dup
     return str if str.empty?
 
-    while ["/", "\\"].include?(str.to_s[-1].chr)
+    while [File::SEPARATOR, File::ALT_SEPARATOR].include?(str.to_s[-1].chr)
       str.strip!
       str.chop!
     end
@@ -314,18 +316,18 @@ class Pathname < String
     self.class.new(str)
   end
 
-  # Performs the substitution of Pathname#pstrip in place.
+  # Performs the substitution of Pathname2#pstrip in place.
   #
   def pstrip!
-    self.replace(pstrip)
+    replace(pstrip)
   end
 
   # Splits a pathname into strings based on the path separator.
   #
   # Examples:
   #
-  #    Pathname.new('/usr/local/bin').to_a # => ['usr', 'local', 'bin']
-  #    Pathname.new('C:\WINNT\Fonts').to_a # => ['C:', 'WINNT', 'Fonts']
+  #    Pathname2.new('/usr/local/bin').to_a # => ['usr', 'local', 'bin']
+  #    Pathname2.new('C:\WINNT\Fonts').to_a # => ['C:', 'WINNT', 'Fonts']
   #
   def to_a
     # Split string by path separator
@@ -334,7 +336,7 @@ class Pathname < String
     else
       array = split(@sep)
     end
-    array.delete("")    # Remove empty elements
+    array.delete('')    # Remove empty elements
     array
   end
 
@@ -342,7 +344,7 @@ class Pathname < String
   #
   # Example:
   #
-  #    Pathname.new('/usr/local/bin').each{ |element|
+  #    Pathname2.new('/usr/local/bin').each{ |element|
   #       puts "Element: #{element}"
   #    }
   #
@@ -360,13 +362,13 @@ class Pathname < String
   #
   # Examples:
   #
-  #    path = Pathname.new('/home/john/source/ruby')
+  #    path = Pathname2.new('/home/john/source/ruby')
   #    path[0]    # => 'home'
   #    path[1]    # => 'john'
   #    path[0, 3] # => '/home/john/source'
   #    path[0..1] # => '/home/john'
   #
-  #    path = Pathname.new('C:/Documents and Settings/John/Source/Ruby')
+  #    path = Pathname2.new('C:/Documents and Settings/John/Source/Ruby')
   #    path[0]    # => 'C:\'
   #    path[1]    # => 'Documents and Settings'
   #    path[0, 3] # => 'C:\Documents and Settings\John'
@@ -385,22 +387,22 @@ class Pathname < String
       end
       path = File.join(to_a[index])
     else
-      raise TypeError, "Only Numerics and Ranges allowed as first argument"
+      raise TypeError, 'Only Numerics and Ranges allowed as first argument'
     end
 
     if path && @win
-      path = path.tr("/", "\\")
+      path = path.tr(File::SEPARATOR, File::ALT_SEPARATOR)
     end
 
     path
   end
 
   # Yields each component of the path, concatenating the next component on
-  # each iteration as a new Pathname object, starting with the root path.
+  # each iteration as a new Pathname2 object, starting with the root path.
   #
   # Example:
   #
-  #    path = Pathname.new('/usr/local/bin')
+  #    path = Pathname2.new('/usr/local/bin')
   #
   #    path.descend{ |name|
   #       puts name
@@ -418,9 +420,9 @@ class Pathname < String
     end
 
     if @win
-      path = unc? ? "#{root}\\" : ""
+      path = unc? ? "#{root}\\" : ''
     else
-      path = absolute? ? root : ""
+      path = absolute? ? root : ''
     end
 
     # Yield the root directory if an absolute path (and not Windows)
@@ -428,21 +430,21 @@ class Pathname < String
       yield root if absolute?
     end
 
-    each{ |element|
+    each do |element|
       if @win && unc?
         next if root.to_a.include?(element)
       end
       path << element << @sep
       yield self.class.new(path.chop)
-    }
+    end
   end
 
   # Yields the path, minus one component on each iteration, as a new
-  # Pathname object, ending with the root path.
+  # Pathname2 object, ending with the root path.
   #
   # Example:
   #
-  #    path = Pathname.new('/usr/local/bin')
+  #    path = Pathname2.new('/usr/local/bin')
   #
   #    path.ascend{ |name|
   #       puts name
@@ -497,24 +499,24 @@ class Pathname < String
   #
   # Examples:
   #
-  #    Pathname.new('/usr/local').root       # => '/'
-  #    Pathname.new('lib').root              # => '.'
+  #    Pathname2.new('/usr/local').root       # => '/'
+  #    Pathname2.new('lib').root              # => '.'
   #
   #    On MS Windows:
   #
-  #    Pathname.new('C:\WINNT').root         # => 'C:'
-  #    Pathname.new('\\some\share\foo').root # => '\\some\share'
+  #    Pathname2.new('C:\WINNT').root         # => 'C:'
+  #    Pathname2.new('\\some\share\foo').root # => '\\some\share'
   #
   def root
-    dir = "."
+    dir = '.'
 
     if @win
-      wpath = FFI::MemoryPointer.from_string(self.wincode)
+      wpath = FFI::MemoryPointer.from_string(wincode)
       if PathStripToRootW(wpath)
         dir = wpath.read_string(wpath.size).split("\000\000").first.tr(0.chr, '')
       end
     else
-      dir = "/" if self =~ /^\//
+      dir = '/' if self =~ /^\//
     end
 
     self.class.new(dir)
@@ -524,12 +526,12 @@ class Pathname < String
   #
   # Examples:
   #
-  #   Pathname.new('/').root?    # => true
-  #   Pathname.new('/foo').root? # => false
+  #   Pathname2.new('/').root?    # => true
+  #   Pathname2.new('/foo').root? # => false
   #
   def root?
     if @win
-      PathIsRootW(self.wincode)
+      PathIsRootW(wincode)
     else
       self == root
     end
@@ -542,12 +544,12 @@ class Pathname < String
   #
   # Examples:
   #
-  #    Pathname.new("\\\\foo\\bar").unc?     # => true
-  #    Pathname.new('C:\Program Files').unc? # => false
+  #    Pathname2.new("\\\\foo\\bar").unc?     # => true
+  #    Pathname2.new('C:\Program Files').unc? # => false
   #
   def unc?
-    raise NotImplementedError, "not supported on this platform" unless @win
-    PathIsUNCW(self.wincode)
+    raise NotImplementedError, 'not supported on this platform' unless @win
+    PathIsUNCW(wincode)
   end
 
   # MS Windows only
@@ -557,31 +559,32 @@ class Pathname < String
   #
   # Example:
   #
-  #    Pathname.new("C:\\foo").drive_number # => 2
+  #    Pathname2.new("C:\\foo").drive_number # => 2
   #
   def drive_number
     unless @win
-      raise NotImplementedError, "not supported on this platform"
+      raise NotImplementedError, 'not supported on this platform'
     end
 
-    num = PathGetDriveNumberW(self.wincode)
+    num = PathGetDriveNumberW(wincode)
     num >= 0 ? num : nil
   end
 
-  # Compares two Pathname objects.  Note that Pathnames may only be compared
-  # against other Pathnames, not strings. Otherwise nil is returned.
+  # Compares two Pathname2 objects. Note that Pathname2 objects may only be
+  # compared against other Pathname2 objects, not strings, otherwise nil is
+  # returned.
   #
   # Example:
   #
-  #    path1 = Pathname.new('/usr/local')
-  #    path2 = Pathname.new('/usr/local')
-  #    path3 = Pathname.new('/usr/local/bin')
+  #    path1 = Pathname2.new('/usr/local')
+  #    path2 = Pathname2.new('/usr/local')
+  #    path3 = Pathname2.new('/usr/local/bin')
   #
   #    path1 <=> path2 # => 0
   #    path1 <=> path3 # => -1
   #
   def <=>(string)
-    return nil unless string.kind_of?(Pathname)
+    return nil unless string.is_a?(Pathname2)
     super
   end
 
@@ -589,11 +592,11 @@ class Pathname < String
   #
   # Example:
   #
-  #    Pathname.new('/usr/local/bin').parent # => '/usr/local'
+  #    Pathname2.new('/usr/local/bin').parent # => '/usr/local'
   #
   def parent
     return self if root?
-    self + ".." # Use our custom '+' method
+    self + '..' # Use our custom '+' method
   end
 
   # Returns a relative path from the argument to the receiver. If +self+
@@ -609,23 +612,23 @@ class Pathname < String
   #
   # Examples:
   #
-  #    path = Pathname.new('/usr/local/bin')
+  #    path = Pathname2.new('/usr/local/bin')
   #    path.relative_path_from('/usr/bin') # => "../local/bin"
   #
-  #    path = Pathname.new("C:\\WINNT\\Fonts")
+  #    path = Pathname2.new("C:\\WINNT\\Fonts")
   #    path.relative_path_from("C:\\Program Files") # => "..\\WINNT\\Fonts"
   #
   def relative_path_from(base)
-    base = self.class.new(base) unless base.kind_of?(Pathname)
+    base = self.class.new(base) unless base.is_a?(Pathname2)
 
-    if self.absolute? != base.absolute?
-      raise ArgumentError, "relative path between absolute and relative path"
+    if absolute? != base.absolute?
+      raise ArgumentError, 'relative path between absolute and relative path'
     end
 
-    return self.class.new(".") if self == base
-    return self if base == "."
+    return self.class.new('.') if self == base
+    return self if base == '.'
 
-    # Because of the way the Windows version handles Pathname#clean, we need
+    # Because of the way the Windows version handles Pathname2#clean, we need
     # a little extra help here.
     if @win
       if root != base.root
@@ -637,7 +640,7 @@ class Pathname < String
       end
     end
 
-    dest_arr = self.clean.to_a
+    dest_arr = clean.to_a
     base_arr = base.clean.to_a
     dest_arr.delete('.')
     base_arr.delete('.')
@@ -649,22 +652,22 @@ class Pathname < String
       dest_arr.shift
     end
 
-    if base_arr.include?("..")
+    if base_arr.include?('..')
       raise ArgumentError, "base directory may not contain '..'"
     end
 
-    base_arr.fill("..")
+    base_arr.fill('..')
     rel_path = base_arr + dest_arr
 
     if rel_path.empty?
-      self.class.new(".")
+      self.class.new('.')
     else
       self.class.new(rel_path.join(@sep))
     end
   end
 
-  # Adds two Pathname objects together, or a Pathname and a String. It
-  # also automatically cleans the Pathname.
+  # Adds two Pathname2 objects together, or a Pathname2 and a String. It
+  # also automatically cleans the Pathname2.
   #
   # Adding a root path to an existing path merely replaces the current
   # path. Adding '.' to an existing path does nothing.
@@ -676,18 +679,18 @@ class Pathname < String
   #    path1 + path2 # '/foo/baz'
   #
   def +(string)
-    unless string.kind_of?(Pathname)
+    unless string.is_a?(Pathname2)
       string = self.class.new(string)
     end
 
     # Any path plus "." is the same directory
-    return self if string == "."
-    return string if self == "."
+    return self if string == '.'
+    return string if self == '.'
 
     # Use the builtin PathAppend() function if on Windows - much easier
     if @win
       path = FFI::MemoryPointer.new(:char, MAXPATH)
-      path.write_string(self.dup.wincode)
+      path.write_string(dup.wincode)
       more = FFI::MemoryPointer.from_string(string.wincode)
 
       PathAppendW(path, more)
@@ -711,14 +714,14 @@ class Pathname < String
     self.class.new(new_string).clean
   end
 
-  alias :/ :+
+  alias / +
 
   # Returns whether or not the path is an absolute path.
   #
   # Example:
   #
-  #    Pathname.new('/usr/bin').absolute? # => true
-  #    Pathname.new('usr').absolute?      # => false
+  #    Pathname2.new('/usr/bin').absolute? # => true
+  #    Pathname2.new('usr').absolute?      # => false
   #
   def absolute?
     !relative?
@@ -728,14 +731,14 @@ class Pathname < String
   #
   # Example:
   #
-  #    Pathname.new('/usr/bin').relative? # => true
-  #    Pathname.new('usr').relative?      # => false
+  #    Pathname2.new('/usr/bin').relative? # => true
+  #    Pathname2.new('usr').relative?      # => false
   #
   def relative?
     if @win
-      PathIsRelativeW(self.wincode)
+      PathIsRelativeW(wincode)
     else
-      root == "."
+      root == '.'
     end
   end
 
@@ -744,15 +747,15 @@ class Pathname < String
   #
   # Example:
   #
-  #    path = Pathname.new('/usr/./local/../bin')
+  #    path = Pathname2.new('/usr/./local/../bin')
   #    path.clean # => '/usr/bin'
   #
   def clean
-    return self if self.empty?
+    return self if empty?
 
     if @win
       ptr = FFI::MemoryPointer.new(:char, MAXPATH)
-      if PathCanonicalizeW(ptr, self.wincode)
+      if PathCanonicalizeW(ptr, wincode)
         return self.class.new(ptr.read_string(ptr.size).delete(0.chr))
       else
         return self
@@ -761,28 +764,28 @@ class Pathname < String
 
     final = []
 
-    to_a.each{ |element|
-      next if element == "."
+    to_a.each do |element|
+      next if element == '.'
       final.push(element)
-      if element == ".." && self != ".."
+      if element == '..' && self != '..'
         2.times{ final.pop }
       end
-    }
+    end
 
     final = final.join(@sep)
-    final = root._plus_(final) if root != "."
-    final = "." if final.empty?
+    final = root._plus_(final) if root != '.'
+    final = '.' if final.empty?
 
     self.class.new(final)
   end
 
-  alias :cleanpath :clean
+  alias cleanpath clean
 
-  # Identical to Pathname#clean, except that it modifies the receiver
+  # Identical to Pathname2#clean, except that it modifies the receiver
   # in place.
   #
   def clean!
-    self.replace(clean)
+    replace(clean)
   end
 
   alias cleanpath! clean!
@@ -798,7 +801,7 @@ class Pathname < String
   #
   # Example:
   #
-  #    path = Pathname.new('/usr/local/bin/ruby')
+  #    path = Pathname2.new('/usr/local/bin/ruby')
   #
   #    puts path.dirname    # => /usr/local/bin
   #    puts path.dirname(2) # => /usr/local
@@ -807,15 +810,15 @@ class Pathname < String
   #
   def dirname(level = 1)
     raise ArgumentError if level < 0
-    local_path = self.dup
+    local_path = dup
 
-    level.times{ |n| local_path = File.dirname(local_path) }
+    level.times{ local_path = File.dirname(local_path) }
     self.class.new(local_path)
   end
 
-  # Joins the given pathnames onto +self+ to create a new Pathname object.
+  # Joins the given pathnames onto +self+ to create a new Pathname2 object.
   #
-  #  path = Pathname.new("C:/Users")
+  #  path = Pathname2.new("C:/Users")
   #  path = path.join("foo", "Downloads") # => C:/Users/foo/Downloads
   #
   def join(*args)
@@ -824,11 +827,11 @@ class Pathname < String
     result = self.class.new(result) unless result === self.class
     return result if result.absolute?
 
-    args.reverse_each{ |path|
+    args.reverse_each do |path|
       path = self.class.new(path) unless path === self.class
       result = path + result
       break if result.absolute?
-    }
+    end
 
     result
   end
@@ -836,17 +839,17 @@ class Pathname < String
   # A custom pretty printer
   def pretty_print(q)
     if File::ALT_SEPARATOR
-      q.text(self.to_s.tr(File::SEPARATOR, File::ALT_SEPARATOR))
+      q.text(to_s.tr(File::SEPARATOR, File::ALT_SEPARATOR))
     else
-      q.text(self.to_s)
+      q.text(to_s)
     end
   end
 
   #-- Find facade
 
-  # Pathname#find is an iterator to traverse a directory tree in a depth first
-  # manner. It yields a Pathname for each file under the directory passed to
-  # Pathname.new.
+  # Pathname2#find is an iterator to traverse a directory tree in a depth first
+  # manner. It yields a Pathname2 for each file under the directory passed to
+  # Pathname2.new.
   #
   # Since it is implemented by the Find module, Find.prune can be used to
   # control the traverse.
@@ -854,9 +857,9 @@ class Pathname < String
   # If +self+ is ".", yielded pathnames begin with a filename in the current
   # current directory, not ".".
   #
-  def find(&block)
-    require "find"
-    if self == "."
+  def find
+    require 'find'
+    if self == '.'
       Find.find(self){ |f| yield self.class.new(f.sub(%r{\A\./}, '')) }
     else
       Find.find(self){ |f| yield self.class.new(f) }
@@ -867,17 +870,17 @@ class Pathname < String
 
   # IO.foreach
   def foreach(*args, &block)
-    IO.foreach(self, *args, &block)
+    File.foreach(self, *args, &block)
   end
 
   # IO.read
   def read(*args)
-    IO.read(self, *args)
+    File.read(self, *args)
   end
 
   # IO.readlines
   def readlines(*args)
-    IO.readlines(self, *args)
+    File.readlines(self, *args)
   end
 
   # IO.sysopen
@@ -894,13 +897,13 @@ class Pathname < String
   # chdir to the path in question, then performs the glob.
   #
   def glob(*args)
-    Dir.chdir(self){
+    Dir.chdir(self) do
       if block_given?
         Dir.glob(*args){ |file| yield self.class.new(file) }
       else
         Dir.glob(*args).map{ |file| self.class.new(file) }
       end
-    }
+    end
   end
 
   # Dir.chdir
@@ -1042,7 +1045,7 @@ class Pathname < String
     FileUtils.mv(self, *args)
   end
 
-   # FileUtils.rm
+  # FileUtils.rm
   def rm(*args)
     FileUtils.rm(self, *args)
   end
@@ -1110,31 +1113,26 @@ class Pathname < String
   end
 end
 
+# Re-open the Kernel module to add some global methods.
 module Kernel
   # Usage: pn{ path }
   #
-  # A shortcut for Pathname.new
+  # A shortcut for Pathname2.new
   #
   def pn
-    instance_eval{ Pathname.new(yield) }
-  end
-
-  begin
-    remove_method(:Pathname)
-  rescue NoMethodError, NameError
-    # Do nothing, not defined.
+    instance_eval{ Pathname2.new(yield) }
   end
 
-  # Synonym for Pathname.new
+  # Synonym for Pathname2.new
   #
-  def Pathname(path)
-    Pathname.new(path)
+  def Pathname2(path)
+    Pathname2.new(path)
   end
 end
 
 class String
   # Convert a string directly into a Pathname object.
   def to_path
-    Pathname.new(self)
+    Pathname2.new(self)
   end
 end