file-find 0.3.4 → 0.3.5

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.3.5 - 15-Jul-2011
+* Fixed a bug with the :follow option.
+* Gemspec, Rakefile and test cleanup.
+
 == 0.3.4 - 19-Sep-2009
 * Fixed a packaging bug. Thanks go to Gabriel Horner for the spot.
 * Added the 'gem' task to the Rakefile for building the gem. Removed the

data/README

@@ -1,108 +1,110 @@
 = Description
-This is a drop-in replacement for the find module currently in the standard
-library. It is modeled on a typical 'find' command found on most Unix systems.
+  This is a drop-in replacement for the find module currently in the standard
+  library. It is modeled on a typical 'find' command found on most Unix systems.
 
 = Synopsis
-   rule = File::Find.new(
-      :pattern => "*.rb",
-      :follow  => false,
-      :path    => ['/usr/local/lib', '/opt/local/lib']
-   )
+  require 'file/find'
 
-   rule.find{ |f|
-      puts f
-   }
+  rule = File::Find.new(
+    :pattern => "*.rb",
+    :follow  => false,
+    :path    => ['/usr/local/lib', '/opt/local/lib']
+  )
+
+  rule.find{ |f|
+    puts f
+  }
 
 = Installation
-* rake test (optional)
-* rake install (non-gem) -OR- rake install_gem (gem)
+
+  gem install file-find
 
 = Rationale
-The current find module in the standard library is inadequate. It is, quite
-frankly, not much more than a plain Dir.glob call. This library provides an
-interface based on options typically available on your command line 'find'
-command, thus allowing you much greater control over how you find your files.
 
-I am aware of the find2 library by Motoyuki Kasahara, but it supports very
-few options, hasn't been updated in over six years and isn't packaged properly.
+  The current find module in the standard library is inadequate. It is, quite
+  frankly, not much more than a plain Dir.glob call. This library provides an
+  interface based on options typically available on your command line 'find'
+  command, thus allowing you much greater control over how you find your files.
 
 = Options
-* atime
-* ctime
-* follow
-* ftype
-* inum (except Windows)
-* group (name or id)
-* maxdepth
-* mindepth
-* mount
-* mtime
-* name (or 'pattern')
-* path
-* perm (except Windows)
-* prune
-* size
-* user (name or id)
-
-In addition to the above options, FileTest methods such as 'readable?' and
-'writable?' may be used as keys, with true or false for their values.
-
-See the RDoc documentation for more details about these options.
+  * atime
+  * ctime
+  * follow
+  * ftype
+  * inum (except Windows)
+  * group (name or id)
+  * maxdepth
+  * mindepth
+  * mount
+  * mtime
+  * name (or 'pattern')
+  * path
+  * perm (except Windows)
+  * prune
+  * size
+  * user (name or id)
+
+  In addition to the above options, FileTest methods such as 'readable?' and
+  'writable?' may be used as keys, with true or false for their values.
+
+  See the RDoc documentation for more details about these options.
 
 = Future Plans
-More options will be added as time permits, and requests will definitely be
-considered. Please log any feature requests on the project page at
-http://www.rubyforge.org/projects/shards.
+  More options will be added as time permits, and requests will definitely be
+  considered. Please log any feature requests on the project page at
+  http://www.rubyforge.org/projects/shards.
 
-Some specific things I plan on adding:
+  Some specific things I plan on adding:
 
-* exec
-* links
-* support for :user and :group on MS Windows
+  * exec
+  * links
+  * support for :user and :group on MS Windows
 
 = Options I won't support
-Generally speaking, anything that would require mucking around with C code
-or is just too difficult to implement in a cross platform manner will not be
-supported. These include the following options:
+  Generally speaking, anything that would require mucking around with C code
+  or is just too difficult to implement in a cross platform manner will not be
+  supported. These include the following options:
 
-* acl/xattr - Way too difficult to implement in a cross platform manner, and
-  a rarely used option in practice.
+  * acl/xattr - Way too difficult to implement in a cross platform manner, and
+    a rarely used option in practice.
 
-* cpio/ncpio - I will not shell out to this or any other 3rd party application.
+  * cpio/ncpio - I will not shell out to this or any other 3rd party
+    application.
 
-* ls/print - Use Ruby's builtin printing methods to print as you see fit.
+  * ls/print - Use Ruby's builtin printing methods to print as you see fit.
 
-* ok - This is not interactive software.
+  * ok - This is not interactive software.
 
 = Known Issues
-The 'perm' option does not work on MS Windows, even for its limited subset of
-permissions, i.e. 664 and 666. This is arguably a bug in Ruby's
-File::Stat.mode method on MS Windows.
+  The 'perm' option does not work on MS Windows, even for its limited subset of
+  permissions, i.e. 664 and 666. This is arguably a bug in Ruby's
+  File::Stat.mode method on MS Windows.
 
