file-find 0.3.7 → 0.3.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODkxZjA0Y2IyNjQwOGJiMjVhYzBlOWM2MDJmNTU2YTA3YmRiNGVmZg==
-  data.tar.gz: !binary |-
-    MTlkYmUzYzBmOWE2Nzk0ZTVkMzk3OGU0NDZlZDg4MGM2MjRiN2I5OA==
+SHA1:
+  metadata.gz: 0f07a119a3ad4179edcb7ea6dd0c0cfa0fd2efa9
+  data.tar.gz: 62762fc4f258b1174f673e198c5a6445bcf7a8d6
 SHA512:
-  metadata.gz: !binary |-
-    MjY4YzA4Y2I3ZTdkNWZmYWJmYTc1M2ZhMzQxOTk2MGJhOTllNmZjMzljMDUz
-    ZmZhYTVlNTk4MDMwYjkwYjA1N2ZiNmE3ODllNDBjMjU3YjcxMmFjZDg5MTU2
-    NWI3ZjkwMWQ5NjkyMDI4YzMxNjBiZjZkMjFjNDc5YzI3MTQ5NTk=
-  data.tar.gz: !binary |-
-    YjYyYTNmZGUyODI2OGZiZTA0MGJmYTg1OWFhOGFkMWY5Yjg5MjkyNmJkYjI1
-    MjI3NzcwM2VkMzc5YTkwYmY0MmE2ZTlkYWQ4NTU1ZDBmN2YyZTA1MzYwYTY1
-    NGQ2MmI3NmY4OWE4N2Q1MTk2NTM1OTI3YTQ2NjhjNWE5OTQ5MWM=
+  metadata.gz: f2f291fbd58a30acb7a0b8a9a58a00f90fea8466670428af17055dd3f499816ff014ac60641b66df409a0b4ec367158205c5b4f9cbfd73c426f3b7b0d7e6e83f
+  data.tar.gz: 6478327935c6eab676d1806d679e1ad26e920dbe6ff4e3663c2541f999bc5dfa01733e52364d0b3c6fd64fedeae40a14611bc21f178cce3d141a32a10f0689a7

data/CHANGES

@@ -1,3 +1,13 @@
+== 0.3.8 - 12-Feb-2014
+* Removed all references to the Etc module since the sys-admin library now uses
+  FFI and works with JRuby.
+* The :user, :group, and :inum options will now work on MS Windows if you have
+  the win32-file gem installed.
+* Fixed the perm option on Windows for its limited subset of available perms.
+* You can now include a leading zero for the perm option if you wish.
+* Some tests that were previously omitted on Windows are now included.
+* Updates to the test suite, readme, etc.
+
 == 0.3.7 - 15-Jan-2014
 * Fixed a bug with brackets in the path name. Thanks go to Jeremy Lawler
   for the spot and the patch.

data/README

@@ -2,6 +2,10 @@
   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.
 
+= Installation
+
+  gem install file-find
+
 = Synopsis
   require 'file/find'
 
@@ -15,12 +19,7 @@
     puts f
   }
 
-= Installation
-
-  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'
@@ -31,7 +30,7 @@
   * ctime
   * follow
   * ftype
-  * inum (except Windows)
+  * inum
   * group (name or id)
   * maxdepth
   * mindepth
@@ -39,7 +38,7 @@
   * mtime
   * name (or 'pattern')
   * path
-  * perm (except Windows)
+  * perm
   * prune
   * size
   * user (name or id)
@@ -50,15 +49,9 @@
   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.
+  None at this time. Please log any feature requests on the project page at:
 
-  Some specific things I plan on adding:
-
-  * exec
-  * links
-  * support for :user and :group on MS Windows
+  http://github.com/djberg96/file-find
 
 = Options I won't support
   Generally speaking, anything that would require mucking around with C code
@@ -78,13 +71,10 @@
 = Known Issues
   The mindepth and maxdepth options do not work for more than 1 path.
 
