file-find 0.3.1-universal-java-1.5 → 0.3.2-universal-java-1.5

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.3.2 - 20-Feb-2008
+* Added support for the :mount option.
+* Added some basic tests for the :mount option.
+
 == 0.3.1 - 9-Jan-2008
 * Now defaults to using Etc instead of Sys::Admin for implementations
   that don't support building C extensions, e.g. JRuby.

data/README

@@ -35,6 +35,7 @@ few options, hasn't been updated in over six years and isn't packaged properly.
 * group (name or id)
 * maxdepth
 * mindepth
+* mount
 * mtime
 * name (or 'pattern')
 * path
@@ -73,11 +74,6 @@ supported. These include the following options:
 
 * ok - This is not interactive software.
 
-= Options I may or may not support
-
-* local/mount/xdev - This will probably not be added until I'm satisfied with
-  the sys-filesystem library. As of sys-filesystem 0.1.x, I'm not.
-  
 = 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
@@ -100,12 +96,13 @@ http://www.rubyforge.org/projects/shards.
 * 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
 Ruby's
 
 = Copyright
-(C) 2007-2008, Daniel J. Berger, All Rights Reserved
+(C) 2007-2009, Daniel J. Berger, All Rights Reserved
 
 = Author
 Daniel J. Berger

data/lib/file/find.rb

@@ -11,7 +11,7 @@ end
 
 class File::Find
    # The version of this library
-   VERSION = '0.3.1'
+   VERSION = '0.3.2'
 
    # :stopdoc:
    VALID_OPTIONS = %w/
@@ -23,6 +23,7 @@ class File::Find
       group
       maxdepth
       mindepth
+      mount
       mtime
       name
       pattern
@@ -89,11 +90,16 @@ class File::Find
    #
    attr_accessor :maxdepth
 
-   # Limits search to a minimum depth into the tree relative to the starting
+   # 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_accessor :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.
@@ -166,6 +172,7 @@ class File::Find
       @group  = nil
       @follow = true
       @inum   = nil
+      @mount  = nil
       @mtime  = nil
       @perm   = nil
       @prune  = nil
@@ -179,6 +186,8 @@ class File::Find
 
       validate_and_set_options(options) unless options.empty?
 
+      @filesystem = File.stat(@mount).dev if @mount
+
       @path ||= Dir.pwd
       @name ||= '*'
    end
@@ -242,6 +251,10 @@ class File::Find
                   glob.tr!(File::ALT_SEPARATOR, File::SEPARATOR) 
                end
 
+               if @mount
+                  next unless stat_info.dev == @filesystem
+               end
+
                if @maxdepth || @mindepth
                   file_depth = file.split(File::SEPARATOR).length
                   path_depth = @path.split(File::SEPARATOR).length

data/test/test_file_find.rb

@@ -68,7 +68,7 @@ class TC_File_Find < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.3.1', File::Find::VERSION)
+      assert_equal('0.3.2', File::Find::VERSION)
    end
 
    def test_path
@@ -306,6 +306,12 @@ class TC_File_Find < Test::Unit::TestCase
       assert_equal([], @rule2.find)
    end
 
+   def test_mount_basic
+      assert_respond_to(@rule1, :mount)
+      assert_respond_to(@rule1, :mount=)
+      assert_nil(@rule1.mount)
+   end
+
    def test_name_basic
       assert_respond_to(@rule1, :name)
       assert_respond_to(@rule1, :name=)

metadata

@@ -5,9 +5,9 @@ homepage: http://www.rubyforge.org/projects/shards
 executables: []
 
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 post_install_message: 
-date: 2009-01-09 07:00:00 +00:00
+date: 2009-02-20 07:00:00 +00:00
 files: 
 - lib/file
 - lib/file/find.rb
@@ -55,7 +55,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version 
         version: 2.0.2
-description: A better way to find files
+description: A better, object oriented way to find files
 email: djberg96@gmail.com
 authors: 
 - Daniel Berger