file-find 0.3.0 → 0.3.1

data/CHANGES

@@ -1,3 +1,10 @@
+== 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.
+* Updated the test suite to work with JRuby.
+* Minor optimizations for symbolic perms and atime/ctime/mtime checks.
+  Thanks go in part to Ryan Davis' flay library.
+
 == 0.3.0 - 30-Dec-2008
 * Added support for FileTest operations. All options passed to the constructor
   that end with '?' are now validated and treated as FileTest operations.

data/README

@@ -87,6 +87,11 @@ 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.
+
 = Bugs
 None that I'm aware of. Please log any bug reports on the project page at
 http://www.rubyforge.org/projects/shards.

data/lib/file/find.rb

@@ -1,12 +1,17 @@
 require 'date'
 require 'rbconfig'
-require 'sys/admin'
-include Config
-include Sys
+
+# For alternate implementations of Ruby, such as JRuby, that cannot
+# build C extensions fall back to the Etc module.
+begin
+   require 'sys/admin'
+rescue LoadError
+   require 'etc'
+end
 
 class File::Find
    # The version of this library
-   VERSION = '0.3.0'
+   VERSION = '0.3.1'
 
    # :stopdoc:
    VALID_OPTIONS = %w/
@@ -226,7 +231,7 @@ class File::Find
                   next
                rescue Errno::ELOOP
                   stat_method = :lstat # Handle recursive symlinks
-                  retry
+                  retry if stat_method.to_s != 'lstat'
                end
 
                glob = File.join(File.dirname(file), @name)
@@ -288,22 +293,23 @@ class File::Find
                   next unless file_test
                end
 
-               if @atime
+               if @atime || @ctime || @mtime
                   date1 = Date.parse(Time.now.to_s)
-                  date2 = Date.parse(stat_info.atime.to_s)
-                  next unless (date1 - date2).numerator == @atime
-               end
 
-               if @ctime
-                  date1 = Date.parse(Time.now.to_s)
-                  date2 = Date.parse(stat_info.ctime.to_s)
-                  next unless (date1 - date2).numerator == @ctime
-               end
+                  if @atime
+                     date2 = Date.parse(stat_info.atime.to_s)
+                     next unless (date1 - date2).numerator == @atime
+                  end
 
-               if @mtime
-                  date1 = Date.parse(Time.now.to_s)
-                  date2 = Date.parse(stat_info.mtime.to_s)
-                  next unless (date1 - date2).numerator == @mtime
+                  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
@@ -312,13 +318,13 @@ class File::Find
 
                if @group
                   if @group.is_a?(String)
-                     next unless Admin.get_group(stat_info.gid).name == @group
+                     next unless get_group(stat_info.gid).name == @group
                   else
                      next unless stat_info.gid == @group
                   end
                end
 
-               unless CONFIG['host_os'] =~ /windows|mswin/i
+               unless Config::CONFIG['host_os'] =~ /windows|mswin/i
                   if @inum
                      next unless stat_info.ino == @inum
                   end
@@ -330,7 +336,8 @@ class File::Find
                #
                if @perm
                   if @perm.is_a?(String)
-                     next unless stat_info.mode & sym2oct(@perm) == sym2oct(@perm)
+                     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
@@ -357,7 +364,7 @@ class File::Find
 
                if @user
                   if @user.is_a?(String)
-                     next unless Admin.get_user(stat_info.uid).name == @user
+                     next unless get_user(stat_info.uid).name == @user
                   else
                      next unless stat_info.uid == @user
                   end
@@ -442,4 +449,26 @@ class File::Find
 
       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

data/test/test_file_find.rb

@@ -11,16 +11,32 @@ require 'test/unit'
 require 'fileutils'
 require 'file/find'
 require 'rbconfig'
-require 'sys/admin'
+
+begin
+   require 'sys/admin'
+rescue LoadError
+   require 'etc'
+end
+
 include Config
 include FileUtils
 
 class TC_File_Find < Test::Unit::TestCase
    def self.startup
       Dir.chdir('test') unless File.basename(Dir.pwd) == 'test'
+
       @@windows = CONFIG['host_os'] =~ /windows|mswin/i
-      @@loguser = Sys::Admin.get_user(Admin.get_login) unless @@windows
-      @@logroup = Sys::Admin.get_group(@@loguser.gid) unless @@windows
+      @@jruby   = RUBY_PLATFORM.match('java')
+
+      unless @@windows
+         if @@jruby
+            @@loguser = Etc.getpwnam(Etc.getlogin)
+            @@logroup = Etc.getgrgid(@@loguser.gid)
+         else
+            @@loguser = Sys::Admin.get_user(Sys::Admin.get_login)
+            @@logroup = Sys::Admin.get_group(@@loguser.gid)
+         end
+      end
    end
 
    def setup
@@ -52,7 +68,7 @@ class TC_File_Find < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.3.0', File::Find::VERSION)
+      assert_equal('0.3.1', File::Find::VERSION)
    end
 
    def test_path
@@ -118,6 +134,8 @@ class TC_File_Find < Test::Unit::TestCase
    end
 
    def test_filetest
+      omit_if(@@windows && @@jruby, "Skipping file test on JRuby/Windows")
+
       rule = File::Find.new(:name => "*.doc", :writable? => true)
       File.chmod(0644, @file4)
 
@@ -406,6 +424,7 @@ class TC_File_Find < Test::Unit::TestCase
 
    def self.shutdown
       @@windows = nil
+      @@jruby   = nil
       @@loguser = nil unless @@windows
       @@logroup = nil unless @@windows
    end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: file-find
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Daniel Berger
@@ -9,28 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 -07:00
+date: 2009-01-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sys-admin
+  name: test-unit
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.4
+        version: 2.0.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: sys-admin
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 1.4.4
     version: 
 description: A better way to find files
 email: djberg96@gmail.com
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A better way to find files