-  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 is limited to 0644 and 0444 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, :group, and :inum options require the win32-file gem to work
+  properly on MS Windows. However, it is not officially a dependency.
 
   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
@@ -107,7 +97,7 @@
   Artistic 2.0
 
 = Copyright
-  (C) 2007-2013, Daniel J. Berger, All Rights Reserved
+  (C) 2007-2014, Daniel J. Berger, All Rights Reserved
 
 = Author
   Daniel J. Berger

data/Rakefile

@@ -8,12 +8,6 @@ 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
-      spec.add_dependency('sys-admin', '>= 1.5.2')
-    end   
-
     if Gem::VERSION.to_f < 2.0
       Gem::Builder.new(spec).build
     else

data/file-find.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'file-find'
-  spec.version   = '0.3.7'
+  spec.version   = '0.3.8'
   spec.author    = 'Daniel Berger'
   spec.license   = 'Artistic 2.0'
   spec.summary   = 'A better way to find files'
@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = 'shards'
   spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
 
-  spec.add_development_dependency('test-unit', '>= 2.5.0')
-  spec.add_development_dependency('sys-admin')
+  spec.add_dependency('sys-admin', '>= 1.6.0')
+  spec.add_development_dependency('test-unit')
   spec.add_development_dependency('rake')
 
   spec.description = <<-EOF

data/lib/file/find.rb

@@ -1,19 +1,18 @@
 require 'date'
+require 'sys/admin'
 
-# For alternate implementations of Ruby, such as JRuby, that cannot
-# build C extensions fall back to the Etc module.
 begin
-  require 'sys/admin'
+  require 'win32/file'
 rescue LoadError
-  require 'etc'
+  # Do nothing, not required, just nicer.
 end
 
 class File::Find
   # The version of the file-find library
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 
   # :stopdoc:
-  VALID_OPTIONS = %w/
+  VALID_OPTIONS = %w[
     atime
     ctime
     follow
@@ -32,7 +31,7 @@ class File::Find
     prune
     size
     user
-  /
+  ]
   # :startdoc:
 
   # The starting path(s) for the search. The default is the current directory.
@@ -60,8 +59,6 @@ class File::Find
   # 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
@@ -80,8 +77,7 @@ class File::Find
   #
   attr_accessor :ftype
 
-  # Limits search to a file with a specific inode number. Ignored on MS
-  # Windows.
+  # Limits search to a file with a specific inode number.
   #
   attr_accessor :inum
 
@@ -117,12 +113,11 @@ class File::Find
 
   # 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.
+  # group, and world settings are used.
   #
   # You may optionally use symbolic permissions, e.g. "g+rw", "u=rwx", etc.
   #
-  # Not currently supported on MS Windows.
+  # MS Windows only recognizes two modes, 0644 and 0444.
   #
   attr_accessor :perm
 
@@ -140,8 +135,6 @@ class File::Find
   # 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.
@@ -339,28 +332,35 @@ class File::Find
 
           if @group
             if @group.is_a?(String)
-              next unless get_group(stat_info.gid).name == @group
+              if File::ALT_SEPARATOR
+                begin
+                  next unless Sys::Admin.get_group(stat_info.gid, :LocalAccount => true).name == @group
+                rescue Sys::Admin::Error
+                  next
+                end
+              else
+                begin
+                  next unless Sys::Admin.get_group(stat_info.gid).name == @group
+                rescue Sys::Admin::Error
+                  next
+                end
+              end
             else
               next unless stat_info.gid == @group
             end
           end
 
-          unless File::ALT_SEPARATOR
-            if @inum
-              next unless stat_info.ino == @inum
-            end
+          if @inum
+            next unless stat_info.ino == @inum
           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.
-          #
+          # Note that only 0644 and 0444 are supported on MS Windows.
           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
+              next unless sprintf("%o", stat_info.mode & 07777) == sprintf("%o", @perm)
             end
           end
 
