file-find 0.2.3 → 0.2.4

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.2.4 - 10-Dec-2008
+* Added support for symbolic permissions. Thanks go to Bill Kleb for the
+  suggestion and to Hal Fulton for providing the solution.
+
 == 0.2.3 - 25-Nov-2008
 * Added mtime support. My previous concerns, which I believe stemmed from
   the find(2) man page on Solaris 10 with regards to atime checks modifying

data/lib/file/find.rb

@@ -6,7 +6,7 @@ include Sys
 
 class File::Find
    # The version of this library
-   VERSION = '0.2.3'
+   VERSION = '0.2.4'
 
    # :stopdoc:
    VALID_OPTIONS = %w/
@@ -88,6 +88,8 @@ class File::Find
    # 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
@@ -144,10 +146,10 @@ class File::Find
       @size   = nil
       @user   = nil
 
-      validate_and_set_options(options) unless options.empty?
-
       @previous = nil
 
+      validate_and_set_options(options) unless options.empty?
+
       @path ||= Dir.pwd
       @name ||= '*'
    end
@@ -265,7 +267,11 @@ class File::Find
                # return the proper value.
                #
                if @perm
-                  next unless sprintf("%o", stat_info.mode & 07777) == @perm.to_s
+                  if @perm.is_a?(String)
+                     next unless stat_info.mode & sym2oct(@perm) == sym2oct(@perm)
+                  else
+                     next unless sprintf("%o", stat_info.mode & 07777) == @perm.to_s
+                  end
                end
 
                # Allow plain numbers, or strings for comparison operators.
@@ -325,4 +331,40 @@ class File::Find
          send("#{key}=", value)
       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(num=0) { |num,b| num |= left[b]; num }
+         how = how.split(//).inject(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
+
+      perm
+   end
 end

data/test/test_file_find.rb

@@ -51,7 +51,7 @@ class TC_File_Find < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.2.3', File::Find::VERSION)
+      assert_equal('0.2.4', File::Find::VERSION)
    end
 
    def test_path
@@ -189,6 +189,20 @@ class TC_File_Find < Test::Unit::TestCase
       assert_equal('test1.rb', File.basename(results.first))
    end
 
+   def test_perm_with_symbolic_permissions
+      omit_if(@@windows, 'symbolic perm test skipped on MS Windows')
+
+      File.chmod(0664, @file1)  # test1.rb
+      File.chmod(0644, @file2)  # test1.txt
+      results1 = File::Find.new(:name => "test1*", :perm => "g=rw").find
+      results2 = File::Find.new(:name => "test1*", :perm => "u=rw").find
+
+      assert_equal(1, results1.length)
+      assert_equal(2, results2.length)
+      assert_equal('test1.rb', File.basename(results1.first))
+      assert_equal(['test1.rb', 'test1.txt'], results2.map{ |e| File.basename(e) })
+   end
+
    def test_prune_basic
       assert_respond_to(@rule1, :prune)
       assert_respond_to(@rule1, :prune=)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: file-find
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Daniel Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-25 00:00:00 -07:00
+date: 2008-12-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.3.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A better way to find files