file-find 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a005f38ff57e7ecba774576e6d8d8c005a386b50ec65197c4047cdd156d876
-  data.tar.gz: 50c000e4e15dd13bdab23fc396d0062ccc5392efd808036cc3df0a512f6ced50
+  metadata.gz: 0febb67274c45e862fa242e53bda0d97895817bf6ff98fd055f769afaa5d0e60
+  data.tar.gz: 20a42458a0f3b70e7bdffc6afd446be9b70e7417197ebbd3e4c9c1302d473559
 SHA512:
-  metadata.gz: '09d5c030c2312a89f03c21a69578ab08d437890151f943f37ebcf27cd62d51fb42694f833605207afbf8c2e6aeb2a7d852f9373a6bc251b5336d0933b6a0f082'
-  data.tar.gz: c2c7b029ba2fdf2ea2760e84ee5600ef5fa1670922d01924773688854edb9a7e2eee6b32581c25861ff5095c984c53ec86ffa54e7f4b71a3fda73d7dca732a26
+  metadata.gz: 51cabd736d8aeb6c35cd1e7bb38de0ee4ccd96a79ccbe0b9a08a657e69d0d9250afc1e7680986721de5cd33f20ff459bd3afbff9e47c0960d4b47b666a02bc00
+  data.tar.gz: 6ec15535aa08d5f78f81decbf7678f0c05f6ebd8978b5bb3eaef83c3fa315ed6414d696458008d1d2832bb3413747a0a21a0882f56019602064f859a8a82d0d4

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-�U�w�!W�A�����	�I�K�(�kG�/�5С��[4yeW��}��,Va�a=�@�0�����\�yU%,��$��f_HA��c�ʣ��u�nu7��.��M���4{�@��{ed/�3��D�r�iq�b�f�X+�����^�� �����e���e���,��'�a�c��yU�a�(�g�e���2#���!B�d�F��vr�����Fod�~�˜��܇C	,�DJjAW�]��,w�|�s�ֶHf'����+x�_ݼX���Ҷ��h�
-)�f�Y_C�4��#a���a'|%*�C
iimuƄhz
+����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,19 @@
+## 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.
+* Added a github workflow matrix to the repo.
+* Added a rubocop config to the repo.
+* Minor tweaks to the Rakefile.
+* Added more information to the README.
+
 ## 0.5.0 - 19-Jan-2021
 * Switched from test-unit to rspec, with an added development
   dependency on the fakefs gem.

data/Gemfile

@@ -1,3 +1,2 @@
-source 'https://rubygems.org' do
-  gemspec
-end
+source 'https://rubygems.org'
+gemspec

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/README.md

@@ -1,3 +1,5 @@
+[![Ruby](https://github.com/djberg96/file-find/actions/workflows/ruby.yml/badge.svg)](https://github.com/djberg96/file-find/actions/workflows/ruby.yml)
+
 ## Description
 
 This is a drop-in replacement for the find module currently in the standard
@@ -7,6 +9,14 @@ library. It is modeled on a typical 'find' command found on most Unix systems.
 
 `gem install file-find`
 
+## Specs
+
+Although this gem will work with Ruby 2.x or 3.x, you will need Ruby 3.x to
+run the specs locally because of development dependencies.
+
+## Adding the trusted cert
+`gem cert --add <(curl -Ls https://raw.githubusercontent.com/djberg96/file-find/main/certs/djberg96_pub.pem)`
+
 ## Synopsis
 ```ruby
   require 'file/find' # 'file-find' also works
@@ -82,6 +92,9 @@ The `:perm` option is limited to 0644 and 0444 on MS Windows.
 The `:user`, `:group`, and `:inum` options require the win32-file gem to work
 properly on MS Windows. However, win32-file is not officially a dependency.
 
+Some specs on Windows are marked pending for now because there's some issue
+interacting with the FakeFS gem on Windows.
+
 ## Bugs
 
 None that I'm aware of beyond the ones mentioned in the Known Issues. Please
@@ -102,7 +115,7 @@ Apache-2.0
 
 ## Copyright
 
-(C) 2007-2021, Daniel J. Berger, All Rights Reserved
+(C) 2007-2025, Daniel J. Berger, All Rights Reserved
 
 ## Author
 

data/Rakefile

@@ -1,16 +1,17 @@
 require 'rake'
 require 'rake/clean'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-CLEAN.include("**/*.gem", "**/*.rbc", "**/link*")
+CLEAN.include("**/*.gem", "**/*.rbc", "**/link*", "*.lock")
 
 namespace :gem do
   desc 'Create the file-find gem'
   task :create => [:clean] do
     require 'rubygems/package'
-    spec = eval(IO.read('file-find.gemspec'))
+    spec = Gem::Specification.load('file-find.gemspec')
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
-    Gem::Package.build(spec, true)
+    Gem::Package.build(spec)
   end
 
   desc "Install the file-find gem"
@@ -21,8 +22,16 @@ namespace :gem do
   end
 end
 
+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
+Rake::Task[:spec].enhance do
+  Rake::Task[:clean].invoke
 end
 
 task :default => :spec

data/file-find.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'file-find'
-  spec.version    = '0.5.0'
+  spec.version    = '0.5.2'
   spec.author     = 'Daniel Berger'
   spec.license    = 'Apache-2.0'
   spec.summary    = 'A better way to find files'
@@ -13,18 +13,24 @@ Gem::Specification.new do |spec|
   spec.cert_chain = Dir['certs/*']
 
   spec.metadata = {
-    'homepage_uri'      => 'https://github.com/djberg96/file-find',
-    'bug_tracker_uri'   => 'https://github.com/djberg96/file-find/issues',
-    'changelog_uri'     => 'https://github.com/djberg96/file-find/blob/master/CHANGES.md',
-    'documentation_uri' => 'https://github.com/djberg96/file-find/wiki',
-    'source_code_uri'   => 'https://github.com/djberg96/file-find',
-    'wiki_uri'          => 'https://github.com/djberg96/file-find/wiki'
+    'homepage_uri'          => 'https://github.com/djberg96/file-find',
+    'bug_tracker_uri'       => 'https://github.com/djberg96/file-find/issues',
+    'changelog_uri'         => 'https://github.com/djberg96/file-find/blob/main/CHANGES.md',
+    'documentation_uri'     => 'https://github.com/djberg96/file-find/wiki',
+    'source_code_uri'       => 'https://github.com/djberg96/file-find',
+    'wiki_uri'              => 'https://github.com/djberg96/file-find/wiki',
+    'rubygems_mfa_required' => 'true',
+    'github_repo'           => 'https://github.com/djberg96/file-find',
+    'funding_uri'           => 'https://github.com/sponsors/djberg96'
   }
 
   spec.add_dependency('sys-admin', '~> 1.7')
   spec.add_development_dependency('rspec', '~> 3.9')
-  spec.add_development_dependency('fakefs', '~> 1.3')
+  spec.add_development_dependency('fakefs', '~> 3.0')
   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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'sys/admin'
 
@@ -7,9 +9,11 @@ rescue LoadError
   # Do nothing, not required, just nicer.
 end
 
+# The File::Find class encapsulates 'rules' that you create and use to find
+# files on your filesystem.
 class File::Find
   # The version of the file-find library
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.2'
 
   # :stopdoc:
   VALID_OPTIONS = %w[
@@ -31,7 +35,7 @@ class File::Find
     prune
     size
     user
-  ]
+  ].freeze
   # :startdoc:
 
   # The starting path(s) for the search. The default is the current directory.
@@ -107,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
 
@@ -208,7 +212,8 @@ 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
       prune_regex = Regexp.new(@prune)
@@ -216,19 +221,22 @@ class File::Find
       prune_regex = nil
     end
 
-    paths.each{ |path|
+    # rubocop:disable Metrics/BlockLength
+    until queue.empty?
+      path = queue.shift
       begin
-        Dir.foreach(path){ |file|
+        Dir.foreach(path) do |file|
           next if file == '.'
           next if file == '..'
 
-          if prune_regex
-            next if prune_regex.match(file)
+          if prune_regex && prune_regex.match(file)
+            next
           end
 
           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)
@@ -241,48 +249,27 @@ 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
-            next unless stat_info.dev == @filesystem
-          end
-
-          if @links
-            next unless stat_info.nlink == @links
-          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{ |e| e.size.zero? }.length
+            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
 
-            if @maxdepth && (depth > @maxdepth)
-              if File.directory?(file)
-                unless paths.include?(file) && depth > @maxdepth
-                  paths << file
-                end
+            if @maxdepth && depth > @maxdepth
+              if stat_info.directory? && !paths.include?(file)
+                queue << file
               end
-
               next
             end
 
-            if @mindepth && (depth < @mindepth)
-              if File.directory?(file)
-                unless paths.include?(file) && depth < @mindepth
-                  paths << file
-                end
+            if @mindepth && depth < @mindepth
+              if stat_info.directory? && !paths.include?(file)
+                queue << file
               end
-
               next
             end
           end
@@ -290,50 +277,24 @@ class File::Find
           # Add directories back onto the list of paths to search unless
           # they've already been added
           #
-          if stat_info.directory?
-            paths << file unless paths.include?(file)
+          if stat_info.directory? && !paths.include?(file)
+            queue << file
           end
 
-          next unless Dir[glob].include?(file)
-
-          unless @filetest.empty?
-            file_test = true
+          next unless File.fnmatch?(@name, File.basename(file))
 
-            @filetest.each{ |array|
-              meth = array[0]
-              bool = array[1]
-
-              unless File.send(meth, file) == bool
-                file_test = false
-                break
-              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
-            next unless File.ftype(file) == @ftype
-          end
+          next if @ftype && stat_info.ftype != @ftype
 
           if @group
             if @group.is_a?(String)
@@ -355,8 +316,8 @@ class File::Find
             end
           end
 
-          if @inum
-            next unless stat_info.ino == @inum
+          if @inum && stat_info.ino != @inum
+            next
           end
 
           # Note that only 0644 and 0444 are supported on MS Windows.
@@ -365,7 +326,7 @@ class File::Find
               octal_perm = sym2oct(@perm)
               next unless stat_info.mode & octal_perm == octal_perm
             else
-              next unless sprintf("%o", stat_info.mode & 07777) == sprintf("%o", @perm)
+              next unless format('%o', stat_info.mode & 07777) == format('%o', @perm)
             end
           end
 
@@ -415,11 +376,12 @@ class File::Find
           end
 
           @previous = file unless @previous == file
-        }
+        end
       rescue Errno::EACCES
         next # Skip inaccessible directories
       end
-    }
+    end
+    # rubocop:enable Metrics/BlockLength
 
     block_given? ? nil : results
   end
@@ -476,17 +438,17 @@ class File::Find
       match = cmd.match(regex)
       raise "Invalid symbolic permissions: '#{str}'" if match.nil?
 
-      who, what, how = match.to_a[1..-1]
+      who, what, how = match.to_a[1..]
 
-      who  = who.split(//).inject(0){ |num,b| num |= left[b]; num }
-      how  = how.split(//).inject(0){ |num,b| num |= right[b]; num }
+      who  = who.chars.inject(0){ |num, b| num | left[b] }
+      how  = how.chars.inject(0){ |num, b| num | right[b] }
       mask = who & how
 
       case what
         when '+'
-          perm = perm | mask
+          perm |= mask
         when '-'
-          perm = perm & ~mask
+          perm &= ~mask
         when '='
           perm = mask
       end

data/lib/file-find.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'file/find'