@@ -385,7 +385,19 @@ class File::Find
 
           if @user
             if @user.is_a?(String)
-              next unless get_user(stat_info.uid).name == @user
+              if File::ALT_SEPARATOR
+                begin
+                  next unless Sys::Admin.get_user(stat_info.uid, :LocalAccount => true).name == @user
+                rescue Sys::Admin::Error
+                  next
+                end
+              else
+                begin
+                  next unless Sys::Admin.get_user(stat_info.uid).name == @user
+                rescue Sys::Admin::Error
+                  next
+                end
+              end
             else
               next unless stat_info.uid == @user
             end
@@ -477,26 +489,4 @@ 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

@@ -7,11 +7,11 @@
 require 'test-unit'
 require 'fileutils'
 require 'file/find'
+require 'sys/admin'
 
-begin
-  require 'sys/admin'
-rescue LoadError
-  require 'etc'
+if File::ALT_SEPARATOR
+  require 'win32/file'
+  require 'win32/security'
 end
 
 include FileUtils
@@ -23,14 +23,16 @@ class TC_File_Find < Test::Unit::TestCase
     @@windows = File::ALT_SEPARATOR
     @@jruby   = RUBY_PLATFORM.match('java')
 
-    unless @@windows
-      if @@jruby || !defined? Sys::Admin
-        @@loguser = Etc.getpwnam(Etc.getlogin)
-        @@logroup = Etc.getgrgid(@@loguser.gid)
+    if @@windows
+      @@elevated = Win32::Security.elevated_security?
+      if @@elevated
+        @@loguser = Sys::Admin.get_group("Administrators", :LocalAccount => true)
       else
-        @@loguser = Sys::Admin.get_user(Sys::Admin.get_login)
-        @@logroup = Sys::Admin.get_group(@@loguser.gid)
+        @@loguser = Sys::Admin.get_user(Sys::Admin.get_login, :LocalAccount => true)
       end
+    else
+      @@loguser = Sys::Admin.get_user(Sys::Admin.get_login)
+      @@logroup = Sys::Admin.get_group(@@loguser.gid)
     end
   end
 
@@ -47,13 +49,16 @@ class TC_File_Find < Test::Unit::TestCase
     File.open(@file_txt2, 'w'){}
     File.open(@file_doc, 'w'){}
 
-    unless @@windows
-      @link1 = 'link1'
+    @link1 = 'link1'
+
+    if @@windows
+      File.symlink(@file_rb, @link1) if @@elevated
+    else
       File.symlink(@file_rb, @link1)
     end
 
-    Dir.mkdir(@directory1) unless File.exists?(@directory1)
-    Dir.mkdir(@directory2) unless File.exists?(@directory2)
+    Dir.mkdir(@directory1) unless File.exist?(@directory1)
+    Dir.mkdir(@directory2) unless File.exist?(@directory2)
 
     File.open(File.join(@directory1, 'bar.txt'), 'w'){}
     File.open(File.join(@directory2, 'baz.txt'), 'w'){}
@@ -62,29 +67,38 @@ class TC_File_Find < Test::Unit::TestCase
     @rule2 = File::Find.new
   end
 
-  def test_version
-    assert_equal('0.3.7', File::Find::VERSION)
+  test "version constant is set to expected value" do
+    assert_equal('0.3.8', File::Find::VERSION)
   end
 
-  def test_path
+  test "path accessor basic functionality" do
     assert_respond_to(@rule1, :path)
     assert_respond_to(@rule1, :path=)
+  end
+
+  test "path method returns expected value" do
     assert_equal(Dir.pwd, @rule1.path)
   end
 
-  def test_options
+  test "options accessor basic functionality" do
     assert_respond_to(@rule1, :options)
     assert_respond_to(@rule1, :options=)
+  end
+
+  test "options method returns expected value" do
     assert_equal({:name => '*.txt'}, @rule1.options)
   end
 
