file-find 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0febb67274c45e862fa242e53bda0d97895817bf6ff98fd055f769afaa5d0e60
-  data.tar.gz: 20a42458a0f3b70e7bdffc6afd446be9b70e7417197ebbd3e4c9c1302d473559
+  metadata.gz: f14f3ba41e3f587f6a7f5206d8a1e6111d5b160b3e8dd5bb8126077def8a6ad9
+  data.tar.gz: dc7baffb76c1e1aff783944e3185b05e0a605ff379a23dd0fc826c21cddf6b5d
 SHA512:
-  metadata.gz: 51cabd736d8aeb6c35cd1e7bb38de0ee4ccd96a79ccbe0b9a08a657e69d0d9250afc1e7680986721de5cd33f20ff459bd3afbff9e47c0960d4b47b666a02bc00
-  data.tar.gz: 6ec15535aa08d5f78f81decbf7678f0c05f6ebd8978b5bb3eaef83c3fa315ed6414d696458008d1d2832bb3413747a0a21a0882f56019602064f859a8a82d0d4
+  metadata.gz: 7bba2f630c22ff5221e59a4a6128776e834c55200bea17aa355c85ffb21c0a96eb910b4bfb2d01f6e84e49071baa3aeda01d8046f70b76d344178c3e200f10aa
+  data.tar.gz: 59c2635c6da46debbbadf874121577b2c1d9a2149369df7976cfaa86d50a36a35f842ef365f76d5a6ae729f6879d0fea9b2c780a8c65b0ba8609403830e8a03e

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.5.3 - 4-Jan-2026
+* Internal refactoring, some performance improvements.
+* Dependency updates for Windows since Ruby 4+ no longer includes win32ole
+  in its stdlib. Use the gem instead.
+* Some specs restored for Windows, and specs run with warnings enabled by default.
+
 ## 0.5.2 - 22-Nov-2025
 * Use fnmatch instead of some overworked checks for Windows paths using glob.
 * Minor refactoring improvements for atime/ctime/mtime checks.

data/README.md

@@ -115,7 +115,7 @@ Apache-2.0
 
 ## Copyright
 
-(C) 2007-2025, Daniel J. Berger, All Rights Reserved
+(C) 2007-2026, Daniel J. Berger, All Rights Reserved
 
 ## Author
 

data/Rakefile

@@ -26,7 +26,7 @@ RuboCop::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = ['spec/file_find_spec.rb']
-  t.rspec_opts = '-f documentation'
+  t.rspec_opts = '-f documentation -w'
 end
 
 # Clean up afterwards

data/file-find.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'file-find'
-  spec.version    = '0.5.2'
+  spec.version    = '0.5.3'
   spec.author     = 'Daniel Berger'
   spec.license    = 'Apache-2.0'
   spec.summary    = 'A better way to find files'
@@ -25,6 +25,12 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_dependency('sys-admin', '~> 1.7')
+
+  if Gem.win_platform?
+    spec.add_dependency('win32ole')
+    spec.add_dependency('win32-registry') # Until sys-admin gets updated properly
+  end
+
   spec.add_development_dependency('rspec', '~> 3.9')
   spec.add_development_dependency('fakefs', '~> 3.0')
   spec.add_development_dependency('rake')

data/lib/file/find.rb