-The 'user' and 'group' options are not currently supported on MS Windows.
-This can be supported, but will require changes in the win32-file and
-win32-file-stat libraries (which would then become dependencies).
+  The 'user' and 'group' options are not currently supported on MS Windows.
+  This can be supported, but will require changes in the win32-file and
+  win32-file-stat libraries (which would then become dependencies).
 
-There are 3 test failures with JRuby, all related to the 'perm' option. I
-have not been able to reduce them to a simple test case and discern the
-exact cause of the failures, though I suspect a bug in the JRuby
-implementation of File.chmod.
+  There are 3 test failures with JRuby, all related to the 'perm' option. I
+  have not been able to reduce them to a simple test case and discern the
+  exact cause of the failures, though I suspect a bug in the JRuby
+  implementation of File.chmod.
 
 = Bugs
-None that I'm aware of. Please log any bug reports on the project page at
-http://www.rubyforge.org/projects/shards.
+  None that I'm aware of beyond the ones mentioned in the Known Issues. Please
+  log any bug reports on the project page at
+  http://www.rubyforge.org/projects/shards.
 
 = Acknowledgements
-* Richard Clamp's File::Find::Rule Perl module for additional ideas and
-  inspiration.
-* Bill Kleb for ideas regarding name, group and perm enhancements.
-* Hal Fulton for his implementation of symbolic permissions.
+  * Richard Clamp's File::Find::Rule Perl module for additional ideas and
+    inspiration.
+  * Bill Kleb for ideas regarding name, group and perm enhancements.
+  * Hal Fulton for his implementation of symbolic permissions.
 
 = License
-Artistic 2.0
+  Artistic 2.0
 
 = Copyright
-(C) 2007-2009, Daniel J. Berger, All Rights Reserved
+  (C) 2007-2011, Daniel J. Berger, All Rights Reserved
 
 = Author
-Daniel J. Berger
+  Daniel J. Berger

data/Rakefile

@@ -1,46 +1,34 @@
 require 'rake'
+require 'rake/clean'
 require 'rake/testtask'
 
-desc "Cleanup .test-result files if present"
-task :clean do
-   rm_rf '.test-result' if File.exists?('.test-result')
+CLEAN.include("**/*.gem", "**/*.rbc", "**/link*")
 
-   Dir.foreach(Dir.pwd){ |file|
-      if File.directory?(file)
-         Dir.chdir(file){
-            rm_rf '.test-result' if File.exists?('.test-result')
-         }
-      end
-   }
-end
-
-desc "Install the file-find library (non-gem)"
-task :install do
-   dest = File.join(Config::CONFIG['sitelibdir'], 'file')
-   Dir.mkdir(dest) unless File.exists? dest
-   cp 'lib/file/find.rb', dest, :verbose => true
-end
-
-desc "Install the file-find library as a gem"
-task :install_gem do
-   ruby 'file-find.gemspec'
-   file = Dir["*.gem"].first
-   sh "gem install #{file}"
-end
-
-desc 'Create a gem'
-task :gem do
-   spec = eval(IO.read('file-find.gemspec'))
-   if RUBY_PLATFORM.match('java')
+namespace :gem do
+  desc 'Create the file-find gem'
+  task :create => [:clean] do
+    spec = eval(IO.read('file-find.gemspec'))
+    if RUBY_PLATFORM.match('java')
       spec.platform = Gem::Platform::CURRENT
-   else
+    else
       spec.add_dependency('sys-admin', '>= 1.5.2')
-   end   
+    end   
 
-   Gem::Builder.new(spec).build
+    Gem::Builder.new(spec).build
+  end
+
+  desc "Install the file-find gem"
+  task :install => [:create] do
+    ruby 'file-find.gemspec'
+    file = Dir["*.gem"].first
+    sh "gem install #{file}"
+  end
 end
 
 Rake::TestTask.new do |t|
-   t.warning = true
-   t.verbose = true
+  task :test => 'clean'
+  t.warning = true
+  t.verbose = true
 end
+
+task :default => :test

data/file-find.gemspec

@@ -1,27 +1,26 @@
 require 'rubygems'
 
-Gem::Specification.new do |gem|
-   gem.name      = 'file-find'
-   gem.version   = '0.3.4'
-   gem.author    = 'Daniel Berger'
-   gem.license   = 'Artistic 2.0'
-   gem.summary   = 'A better way to find files'
-   gem.email     = 'djberg96@gmail.com'
-   gem.homepage  = 'http://www.rubyforge.org/projects/shards'
-   gem.platform  = Gem::Platform::RUBY
-   gem.files     = Dir['**/*'].reject{ |f| f.include?('CVS') }
-   gem.test_file = 'test/test_file_find.rb'
-   gem.has_rdoc  = true
+Gem::Specification.new do |spec|
+  spec.name      = 'file-find'
+  spec.version   = '0.3.5'
+  spec.author    = 'Daniel Berger'
+  spec.license   = 'Artistic 2.0'
+  spec.summary   = 'A better way to find files'
+  spec.email     = 'djberg96@gmail.com'
+  spec.homepage  = 'http://www.rubyforge.org/projects/shards'
+  spec.platform  = Gem::Platform::RUBY
+  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.test_file = 'test/test_file_find.rb'
 
-   gem.rubyforge_project = 'shards'
-   gem.extra_rdoc_files = ['README', 'CHANGES', 'MANIFEST']
+  spec.rubyforge_project = 'shards'
+  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
 
-   gem.add_development_dependency('test-unit', '>= 2.0.3')
+  spec.add_development_dependency('test-unit', '>= 2.1.1')
 
-   gem.description = <<-EOF
-      The file-find library provides a better, more object oriented approach
-      to finding files. It allows you to find files based on a variety of
-      properties, such as access time, size, owner, etc. You can also limit
-      directory depth.
-   EOF
+  spec.description = <<-EOF
+    The file-find library provides a better, more object oriented approach
+    to finding files. It allows you to find files based on a variety of
+    properties, such as access time, size, owner, etc. You can also limit
+    directory depth.
+  EOF
 end

data/lib/file/find.rb

@@ -4,501 +4,501 @@ require 'rbconfig'
 # For alternate implementations of Ruby, such as JRuby, that cannot
 # build C extensions fall back to the Etc module.
 begin
-   require 'sys/admin'
+  require 'sys/admin'
 rescue LoadError
-   require 'etc'
+  require 'etc'
 end
 
 class File::Find