-  def test_atime_basic
+  test "atime accessor basic functionality" do
     assert_respond_to(@rule1, :atime)
     assert_respond_to(@rule1, :atime=)
+  end
+
+  test "atime method returns expected default value" do
     assert_nil(@rule1.atime)
   end
 
-  def test_atime
+  test "find with atime option works as expected" do
     rule1 = File::Find.new(:name => "*.rb", :atime => 0)
     rule2 = File::Find.new(:name => "*.rb", :atime => 1)
 
@@ -92,13 +106,16 @@ class TC_File_Find < Test::Unit::TestCase
     assert_true(rule2.find.empty?)
   end
 
-  def test_ctime_basic
+  test "ctime accessor basic functionality" do
     assert_respond_to(@rule1, :ctime)
     assert_respond_to(@rule1, :ctime=)
+  end
+
+  test "ctime method returns expected default value" do
     assert_nil(@rule1.ctime)
   end
 
-  def test_ctime
+  test "find with ctime option works as expected" do
     rule1 = File::Find.new(:name => "*.rb", :ctime => 0)
     rule2 = File::Find.new(:name => "*.rb", :ctime => 1)
 
@@ -106,31 +123,32 @@ class TC_File_Find < Test::Unit::TestCase
     assert_true(rule2.find.empty?)
   end
 
-  def test_find_basic
+  test "find method basic functionality" do
     assert_respond_to(@rule1, :find)
     assert_nothing_raised{ @rule1.find }
   end
 
-  def test_find
+  test "find method returns expected value" do
     assert_kind_of(Array, @rule1.find)
     assert_nil(@rule1.find{})
   end
 
-  def test_filetest_basic
+  test "filetest accessor basic functionality" do
     assert_respond_to(@rule1, :filetest)
     assert_respond_to(@rule1, :filetest=)
     assert_nothing_raised{ @rule1.filetest }
+  end
+
+  test "filetest method returns expected value" do
     assert_kind_of(Array, @rule1.filetest)
   end
 
-  def test_filetest_valid_options
+  test "valid filetest options work as expected" do
     assert_nothing_raised{ File::Find.new(:readable? => true) }
     assert_nothing_raised{ File::Find.new(:writable? => true) }
   end
 
-  def test_filetest
-    omit_if(@@windows && @@jruby, "Skipping file test on JRuby/Windows")
-
+  test "find method works with filetest option" do
     rule = File::Find.new(:name => "*.doc", :writable? => true)
     File.chmod(0644, @file_doc)
 
@@ -141,7 +159,16 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal([], rule.find)
   end
 
-  def test_mtime
+  test "mtime accessor basic functionality" do
+    assert_respond_to(@rule1, :mtime)
+    assert_respond_to(@rule1, :mtime=)
+  end
+
+  test "mtime method returns expected default value" do
+    assert_nil(@rule1.mtime)
+  end
+
+  test "find with mtime option works as expected" do
     rule1 = File::Find.new(:name => "*.rb", :mtime => 0)
     rule2 = File::Find.new(:name => "*.rb", :mtime => 1)
 
@@ -149,19 +176,16 @@ class TC_File_Find < Test::Unit::TestCase
     assert_true(rule2.find.empty?)
   end
 
-  def test_mtime_basic
-    assert_respond_to(@rule1, :mtime)
-    assert_respond_to(@rule1, :mtime=)
-    assert_nil(@rule1.mtime)
-  end
-
-  def test_ftype_basic
+  test "ftype accessor basic functionality" do
     assert_respond_to(@rule1, :ftype)
     assert_respond_to(@rule1, :ftype=)
+  end
+
+  test "ftype method returns expected default value" do
     assert_nil(@rule1.ftype)
   end
 
-  def test_ftype
+  test "ftype method works as expected" do
     rule1 = File::Find.new(:name => "*.rb", :ftype => "file")
     rule2 = File::Find.new(:name => "*.rb", :ftype => "characterSpecial")
 
