file-find 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b89ade1ff89a891f6aa2a44fa801fa9d2758b3784074f8868a5b3319dc68a5
-  data.tar.gz: 52f17946eb45f73bd98b0804a9696e5e4d7c2f17d9ea002a20fa109fde7e10f3
+  metadata.gz: 0febb67274c45e862fa242e53bda0d97895817bf6ff98fd055f769afaa5d0e60
+  data.tar.gz: 20a42458a0f3b70e7bdffc6afd446be9b70e7417197ebbd3e4c9c1302d473559
 SHA512:
-  metadata.gz: e6d0e1a56de403c2e7327f2d9af3ec6c68528d53f0cb0b83e40362b1ab8dddda020212cc726428ea0791130c098c1a41f53f22a65fad314d8dd9fee05fdc7fa3
-  data.tar.gz: 6c68a1b0e85905844b44feb04036834bb39e3ccaff5b732bb64d6280bb3eb86248f92f74570e60d37704fbc4d42ea4f99f2406c6d4be61ce7c9a8e3f89f1f1bb
+  metadata.gz: 51cabd736d8aeb6c35cd1e7bb38de0ee4ccd96a79ccbe0b9a08a657e69d0d9250afc1e7680986721de5cd33f20ff459bd3afbff9e47c0960d4b47b666a02bc00
+  data.tar.gz: 6ec15535aa08d5f78f81decbf7678f0c05f6ebd8978b5bb3eaef83c3fa315ed6414d696458008d1d2832bb3413747a0a21a0882f56019602064f859a8a82d0d4

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-]����j
��]i�<ǝ�ٲ�Ԕ�X�|sN��l�!ʋ��TT�%wtF�W�8�g�s�]����Էâ�g�Z
!1y`���|���."qe'V�?���$W�n���)��RNf�ʍ��ޠ�2���qiN�6_��Si^/q��A?�~��Θ����=$�O�"���-���VB���$����|�����xc����פ6h�WZnc��{�P���ܲ0��w����N]�/:ݧ%����:�ω�#��O��.�X�D2+��o`V��9�D؀.㫐���>d���p�_2@t�6�ԧ���S·�=�ea1$-T��3|_��woP��BJ��g|�P�x�au��l���a�T�3��5�x.��5��_�
+����8�۵��
+x�'�^g���V
�t/��o�T���6�H�AềQ\.��ح�ڴ��M�4`9�D�cY�q���4�a�Aaʝ64S3"�r�l��얜�Oz���M�c���P�q�M�L/I�k���	�N������b����nO���!�{���ԗ�l�T���%�MT����麅�L�lv���ŷ�_���4�/�w�H������qi�
��Ju�4jL��i�
+�g��_�e�r�ӳ���ӑn�@����'P���KV�V�oL�K�n��ն+���

data/CHANGES.md

@@ -1,3 +1,11 @@
+## 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.
+* Minor refactoring improvement for ftype check.
+* Minor refactoring improvement for filetest check.
+* Added MacOS and FreeBSD to the test matrix.
+* The specs now run in documentation mode by default.
+
 ## 0.5.1 - 17-Jun-2025
 * Updated, fixed or skipped some specs on Windows.
 * Some rubocop cleanup and minor refactors.

data/MANIFEST.md

@@ -8,4 +8,4 @@
 * certs/djberg96_pub.pem
 * lib/file-find.rb
 * lib/file/find.rb
-* test/test_file_find.rb
+* spec/file_find_spec.rb

data/Rakefile

@@ -26,6 +26,7 @@ RuboCop::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = ['spec/file_find_spec.rb']
+  t.rspec_opts = '-f documentation'
 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.1'
+  spec.version    = '0.5.2'
   spec.author     = 'Daniel Berger'
   spec.license    = 'Apache-2.0'
   spec.summary    = 'A better way to find files'
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rubocop')
   spec.add_development_dependency('rubocop-rspec')
+  spec.add_development_dependency('sys-uname')
 
   spec.description = <<-EOF
     The file-find library provides a better, more object oriented approach

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.1'
+  VERSION = '0.5.2'
 
   # :stopdoc:
   VALID_OPTIONS = %w[
@@ -111,7 +111,7 @@ class File::Find
   attr_accessor :mtime
 
   # The name pattern used to limit file searches. The patterns that are legal
-  # for Dir.glob are legal here. The default is '*', i.e. everything.
+  # for File.fnmatch are legal here. The default is '*', i.e. everything.
   #
   attr_accessor :name
 
@@ -212,7 +212,7 @@ class File::Find
   #
   def find
     results = [] unless block_given?
-    paths   = @path.is_a?(String) ? [@path] : @path # Ruby 1.9.x compatibility
+    paths   = Array(@path)
     queue   = paths.dup
 
     if @prune
@@ -236,6 +236,7 @@ class File::Find
           file = File.join(path, file)
 
           stat_method = @follow ? :stat : :lstat
+
           # Skip files we cannot access, stale links, etc.
           begin
             stat_info = File.send(stat_method, file)
@@ -248,23 +249,8 @@ class File::Find
             end
           end
 
-          # We need to escape any brackets in the directory name, unless already escaped.
-          temp = File.dirname(file).gsub(/(?<!\\)([\[\]])/, '\\\\\1')
-          glob = File.join(temp, @name)
-
-          # Dir[] doesn't like backslashes
-          if File::ALT_SEPARATOR
-            file.tr!(File::ALT_SEPARATOR, File::SEPARATOR)
-            glob.tr!(File::ALT_SEPARATOR, File::SEPARATOR)
-          end
-
-          if @mount && stat_info.dev != @filesystem
-            next
-          end
-
-          if @links && stat_info.nlink != @links
-            next
-          end
+          next if @mount && stat_info.dev != @filesystem
+          next if @links && stat_info.nlink != @links
 
           if @maxdepth || @mindepth
             file_depth = file.split(File::SEPARATOR).reject(&:empty?).length
@@ -273,15 +259,15 @@ class File::Find
 
             depth = file_depth - path_depth
 
-            if @maxdepth && (depth > @maxdepth)
-              if File.directory?(file) && !(paths.include?(file) && depth > @maxdepth)
+            if @maxdepth && depth > @maxdepth
+              if stat_info.directory? && !paths.include?(file)
                 queue << file
               end
               next
             end
 
-            if @mindepth && (depth < @mindepth)
-              if File.directory?(file) && !(paths.include?(file) && depth < @mindepth)
+            if @mindepth && depth < @mindepth
+              if stat_info.directory? && !paths.include?(file)
                 queue << file
               end
               next
@@ -295,46 +281,20 @@ class File::Find
             queue << file
           end
 
-          next unless Dir[glob].include?(file)
+          next unless File.fnmatch?(@name, File.basename(file))
 
-          unless @filetest.empty?
-            file_test = true
-
-            @filetest.each do |array|
-              meth = array[0]
-              bool = array[1]
-
-              unless File.send(meth, file) == bool
-                file_test = false
-                break
-              end
-            end
-
-            next unless file_test
+          if !@filetest.empty? && !@filetest.all? { |meth, bool| File.send(meth, file) == bool }
+            next
           end
 
           if @atime || @ctime || @mtime
-            date1 = Date.parse(Time.now.to_s)
-
-            if @atime
-              date2 = Date.parse(stat_info.atime.to_s)
-              next unless (date1 - date2).numerator == @atime
-            end
-
-            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
+            now = Date.today
+            next if @atime && (now - stat_info.atime.to_date).to_i != @atime
+            next if @ctime && (now - stat_info.ctime.to_date).to_i != @ctime
+            next if @mtime && (now - stat_info.mtime.to_date).to_i != @mtime
           end
 
-          if @ftype && File.ftype(file) != @ftype
-            next
-          end
+          next if @ftype && stat_info.ftype != @ftype
 
           if @group
             if @group.is_a?(String)

data/spec/file_find_spec.rb

@@ -9,6 +9,7 @@
 require 'rspec'
 require 'file-find'
 require 'sys-admin'
+require 'sys-uname'
 require 'tmpdir'
 require 'pp' # Goofy workaround for FakeFS bug
 require 'fakefs/spec_helpers'
@@ -16,23 +17,24 @@ require 'fakefs/spec_helpers'
 RSpec.describe File::Find do
   include FakeFS::SpecHelpers
 
-  let(:windows)    { File::ALT_SEPARATOR }
-  let(:elevated)   { windows and Win32::Security.elevated_security? }
-  let(:ruby_file)  { 'file_find_test.rb' }
-  let(:doc_file)   { 'file_find_test.doc' }
+  let(:windows)   { Sys::Platform.windows? }
+  let(:macos)     { Sys::Platform.mac? }
+  let(:elevated)  { windows and Win32::Security.elevated_security? }
+  let(:ruby_file) { 'file_find_test.rb' }
+  let(:doc_file)  { 'file_find_test.doc' }
 
   let(:rule) { described_class.new }
   let(:txt_rule) { described_class.new(:name => '*.txt') }
 
   before(:all) do
     @loguser = Sys::Admin.get_user(Sys::Admin.get_login)
-    group = File::ALT_SEPARATOR ? 'Users' : @loguser.gid
+    group = Sys::Platform.windows? ? 'Users' : @loguser.gid
     @logroup = Sys::Admin.get_group(group)
   end
 
   context 'constants', :constants do
     example 'version constant is set to expected value' do
-      expect(File::Find::VERSION).to eq('0.5.1')
+      expect(File::Find::VERSION).to eq('0.5.2')
       expect(File::Find::VERSION).to be_frozen
     end
   end
@@ -209,6 +211,8 @@ RSpec.describe File::Find do
     # TODO: Update example for Windows
     example 'find with numeric group id works as expected' do
       skip 'group example skipped on MS Windows' if windows
+      skip 'group example skipped on Mac in CI' if macos && ENV['CI']
+
       rule = described_class.new(:name => '*.doc', :group => @loguser.gid)
       expect(rule.find).to eq([File.expand_path(doc_file)])
     end
@@ -216,6 +220,7 @@ RSpec.describe File::Find do
     # TODO: Update example for Windows
     example 'find with string group id works as expected' do
       skip 'group example skipped on MS Windows' if windows
+      skip 'group example skipped on Mac in CI' if macos && ENV['CI']
 
       rule = described_class.new(:name => '*.doc', :group => @logroup.name)
       expect(rule.find).to eq([File.expand_path(doc_file)])
@@ -269,7 +274,7 @@ RSpec.describe File::Find do
     end
 
     example 'links method returns expected result' do
-      skip if windows && !elevated
+      skip if windows # && !elevated # TODO: Adjust for drive letter.
 
       rule1 = described_class.new(:name => '*.rb', :links => 2)
       rule2 = described_class.new(:name => '*.doc', :links => 1)
@@ -565,6 +570,7 @@ RSpec.describe File::Find do
 
     example 'user method works with numeric id as expected' do
       pending if windows # TODO: Get this working on Windows
+      skip 'user example skipped on Mac in CI' if macos && ENV['CI']
 
       if windows && elevated
         uid = @loguser.gid # Windows assigns the group if any member is an admin
@@ -578,6 +584,7 @@ RSpec.describe File::Find do
 
     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
       rule = described_class.new(:name => '*.doc', :user => @loguser.name)

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: file-find
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Daniel Berger
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2025-06-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-admin
@@ -121,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-uname
+  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'
 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
@@ -155,7 +168,6 @@ metadata:
   rubygems_mfa_required: 'true'
   github_repo: https://github.com/djberg96/file-find
   funding_uri: https://github.com/sponsors/djberg96
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A better way to find files
 test_files: