file-find 0.1.0 → 0.1.1

data/CHANGES

@@ -1,2 +1,9 @@
+== 0.1.1 - 25-Apr-2007
+* The default for name is now '*', i.e. everything.
+* Fixed a bug where directories were not matched. Thanks go to Leslie Viljoen
+  for the spot.
+* The size option now accepts strings with comparable operators. For example,
+  you can now look for files greater than 400 bytes with the string "> 400".
+
 == 0.1.0 - 24-Apr-2007
-* Initial release
+* Initial release

data/lib/file/find.rb

@@ -2,7 +2,7 @@ require 'date'
 
 class File::Find
    # The version of this package
-   VERSION = '0.1.0'
+   VERSION = '0.1.1'
 
    # :stopdoc:
    VALID_OPTIONS = %w/
@@ -62,11 +62,14 @@ class File::Find
    attr_accessor :inum
 
    # The name pattern used to limit file searches. The patterns that are legal
-   # for Dir.glob are legal here.
+   # for Dir.glob are legal here. The default is '*', i.e. everything.
    #
    attr_accessor :name
 
-   # Limits searches to files that match the size, in bytes.
+   # 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
 
@@ -89,13 +92,13 @@ class File::Find
       @group  = nil
       @follow = true
       @inum   = nil
-      @name   = nil
       @size   = nil
       @user   = nil
 
       validate_and_set_options(options) unless options.empty?
 
       @path ||= Dir.pwd
+      @name ||= '*'
    end
 
    # Executes the find based on the rules you set for the File::Find object.
@@ -126,14 +129,15 @@ class File::Find
                   retry
                end
 
+               glob = File.join(File.dirname(file), @name)
+               next unless Dir[glob].include?(file)
+
                # Add directories back onto the list of paths to search unless
                # they've already been added.
                #
-               # TODO: Add depth handling.
                if stat_info.directory?
                   unless paths.include?(file)
                      paths << file
-                     next
                   end
                end
 
@@ -163,14 +167,23 @@ class File::Find
                   end
                end
 
-               if @name
-                  glob = File.join(File.dirname(file), @name) 
-                  next unless Dir[glob].include?(file)
-               end
-
-               # TODO: Allow more flexible syntax here, e.g. "> 1024".
+               # Allow plain numbers, or strings for comparison operators.
                if @size
-                  next unless stat_info.size == @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

data/test/tc_find.rb

@@ -1,11 +1,9 @@
 ######################################################################
 # tc_find.rb
 #
-# Test case for the File::Find package.
+# Test case for the File::Find package. You should run this via the
+# 'rake test' task.
 ######################################################################
-Dir.chdir '..' if File.basename(Dir.pwd) == 'test'
-$:.unshift File.join(Dir.pwd, 'lib')
-
 require 'test/unit'
 require 'fileutils'
 require 'file/find'
@@ -23,6 +21,10 @@ class TC_File_Find < Test::Unit::TestCase
       @rule1 = File::Find.new(:name => '*.rb')
    end
 
+   def test_version
+      assert_equal('0.1.1', File::Find::VERSION)
+   end
+
    def test_path
       assert_respond_to(@rule1, :path)
       assert_respond_to(@rule1, :path=)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: file-find
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-04-24 00:00:00 -06:00
+  version: 0.1.1
+date: 2007-04-25 00:00:00 -06:00
 summary: A better way to find files
 require_paths: 
 - lib