-   # The version of the file-find library
-   VERSION = '0.3.4'
-
-   # :stopdoc:
-   VALID_OPTIONS = %w/
-      atime
-      ctime
-      follow
-      ftype
-      inum
-      group
-      links
-      maxdepth
-      mindepth
-      mount
-      mtime
-      name
-      pattern
-      path
-      perm
-      prune
-      size
-      user
-   /
-   # :startdoc:
-
-   # The starting path(s) for the search. The default is the current directory.
-   # This can be a single path or an array of paths.
-   #
-   attr_accessor :path
-
-   # The list of options passed to the constructor and/or used by the
-   # File::Find#find method.
-   #
-   attr_accessor :options
-
-   # Limits searches by file access time, where the value you supply is the
-   # number of days back from the time that the File::Find#find method was
-   # called.
-   #
-   attr_accessor :atime
-
-   # Limits searches by file change time, where the value you supply is the
-   # number of days back from the time that the File::Find#find method was
-   # called.
-   #
-   attr_accessor :ctime
-
-   # Limits searches to files that belong to a specific group, where the
-   # group can be either a group name or ID.
-   #
-   # Not currently supported on MS Windows.
-   #
-   attr_accessor :group
-
-   # An array of two element arrays for storing FileTest methods and their
-   # boolean value.
-   #
-   attr_accessor :filetest
-
-   # Controls the behavior of how symlinks are followed. If set to true (the
-   # default), then follows the file pointed to. If false, it considers the
-   # symlink itself.
-   #
-   attr_accessor :follow
-
-   # Limits searches to specific types of files. The possible values here are
-   # those returned by the File.ftype method.
-   #
-   attr_accessor :ftype
-
-   # Limits search to a file with a specific inode number. Ignored on MS
-   # Windows.
-   #
-   attr_accessor :inum
-
-   # Limits search to files with the specified number of links.
-   #
-   attr_accessor :links
-
-   # Limits search to a maximum depth into the tree relative to the starting
-   # search directory.
-   #
-   attr_accessor :maxdepth
-
-   # Limits searches to a minimum depth into the tree relative to the starting
-   # search directory.
-   #
-   attr_accessor :mindepth
-
-   # Limits searches to the same filesystem as the specified directory. For
-   # Windows users, this refers to the volume.
-   #
-   attr_reader :mount
-
-   # Limits searches by file modification time, where the value you supply is
-   # the number of days back from the time that the File::Find#find method was
-   # called.
-   #
-   attr_accessor :mtime
-
-   # The name pattern used to limit file searches. The patterns that are legal
-   # for Dir.glob are legal here. The default is '*', i.e. everything.
-   #
-   attr_accessor :name
-
-   # Limits searches to files which have permissions that match the octal
-   # value that you provide. For purposes of this comparison, only the user,
-   # group, and world settings are used. Do not use a leading 0 in the values
-   # that you supply, e.g. use 755 not 0755.
-   #
-   # You may optionally use symbolic permissions, e.g. "g+rw", "u=rwx", etc.
-   #
-   # Not currently supported on MS Windows.
-   #
-   attr_accessor :perm
-
-   # Skips files or directories that match the string provided as an argument.
-   #
-   attr_accessor :prune
-
-   # If the value passed is an integer, this option limits searches to files
-   # that match the size, in bytes, exactly. If a string is passed, you can
-   # use the standard comparable operators to match files, e.g. ">= 200" would
-   # limit searches to files greater than or equal to 200 bytes.
-   #
-   attr_accessor :size
-
-   # Limits searches to files that belong to a specific user, where the user
-   # can be either a user name or an ID.
-   #
-   # Not currently supported on MS Windows.
-   #
-   attr_accessor :user
-
-   # The file that matched previously in the current search.
-   #
-   attr_reader :previous
-
-   alias pattern name
-   alias pattern= name=
-
-   # Creates and returns a new File::Find object. The options set for this
-   # object serve as the rules for determining what files the File::Find#find
-   # method will search for.
-   #
-   # In addition to the standard list of valid options, you may also use
-   # FileTest methods as options, setting their value to true or false.
-   #
-   # Example:
-   #
-   #    rule = File::Find.new(
-   #       :name      => "*.rb",
-   #       :follow    => false,
-   #       :path      => ['/usr/local/lib', '/opt/local/lib'],
-   #       :readable? => true
-   #    )
-   #
-   def initialize(options = {})
-      @options = options      
-
-      @atime  = nil
-      @ctime  = nil
-      @ftype  = nil
-      @group  = nil
-      @follow = true
-      @inum   = nil
-      @links  = nil
-      @mount  = nil
-      @mtime  = nil
-      @perm   = nil
-      @prune  = nil
-      @size   = nil
-      @user   = nil
-
-      @previous = nil
-      @maxdepth = nil
-      @mindepth = nil
-      @filetest = []
-
-      validate_and_set_options(options) unless options.empty?
-
-      @filesystem = File.stat(@mount).dev if @mount
-
-      @path ||= Dir.pwd
-      @name ||= '*'
-   end
-
-   # Executes the find based on the rules you set for the File::Find object.
-   # In block form, yields each file in turn that matches the specified rules.
-   # In non-block form it will return an array of matches instead.
-   #
-   # Example:
-   #
-   #   rule = File::Find.new(
-   #      :name    => "*.rb",
-   #      :follow  => false,
-   #      :path    => ['/usr/local/lib', '/opt/local/lib']
-   #   )   
-   #
-   #   rule.find{ |f|
-   #      puts f
-   #   }    
-   #
-   def find
-      results = [] unless block_given?
-      paths   = @path.is_a?(String) ? [@path] : @path # Ruby 1.9.x compatibility
-
-      if @prune
-         prune_regex = Regexp.new(@prune)
-      else
-         prune_regex = nil
-      end
+  # The version of the file-find library
+  VERSION = '0.3.5'
+
+  # :stopdoc:
+  VALID_OPTIONS = %w/
+    atime
+    ctime
+    follow
+    ftype
+    inum
+    group
+    links
+    maxdepth
+    mindepth
+    mount
+    mtime
+    name
+    pattern
+    path
+    perm
+    prune
+    size
+    user
+  /
+  # :startdoc:
+
+  # The starting path(s) for the search. The default is the current directory.
+  # This can be a single path or an array of paths.
+  #
+  attr_accessor :path
+
+  # The list of options passed to the constructor and/or used by the
+  # File::Find#find method.
+  #
+  attr_accessor :options
+
+  # Limits searches by file access time, where the value you supply is the
+  # number of days back from the time that the File::Find#find method was
+  # called.
+  #
+  attr_accessor :atime
+
+  # Limits searches by file change time, where the value you supply is the
+  # number of days back from the time that the File::Find#find method was
+  # called.
+  #
+  attr_accessor :ctime
+
+  # Limits searches to files that belong to a specific group, where the
+  # group can be either a group name or ID.
+  #
+  # Not currently supported on MS Windows.
+  #
+  attr_accessor :group
+
+  # An array of two element arrays for storing FileTest methods and their
+  # boolean value.
+  #
+  attr_accessor :filetest
+
+  # Controls the behavior of how symlinks are followed. If set to true (the
+  # default), then follows the file pointed to. If false, it considers the
+  # symlink itself.
+  #
+  attr_accessor :follow
+
+  # Limits searches to specific types of files. The possible values here are
+  # those returned by the File.ftype method.
+  #
+  attr_accessor :ftype
+
+  # Limits search to a file with a specific inode number. Ignored on MS
+  # Windows.
+  #
+  attr_accessor :inum
+
+  # Limits search to files with the specified number of links.
+  #
+  attr_accessor :links
+
+  # Limits search to a maximum depth into the tree relative to the starting
+  # search directory.
+  #
+  attr_accessor :maxdepth
+
+  # Limits searches to a minimum depth into the tree relative to the starting
+  # search directory.
+  #
+  attr_accessor :mindepth
+
+  # Limits searches to the same filesystem as the specified directory. For
+  # Windows users, this refers to the volume.
+  #
+  attr_reader :mount
+
+  # Limits searches by file modification time, where the value you supply is
+  # the number of days back from the time that the File::Find#find method was
+  # called.
+  #
+  attr_accessor :mtime
+
+  # The name pattern used to limit file searches. The patterns that are legal
+  # for Dir.glob are legal here. The default is '*', i.e. everything.
+  #
+  attr_accessor :name
+
+  # Limits searches to files which have permissions that match the octal
+  # value that you provide. For purposes of this comparison, only the user,
+  # group, and world settings are used. Do not use a leading 0 in the values
+  # that you supply, e.g. use 755 not 0755.
+  #
+  # You may optionally use symbolic permissions, e.g. "g+rw", "u=rwx", etc.
+  #
+  # Not currently supported on MS Windows.
+  #
+  attr_accessor :perm
+
+  # Skips files or directories that match the string provided as an argument.
+  #
+  attr_accessor :prune
+
+  # If the value passed is an integer, this option limits searches to files
+  # that match the size, in bytes, exactly. If a string is passed, you can
+  # use the standard comparable operators to match files, e.g. ">= 200" would
+  # limit searches to files greater than or equal to 200 bytes.
+  #
+  attr_accessor :size
+
+  # Limits searches to files that belong to a specific user, where the user
+  # can be either a user name or an ID.
+  #
+  # Not currently supported on MS Windows.
+  #
+  attr_accessor :user
+
+  # The file that matched previously in the current search.
+  #
+  attr_reader :previous
+
+  alias pattern name
+  alias pattern= name=
+
+  # Creates and returns a new File::Find object. The options set for this
+  # object serve as the rules for determining what files the File::Find#find
+  # method will search for.
+  #
+  # In addition to the standard list of valid options, you may also use
+  # FileTest methods as options, setting their value to true or false.
+  #
+  # Example:
+  #
+  #    rule = File::Find.new(
+  #       :name      => "*.rb",
+  #       :follow    => false,
+  #       :path      => ['/usr/local/lib', '/opt/local/lib'],
+  #       :readable? => true
+  #    )
+  #
+  def initialize(options = {})
+    @options = options
+
+    @atime  = nil
+    @ctime  = nil
+    @ftype  = nil
+    @group  = nil
+    @follow = true
+    @inum   = nil
+    @links  = nil
+    @mount  = nil
+    @mtime  = nil
+    @perm   = nil
+    @prune  = nil
+    @size   = nil
+    @user   = nil
+
+    @previous = nil
+    @maxdepth = nil
+    @mindepth = nil
+    @filetest = []
+
+    validate_and_set_options(options) unless options.empty?
+
+    @filesystem = File.stat(@mount).dev if @mount
+
+    @path ||= Dir.pwd
+    @name ||= '*'
+  end
+
+  # Executes the find based on the rules you set for the File::Find object.
+  # In block form, yields each file in turn that matches the specified rules.
+  # In non-block form it will return an array of matches instead.
+  #
+  # Example:
+  #
+  #   rule = File::Find.new(
+  #      :name    => "*.rb",
+  #      :follow  => false,
+  #      :path    => ['/usr/local/lib', '/opt/local/lib']
+  #   )
+  #
+  #   rule.find{ |f|
+  #      puts f
+  #   }
+  #
+  def find
+    results = [] unless block_given?
+    paths   = @path.is_a?(String) ? [@path] : @path # Ruby 1.9.x compatibility
+
+    if @prune
+      prune_regex = Regexp.new(@prune)
+    else
+      prune_regex = nil
+    end
+
+    paths.each{ |path|
+      begin
+        Dir.foreach(path){ |file|
+          next if file == '.'
+          next if file == '..'
+
+          if prune_regex
+            next if prune_regex.match(file)
+          end
+
+          orig = file.dup
+          file = File.join(path, file)
+
+          stat_method = @follow ? :stat : :lstat
+
+          # Skip files we cannot access, stale links, etc.
+          begin
+            stat_info = File.send(stat_method, file)
+          rescue Errno::ENOENT, Errno::EACCES
+            next
+          rescue Errno::ELOOP
+            stat_method = :lstat # Handle recursive symlinks
+            retry if stat_method.to_s != 'lstat'
+          end
+
+          glob = File.join(File.dirname(file), @name)
+
+          # Dir[] doesn't like backslashes
+          if File::ALT_SEPARATOR
+            file.tr!(File::ALT_SEPARATOR, File::SEPARATOR)
+            glob.tr!(File::ALT_SEPARATOR, File::SEPARATOR)
+          end
+
+          if @mount
+            next unless stat_info.dev == @filesystem
+          end
+
+          if @links
+            next unless stat_info.nlink == @links
+          end
+
+          if @maxdepth || @mindepth
+            file_depth = file.split(File::SEPARATOR).length
+            path_depth = @path.split(File::SEPARATOR).length
+            depth = file_depth - path_depth
+
+            if @maxdepth && (depth > @maxdepth)
+              if File.directory?(file)
+                unless paths.include?(file) && depth > @maxdepth
+                  paths << file
+                end
+              end
+
+              next
+            end
+
+            if @mindepth && (depth < @mindepth)
+              if File.directory?(file)
+                unless paths.include?(file) && depth < @mindepth
+                  paths << file
+                end
+              end
+
+              next
+            end
+          end
+
+          # Add directories back onto the list of paths to search unless
+          # they've already been added
+          #
+          if stat_info.directory?
+            paths << file unless paths.include?(file)
+          end
+
+          next unless Dir[glob].include?(file)
+
+          unless @filetest.empty?
+            file_test = true
 
-      paths.each{ |path|
-         begin
-            Dir.foreach(path){ |file|
-               next if file == '.'
-               next if file == '..'
-
-               if prune_regex
-                  next if prune_regex.match(file)
-               end
-
-               orig = file.dup
-               file = File.join(path, file)
-
-               stat_method = @follow ? :lstat : :stat
-
-               # Skip files we cannot access, stale links, etc.
-               begin
-                  stat_info = File.send(stat_method, file)
-               rescue Errno::ENOENT, Errno::EACCES
-                  next
-               rescue Errno::ELOOP
-                  stat_method = :lstat # Handle recursive symlinks
-                  retry if stat_method.to_s != 'lstat'
-               end
-
-               glob = File.join(File.dirname(file), @name)
-
-               # Dir[] doesn't like backslashes
-               if File::ALT_SEPARATOR
-                  file.tr!(File::ALT_SEPARATOR, File::SEPARATOR) 
-                  glob.tr!(File::ALT_SEPARATOR, File::SEPARATOR) 
-               end
-
-               if @mount
-                  next unless stat_info.dev == @filesystem
-               end
-
-               if @links
-                  next unless stat_info.nlink == @links
-               end
-
-               if @maxdepth || @mindepth
-                  file_depth = file.split(File::SEPARATOR).length
-                  path_depth = @path.split(File::SEPARATOR).length
-                  depth = file_depth - path_depth
-
-                  if @maxdepth && (depth > @maxdepth)
-                     if File.directory?(file)
-                        unless paths.include?(file) && depth > @maxdepth
-                           paths << file
-                        end
-                     end
-
-                     next
-                  end
-
-                  if @mindepth && (depth < @mindepth)
-                     if File.directory?(file)
-                        unless paths.include?(file) && depth < @mindepth
-                           paths << file
-                        end
-                     end
-
-                     next
-                  end
-               end
-
-               # Add directories back onto the list of paths to search unless
-               # they've already been added
-               #
-               if stat_info.directory?
-                  paths << file unless paths.include?(file)
-               end
-
-               next unless Dir[glob].include?(file)
-
-               unless @filetest.empty?
-                  file_test = true
-
-                  @filetest.each{ |array|
-                     meth = array[0]
-                     bool = array[1]
-
-                     unless File.send(meth, file) == bool
-                        file_test = false
-                        break
-                     end
-                  }
-
-                  next unless file_test
-               end
-
-               if @atime || @ctime || @mtime
-                  date1 = Date.parse(Time.now.to_s)
-
-                  if @atime
-                     date2 = Date.parse(stat_info.atime.to_s)
-                     next unless (date1 - date2).numerator == @atime
-                  end
-
-                  if @ctime
-                     date2 = Date.parse(stat_info.ctime.to_s)
-                     next unless (date1 - date2).numerator == @ctime
-                  end
-
-                  if @mtime
-                     date2 = Date.parse(stat_info.mtime.to_s)
-                     next unless (date1 - date2).numerator == @mtime
-                  end
-               end
-
-               if @ftype
-                  next unless File.ftype(file) == @ftype
-               end
-
-               if @group
-                  if @group.is_a?(String)
-                     next unless get_group(stat_info.gid).name == @group
-                  else
-                     next unless stat_info.gid == @group
-                  end
-               end
-
-               unless Config::CONFIG['host_os'] =~ /windows|mswin/i
-                  if @inum
-                     next unless stat_info.ino == @inum
-                  end
-               end
-
-               # This currently doesn't work on MS Windows, even in limited
-               # fashion for 0666 and 0664, because File.stat.mode doesn't
-               # return the proper value.
-               #
-               if @perm
-                  if @perm.is_a?(String)
-                     octal_perm = sym2oct(@perm)
-                     next unless stat_info.mode & octal_perm == octal_perm
-                  else
-                     next unless sprintf("%o", stat_info.mode & 07777) == @perm.to_s
-                  end
-               end
-
-               # Allow plain numbers, or strings for comparison operators.
-               if @size
-                  if @size.is_a?(String)
-                     regex = /^([><=]+)\s*?(\d+)$/
-                     match = regex.match(@size)
-
-                     if match.nil? || match.captures.include?(nil)
-                        raise ArgumentError, "invalid size string: '#{@size}'"
-                     end
-
-                     operator = match.captures.first.strip
-                     number   = match.captures.last.strip.to_i
-
-                     next unless stat_info.size.send(operator, number)
-                  else
-                     next unless stat_info.size == @size
-                  end
-               end
-
-               if @user
-                  if @user.is_a?(String)
-                     next unless get_user(stat_info.uid).name == @user
-                  else
-                     next unless stat_info.uid == @user
-                  end
-               end
-
-               if block_given?
-                  yield file
-               else
-                  results << file
-               end
-
-               @previous = file unless @previous == file
+            @filetest.each{ |array|
+              meth = array[0]
+              bool = array[1]
+
+              unless File.send(meth, file) == bool
+                file_test = false
+                break
+              end
             }
-         rescue Errno::EACCES
-            next # Skip inaccessible directories
-         end
-      }
-
-      block_given? ? nil : results
-   end
-   
-   # Limits searches to the same file system as the specified +mount_point+.
-   #
-   def mount=(mount_point)
-      @mount = mount_point
-      @filesystem = File.stat(mount_point).dev
-   end
-
-   private
-
-   # This validates that the keys are valid. If they are, it sets the value
-   # of that key's corresponding method to the given value. If a key ends
-   # with a '?', it's validated as a File method.
-   #
-   def validate_and_set_options(options)
-      options.each do |key, value|
-         key = key.to_s.downcase
-
-         if key[-1].chr == '?'
-            sym = key.to_sym
-
-            unless File.respond_to?(sym)
-               raise ArgumentError, "invalid option '#{key}'"
+
+            next unless file_test
+          end
+
+          if @atime || @ctime || @mtime
+            date1 = Date.parse(Time.now.to_s)
+
+            if @atime
+              date2 = Date.parse(stat_info.atime.to_s)
+              next unless (date1 - date2).numerator == @atime
             end
 
-            @filetest << [sym, value]
-         else
-            unless VALID_OPTIONS.include?(key)
-               raise ArgumentError, "invalid option '#{key}'"
+            if @ctime
+              date2 = Date.parse(stat_info.ctime.to_s)
+              next unless (date1 - date2).numerator == @ctime
             end
 
-            send("#{key}=", value)
-         end
-      end
-   end
-
-   # Converts a symoblic permissions mode into its octal equivalent.
-   #--
-   # Taken almost entirely from ruby-talk: 96956 (Hal Fulton).
-   #
-   def sym2oct(str)
-      left  = {'u' => 0700, 'g' => 0070, 'o' => 0007, 'a' => 0777}
-      right = {'r' => 0444, 'w' => 0222, 'x' => 0111}
-      regex = /([ugoa]+)([+-=])([rwx]+)/
-
-      cmds = str.split(',')
-
-      perm = 0
-
-      cmds.each do |cmd|
-         match = cmd.match(regex)
-         raise "Invalid symbolic permissions: '#{str}'" if match.nil?
-
-         junk, who, what, how = match.to_a
-
-         who  = who.split(//).inject(who_num=0){ |num,b| num |= left[b]; num }
-         how  = how.split(//).inject(how_num=0){ |num,b| num |= right[b]; num }
-         mask = who & how
-
-         case what
-            when '+'
-               perm = perm | mask
-            when '-'
-               perm = perm & ~mask
-            when '='
-               perm = mask
-         end
+            if @mtime
+              date2 = Date.parse(stat_info.mtime.to_s)
+              next unless (date1 - date2).numerator == @mtime
+            end
+          end
+
+          if @ftype
+            next unless File.ftype(file) == @ftype
+          end
+
+          if @group
+            if @group.is_a?(String)
+              next unless get_group(stat_info.gid).name == @group
+            else
+              next unless stat_info.gid == @group
+            end
+          end
+
+          unless Config::CONFIG['host_os'] =~ /windows|mswin/i
+            if @inum
+              next unless stat_info.ino == @inum
+            end
+          end
+
+          # This currently doesn't work on MS Windows, even in limited
+          # fashion for 0666 and 0664, because File.stat.mode doesn't
+          # return the proper value.
+          #
+          if @perm
+            if @perm.is_a?(String)
+              octal_perm = sym2oct(@perm)
+              next unless stat_info.mode & octal_perm == octal_perm
+            else
+              next unless sprintf("%o", stat_info.mode & 07777) == @perm.to_s
+            end
+          end
+
+          # Allow plain numbers, or strings for comparison operators.
+          if @size
+            if @size.is_a?(String)
+              regex = /^([><=]+)\s*?(\d+)$/
+              match = regex.match(@size)
+
+              if match.nil? || match.captures.include?(nil)
+                raise ArgumentError, "invalid size string: '#{@size}'"
+              end
+
+              operator = match.captures.first.strip
+              number   = match.captures.last.strip.to_i
+
+              next unless stat_info.size.send(operator, number)
+            else
+              next unless stat_info.size == @size
+            end
+          end
+
+          if @user
+            if @user.is_a?(String)
+              next unless get_user(stat_info.uid).name == @user
+            else
+              next unless stat_info.uid == @user
+            end
+          end
+
+          if block_given?
+            yield file
+          else
+            results << file
+          end
+
+          @previous = file unless @previous == file
+        }
+      rescue Errno::EACCES
+        next # Skip inaccessible directories
       end
+    }
+
+    block_given? ? nil : results
+  end
+
+  # Limits searches to the same file system as the specified +mount_point+.
+  #
+  def mount=(mount_point)
+    @mount = mount_point
+    @filesystem = File.stat(mount_point).dev
+  end
+
+  private
 
-      perm
-   end
+  # This validates that the keys are valid. If they are, it sets the value
+  # of that key's corresponding method to the given value. If a key ends
+  # with a '?', it's validated as a File method.
+  #
+  def validate_and_set_options(options)
+    options.each do |key, value|
+      key = key.to_s.downcase
 
-   # Returns the group object based on the group id. Implemented for the
-   # sake of platforms that cannot build extensions, such as JRuby.
-   #
-   def get_group(gid)
-      if defined? Sys::Admin
-         Sys::Admin.get_group(gid)
+      if key[-1].chr == '?'
+        sym = key.to_sym
+
+        unless File.respond_to?(sym)
+          raise ArgumentError, "invalid option '#{key}'"
+        end
+
+        @filetest << [sym, value]
       else
-         Etc.getgrgid(gid)
+        unless VALID_OPTIONS.include?(key)
+          raise ArgumentError, "invalid option '#{key}'"
+        end
+
+        send("#{key}=", value)
       end
-   end
-
-   # Returns the user object based on the group id. Implemented for the
-   # sake of platforms that cannot build extensions, such as JRuby.
-   #
-   def get_user(uid)
-      if defined? Sys::Admin
-         Sys::Admin.get_user(uid)
-      else
-         Etc.getpwuid(uid)
+    end
+  end
+
+  # Converts a symoblic permissions mode into its octal equivalent.
+  #--
+  # Taken almost entirely from ruby-talk: 96956 (Hal Fulton).
+  #
+  def sym2oct(str)
+    left  = {'u' => 0700, 'g' => 0070, 'o' => 0007, 'a' => 0777}
+    right = {'r' => 0444, 'w' => 0222, 'x' => 0111}
+    regex = /([ugoa]+)([+-=])([rwx]+)/
+
+    cmds = str.split(',')
+
+    perm = 0
+
+    cmds.each do |cmd|
+      match = cmd.match(regex)
+      raise "Invalid symbolic permissions: '#{str}'" if match.nil?
+
+      junk, who, what, how = match.to_a
+
+      who  = who.split(//).inject(who_num=0){ |num,b| num |= left[b]; num }
+      how  = how.split(//).inject(how_num=0){ |num,b| num |= right[b]; num }
+      mask = who & how
+
+      case what
+        when '+'
+          perm = perm | mask
+        when '-'
+          perm = perm & ~mask
+        when '='
+          perm = mask
       end
-   end
+    end
+
+    perm
+  end
+
+  # Returns the group object based on the group id. Implemented for the
+  # sake of platforms that cannot build extensions, such as JRuby.
+  #
+  def get_group(gid)
+    if defined? Sys::Admin
+      Sys::Admin.get_group(gid)
+    else
+      Etc.getgrgid(gid)
+    end
+  end
+
+  # Returns the user object based on the group id. Implemented for the
+  # sake of platforms that cannot build extensions, such as JRuby.
+  #
+  def get_user(uid)
+    if defined? Sys::Admin
+      Sys::Admin.get_user(uid)
+    else
+      Etc.getpwuid(uid)
+    end
+  end
 end