@@ -169,25 +193,30 @@ class TC_File_Find < Test::Unit::TestCase
     assert_true(rule2.find.empty?)
   end
 
-  def test_group_basic
+  test "group accessor basic functionality" do
     assert_respond_to(@rule1, :group)
     assert_respond_to(@rule1, :group=)
+  end
+
+  test "group method returns expected default value" do
     assert_nil(@rule1.group)
   end
 
-  def test_group_with_numeric_id
+  # TODO: Update test for Windows
+  test "find with numeric group id works as expected" do
     omit_if(@@windows, 'group test skipped on MS Windows')
     @rule1 = File::Find.new(:name => '*.doc', :group => @@loguser.gid)
     assert_equal([File.expand_path(@file_doc)], @rule1.find)
   end
 
-  def test_group_with_string
+  # TODO: Update test for Windows
+  test "find with string group id works as expected" do
     omit_if(@@windows, 'group test skipped on MS Windows')
     @rule1 = File::Find.new(:name => '*.doc', :group => @@logroup.name)
     assert_equal([File.expand_path(@file_doc)], @rule1.find)
   end
 
-  def test_group_with_bad_id
+  test "find with bogus group returns empty results" do
     omit_if(@@windows, 'group test skipped on MS Windows')
     @rule1 = File::Find.new(:name => '*.doc', :group => 'totallybogus')
     @rule2 = File::Find.new(:name => '*.doc', :group => 99999999)
@@ -195,27 +224,35 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal([], @rule2.find)
   end
 
-  def test_inum_basic
+  test "inum accessor basic functionality" do
     assert_respond_to(@rule1, :inum)
     assert_respond_to(@rule1, :inum=)
+  end
+
+  test "inum method returns expected default value" do
     assert_nil(@rule1.inum)
   end
 
-  def test_follow_basic
+  test "follow accessor basic functionality" do
     assert_respond_to(@rule1, :follow)
     assert_respond_to(@rule1, :follow=)
+  end
+
+  test "follow method returns expected default value" do
     assert_true(@rule1.follow)
   end
 
-  def test_links_basic
+  test "links accessor basic functionality" do
     assert_respond_to(@rule1, :links)
     assert_respond_to(@rule1, :links=)
-    assert_nil(@rule1.links)
   end
 
-  def test_links
-    omit_if(@@windows, 'links test skipped on MS Windows')
+  test "links method returns expected default value" do
+    assert_nil(@rule1.links)
+  end
 
+  test "links method returns expected result" do
+    omit_if(@@windows && !@@elevated)
     @rule1 = File::Find.new(:name => '*.rb', :links => 2)
     @rule2 = File::Find.new(:name => '*.doc', :links => 1)
 
@@ -234,7 +271,7 @@ class TC_File_Find < Test::Unit::TestCase
   # I did this because I'm a little paranoid about the directory
   # not getting mangled. - jlawler.
   #
-  def test_dirs_with_brackets
+  test "find method works on dirs that contain brackets" do
     omit_if(@@windows, 'dirs with brackets test skipped on MS Windows')
 
     bracket_files = [ 'bracket/a[1]/a.foo', 'bracket/a [2] /b.foo', 'bracket/[a] b [c]/d.foo' ].sort
@@ -264,7 +301,7 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal(bracket_paths, @dir_rule.find.sort )
   end
 
-  def test_maxdepth_file
+  test "find with maxdepth option returns expected results" do
     mkpath('a1/a2/a3')
     touch('a1/a.foo')
     touch('a1/a2/b.foo')
@@ -290,7 +327,7 @@ class TC_File_Find < Test::Unit::TestCase
     )
   end
 
-  def test_maxdepth_directory
+  test "find with maxdepth option returns expected results for directories" do
     mkpath('a/b/c')
     @rule2.pattern = "c"
 
@@ -304,13 +341,16 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal(['c'], @rule2.find.map{ |e| File.basename(e) })
   end
 