@@ -13,7 +13,7 @@ end
 # files on your filesystem.
 class File::Find
   # The version of the file-find library
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 
   # :stopdoc:
   VALID_OPTIONS = %w[
@@ -225,16 +225,15 @@ class File::Find
     until queue.empty?
       path = queue.shift
       begin
-        Dir.foreach(path) do |file|
-          next if file == '.'
-          next if file == '..'
+        Dir.children(path).each do |basename|
+          # Fast rejections before expensive operations
+          next if prune_regex && prune_regex.match(basename)
 
-          if prune_regex && prune_regex.match(file)
-            next
-          end
-
-          file = File.join(path, file)
+          # Check name pattern early to potentially skip stat
+          # (but we still need to stat directories to add them to queue)
+          matches_name = File.fnmatch?(@name, basename)
 
+          file = File.join(path, basename)
           stat_method = @follow ? :stat : :lstat
 
           # Skip files we cannot access, stale links, etc.
@@ -243,45 +242,47 @@ class File::Find
           rescue Errno::ENOENT, Errno::EACCES
             next
           rescue Errno::ELOOP
-            if stat_method.to_s != 'lstat'
+            if stat_method != :lstat
               stat_method = :lstat # Handle recursive symlinks
               retry
             end
           end
 
+          # Skip non-directories that don't match name pattern early
+          next if !stat_info.directory? && !matches_name
+
           next if @mount && stat_info.dev != @filesystem
           next if @links && stat_info.nlink != @links
 
+          # Calculate depth early if needed for maxdepth/mindepth checks
           if @maxdepth || @mindepth
             file_depth = file.split(File::SEPARATOR).reject(&:empty?).length
             current_base_path = [@path].flatten.find{ |tpath| file.include?(tpath) }
             path_depth = current_base_path.split(File::SEPARATOR).length
-
             depth = file_depth - path_depth
+          end
 
-            if @maxdepth && depth > @maxdepth
-              if stat_info.directory? && !paths.include?(file)
-                queue << file
-              end
-              next
+          # Early termination: don't even add directories to queue if beyond maxdepth
+          if stat_info.directory? && !paths.include?(file)
+            if @maxdepth && depth && depth >= @maxdepth
+              # At maxdepth, don't traverse into this directory
+            else
+              queue << file
             end
+          end
 
-            if @mindepth && depth < @mindepth
-              if stat_info.directory? && !paths.include?(file)
-                queue << file
-              end
-              next
-            end
+          # Skip files that are beyond maxdepth or before mindepth
+          if @maxdepth && depth && depth > @maxdepth
+            next
           end
 
-          # Add directories back onto the list of paths to search unless
-          # they've already been added
-          #
-          if stat_info.directory? && !paths.include?(file)
-            queue << file
+          if @mindepth && depth && depth < @mindepth
+            next
           end
 
-          next unless File.fnmatch?(@name, File.basename(file))
+          # For directories, always traverse but only yield if name matches
+          # For regular files, we already checked name above
+          next if stat_info.directory? && !matches_name
 
           if !@filetest.empty? && !@filetest.all? { |meth, bool| File.send(meth, file) == bool }
             next

data/spec/file_find_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe File::Find do
 
   context 'constants', :constants do
     example 'version constant is set to expected value' do
-      expect(File::Find::VERSION).to eq('0.5.2')
+      expect(File::Find::VERSION).to eq('0.5.3')
       expect(File::Find::VERSION).to be_frozen
     end
   end
@@ -336,19 +336,16 @@ RSpec.describe File::Find do
     end
 
     example 'find with maxdepth 2 returns expected results' do
-      pending if windows
       rule.maxdepth = 2
       expect(rule.find.map{ |e| File.basename(e) }).to eq(['a.foo'])
     end
 
     example 'find with maxdepth 3 returns expected results' do
-      pending if windows
       rule.maxdepth = 3
       expect(rule.find.map{ |e| File.basename(e) }).to contain_exactly('a.foo', 'b.foo', 'c.foo')
     end
 
     example 'find with nil maxdepth option returns everything' do
-      pending if windows
       rule.maxdepth = nil
       results = ['a.foo', 'b.foo', 'c.foo', 'd.foo', 'e.foo', 'f.foo']
       expect(rule.find.map{ |e| File.basename(e) }).to match_array(results)
@@ -367,7 +364,6 @@ RSpec.describe File::Find do
     end
 
     example 'find with maxdepth 3 returns expected results for directories' do
-      pending if windows
       rule.pattern = 'a3'
       rule.maxdepth = 3
       expect(rule.find.map{ |e| File.basename(e) }).to eq(['a3'])
@@ -399,35 +395,30 @@ RSpec.describe File::Find do
     end
 
     example 'find with mindepth option returns expected results at depth 0' do
-      pending if windows
       rule.mindepth = 0
       array = ['a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min', 'z.min']
       expect(rule.find.map{ |e| File.basename(e) }).to match_array(array)
     end
 
     example 'find with mindepth option returns expected results at depth 1' do
-      pending if windows
       rule.mindepth = 1
       array = ['a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min', 'z.min']
       expect(rule.find.map{ |e| File.basename(e) }).to match_array(array)
     end
 
     example 'find with mindepth option returns expected results at depth 2' do
-      pending if windows
       rule.mindepth = 2
       array = ['a.min', 'b.min', 'c.min', 'd.min', 'e.min', 'f.min']
       expect(rule.find.map{ |e| File.basename(e) }).to match_array(array)
     end
 
     example 'find with mindepth option returns expected results at depth 3' do
-      pending if windows
       rule.mindepth = 3
       array = ['b.min', 'c.min', 'd.min', 'e.min', 'f.min']
       expect(rule.find.map{ |e| File.basename(e) }).to match_array(array)
     end
 
     example 'find with mindepth option returns expected results at depth 4' do
-      pending if windows
       rule.mindepth = 4
       array = ['d.min', 'e.min', 'f.min']
       expect(rule.find.map{ |e| File.basename(e) }).to match_array(array)
@@ -583,7 +574,6 @@ RSpec.describe File::Find do
     end
 
     example 'user method works with string as expected' do
-      pending if windows # TODO: Get this working on Windows
       skip 'user example skipped on Mac in CI' if macos && ENV['CI']
 
       skip if windows && elevated

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file-find
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Daniel Berger