-  def test_mindepth_basic
+  test "mindepth accessor basic functionality" do
     assert_respond_to(@rule1, :mindepth)
     assert_respond_to(@rule1, :mindepth=)
+  end
+
+  test "mindepth method returns expected default value" do
     assert_nil(@rule1.mindepth)
   end
 
-  def test_mindepth_file
+  test "find with mindepth option returns expected results" do
     mkpath('a1/a2/a3')
     touch('z.min')
     touch('a1/a.min')
@@ -353,7 +393,7 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal([], @rule2.find.map{ |e| File.basename(e) })
   end
 
-  def test_mindepth_directory
+  test "find with mindepth option returns expected results for directories" do
     mkpath('a/b/c')
     @rule2.pattern = "a"
 
@@ -367,42 +407,54 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal([], @rule2.find)
   end
 
-  def test_mount_basic
+  test "mount accessor basic functionality" do
     assert_respond_to(@rule1, :mount)
     assert_respond_to(@rule1, :mount=)
+  end
+
+  test "mount method returns expected default value" do
     assert_nil(@rule1.mount)
   end
 
-  def test_name_basic
+  test "name accessor basic functionality" do
     assert_respond_to(@rule1, :name)
     assert_respond_to(@rule1, :name=)
+  end
+
+  test "name method returns expected default value" do
     assert_equal('*.txt', @rule1.name)
   end
 
-  def test_pattern_alias
+  test "pattern accessor basic functionality" do
     assert_respond_to(@rule1, :pattern)
     assert_respond_to(@rule1, :pattern=)
-    assert_true(@rule1.method(:name) == @rule1.method(:pattern))
-    assert_true(@rule1.method(:name=) == @rule1.method(:pattern=))
   end
 
-  def test_perm_basic
+  test "pattern is an alias for name" do
+    assert_alias_method(@rule1, :name, :pattern)
+    assert_alias_method(@rule1, :name=, :pattern=)
+  end
+
+  test "perm accessor basic functionality" do
     assert_respond_to(@rule1, :perm)
     assert_respond_to(@rule1, :perm=)
+  end
+
+  test "perm method returns expected default value" do
     assert_nil(@rule1.perm)
   end
 
-  def test_perm
-    omit_if(@@windows, 'perm test skipped on MS Windows')
-    File.chmod(0664, @file_rb)
+  test "perm method returns expected results" do
+    File.chmod(0444, @file_rb)
     File.chmod(0644, @file_txt1)
-    results = File::Find.new(:name => "test1*", :perm => 664).find
+
+    results = File::Find.new(:name => "test1*", :perm => 0644).find
 
     assert_equal(1, results.length)
-    assert_equal('test1.rb', File.basename(results.first))
+    assert_equal('test1.txt', File.basename(results.first))
   end
 
-  def test_perm_with_symbolic_permissions
+  test "perm method works with symbolic permissions" do
     omit_if(@@windows, 'symbolic perm test skipped on MS Windows')
 
     File.chmod(0664, @file_rb)  # test1.rb
@@ -416,55 +468,71 @@ class TC_File_Find < Test::Unit::TestCase
     assert_equal(['test1.rb', 'test1.txt'], results2.map{ |e| File.basename(e) }.sort)
   end
 
-  def test_prune_basic
+  test "prune accessor basic functionality" do
     assert_respond_to(@rule1, :prune)
     assert_respond_to(@rule1, :prune=)
+  end
+
+  test "prune method returns expected default value" do
     assert_nil(@rule1.prune)
   end
 
-  def test_prune
+  test "find method with prune option works as expected" do
     rule = File::Find.new(:name => "*.txt", :prune => 'foo')
     assert_equal('test1.txt', File.basename(rule.find.first))
   end
 
-  def test_size_basic
+  test "size accessor basic functionality" do
     assert_respond_to(@rule1, :size)
     assert_respond_to(@rule1, :size=)
+  end
+
+  test "size method returns expected default value" do
     assert_nil(@rule1.size)
   end
 
-  def test_user_basic
+  test "user accessor basic functionality" do
     assert_respond_to(@rule1, :user)
     assert_respond_to(@rule1, :user=)
+  end
+
+  test "user method returns expected default value" do
     assert_nil(@rule1.user)
   end
 
-  def test_user_with_numeric_id
-    omit_if(@@windows, 'user test skipped on MS Windows')
-    @rule1 = File::Find.new(:name => '*.doc', :user => @@loguser.uid)
+  test "user method works with numeric id as expected" do
+    if @@windows && @@elevated
+      uid = @@loguser.gid # Windows assigns the group if any member is an admin
+    else
+      uid = @@loguser.uid
+    end
+
+    @rule1 = File::Find.new(:name => '*.doc', :user => uid)
     assert_equal([File.expand_path(@file_doc)], @rule1.find)
   end
 
-  def test_user_with_string
-    omit_if(@@windows, 'user test skipped on MS Windows')
+  test "user method works with string as expected" do
+    omit_if(@@windows && @@elevated)
     @rule1 = File::Find.new(:name => '*.doc', :user => @@loguser.name)
     assert_equal([File.expand_path(@file_doc)], @rule1.find)
   end
 
-  def test_user_with_bad_id
-    omit_if(@@windows, 'user test skipped on MS Windows')
+  test "find method with user option using invalid user returns expected results" do
     @rule1 = File::Find.new(:name => '*.doc', :user => 'totallybogus')
     @rule2 = File::Find.new(:name => '*.doc', :user => 99999999)
     assert_equal([], @rule1.find)
     assert_equal([], @rule2.find)
   end
 
-  def test_previous_basic
+  test "previous method basic functionality" do
     assert_respond_to(@rule1, :previous)
   end
 
-  def test_expected_errors
+  test "an error is raised if the path does not exist" do
     assert_raise(Errno::ENOENT){ File::Find.new(:path => '/bogus/dir').find }
+  end
+
+  test "an error is raised if an invalid option is passed" do
     assert_raise(ArgumentError){ File::Find.new(:bogus => 1) }
     assert_raise(ArgumentError){ File::Find.new(:bogus? => true) }
   end
@@ -476,11 +544,11 @@ class TC_File_Find < Test::Unit::TestCase
     rm_rf(@file_doc)
     rm_rf(@directory1)
     rm_rf(@directory2)
-    rm_rf(@link1) unless @@windows
+    rm_rf(@link1) #unless @@windows
     rm_rf('a')
     rm_rf('a1')
     rm_rf('bracket')
-    rm_rf('z.min') if File.exists?('z.min')
+    rm_rf('z.min') if File.exist?('z.min')
 
     @rule1 = nil
     @rule2 = nil
@@ -493,7 +561,7 @@ class TC_File_Find < Test::Unit::TestCase
   def self.shutdown
     @@windows = nil
     @@jruby   = nil
-    @@loguser = nil unless @@windows
+    @@elevated = nil if @@windows
     @@logroup = nil unless @@windows
   end
 end

metadata

@@ -1,75 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: file-find
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Daniel Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: sys-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
+        version: 1.6.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: sys-admin
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sys-admin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-description: ! "    The file-find library provides a better, more object oriented
-  approach\n    to finding files. It allows you to find files based on a variety of\n
-  \   properties, such as access time, size, owner, etc. You can also limit\n    directory
-  depth.\n"
+description: |2
+      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.
 email: djberg96@gmail.com
 executables: []
 extensions: []
@@ -79,11 +66,11 @@ extra_rdoc_files:
 - MANIFEST
 files:
 - CHANGES
-- file-find.gemspec
-- lib/file/find.rb
 - MANIFEST
-- Rakefile
 - README
+- Rakefile
+- file-find.gemspec
+- lib/file/find.rb
 - test/test_file_find.rb
 homepage: http://github.com/djberg96/file-find
 licenses:
@@ -95,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shards
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A better way to find files