fakefs 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf14d547bbdb7ed5fa1ac7a10d5a875dd265c62e91c520b4da97ceb30046f60
-  data.tar.gz: c08a6cd7a05a4f787bb4b2d1c3871c13a8687af50729e1e735ac4fae6575b014
+  metadata.gz: 0b40516abdee28793eb6152f979b453e79ed3dfd42c205e65f500efca0bded1f
+  data.tar.gz: 249b21fc04c49b15cf5f81e5a1497bdb957749d78261337490308f2fa1bb756a
 SHA512:
-  metadata.gz: 53512a81bcf2e8b22c43abec8989cef5490bfc69341fe63fd2cada07cd74447fcb26a135e2d0907a7bd29bf10dd072d53d6b87d1fc932edf7bcd139b6b2bcec6
-  data.tar.gz: 1b4902e37c4fcd567ca90f1b98074c03b213b6d69206b1099c1f6cd5f97bf09402be7413f274cf9c02539dd1b135b72dbf9cde2ebc5c973b12200a058455f3b8
+  metadata.gz: 54376515f03734c2058dcc29733830dae79882dc235042a15bf2bfde1d6256f0eb373c85ae2408118c3f32bec00730cb7a2304225149c97a2d3a44cfe8b0a2ee
+  data.tar.gz: 2e15d1c5e506602d955bbcadc7b890946f133949a65e20327dd5bac5995fa6e69fc296750fd2dd3fe1e5b219e04f69a8f8f2cf9a528f63fe8971192e7c614aa8

data/lib/fakefs/dir.rb

@@ -37,6 +37,10 @@ module FakeFS
       end
     end
 
+    def children
+      each.to_a
+    end
+
     def pos
       @pointer
     end
@@ -96,9 +100,11 @@ module FakeFS
     end
 
     def self.each_child(dirname, &_block)
-      Dir.open(dirname) do |file|
-        next if ['.', '..'].include?(file)
-        yield file
+      Dir.open(dirname) do |dir|
+        dir.each do |file|
+          next if ['.', '..'].include?(file)
+          yield file
+        end
       end
     end
 
@@ -114,13 +120,17 @@ module FakeFS
     end
 
     def self.foreach(dirname, &_block)
-      Dir.open(dirname) { |file| yield file }
+      Dir.open(dirname) do |dir|
+        dir.each do |file|
+          yield file
+        end
+      end
     end
 
     def self.glob(pattern, _flags = 0, flags: _flags, base: nil, &block) # rubocop:disable Lint/UnderscorePrefixedVariableName
       pwd = FileSystem.normalize_path(base || Dir.pwd)
       matches_for_pattern = lambda do |matcher|
-        [FileSystem.find(matcher, flags, true, dir: pwd) || []].flatten.map do |e|
+        [FileSystem.find_with_glob(matcher, flags, true, dir: pwd) || []].flatten.map do |e|
           pwd_regex = %r{\A#{pwd.gsub('+') { '\+' }}/?}
           if pwd.match(%r{\A/?\z}) ||
              !e.to_s.match(pwd_regex)
@@ -152,10 +162,13 @@ module FakeFS
     end
 
     def self.open(string, &_block)
+      dir = Dir.new(string)
       if block_given?
-        Dir.new(string).each { |file| yield(file) }
+        result = yield(dir)
+        dir.close
+        result
       else
-        Dir.new(string)
+        dir
       end
     end
 

data/lib/fakefs/file_system.rb

@@ -20,13 +20,22 @@ module FakeFS
       fs.entries
     end
 
-    def find(path, find_flags = 0, gave_char_class = false, dir: nil)
+    # Finds files/directories using the exact path, without expanding globs.
+    def find(path, dir: nil)
+      parts = path_parts(normalize_path(path, dir: dir))
+      return fs if parts.empty? # '/'
+
+      find_recurser(fs, parts)
+    end
+
+    # Finds files/directories expanding globs.
+    def find_with_glob(path, find_flags = 0, gave_char_class = false, dir: nil)
       parts = path_parts(normalize_path(path, dir: dir))
       return fs if parts.empty? # '/'
 
       entries = Globber.expand(path).flat_map do |pattern|
         parts = path_parts(normalize_path(pattern, dir: dir))
-        find_recurser(fs, parts, find_flags, gave_char_class).flatten
+        find_with_glob_recurser(fs, parts, find_flags, gave_char_class).flatten
       end
 
       case entries.length
@@ -120,6 +129,18 @@ module FakeFS
     private
 
     def find_recurser(dir, parts, find_flags = 0, gave_char_class = false)
+      return nil unless dir.respond_to? :[]
+      head, *parts = parts
+      match = dir.entries.find { |e| e.name == head }
+
+      if parts.empty? # we're done recursing
+        match
+      else
+        find_recurser(match, parts, find_flags, gave_char_class)
+      end
+    end
+
+    def find_with_glob_recurser(dir, parts, find_flags = 0, gave_char_class = false)
       return [] unless dir.respond_to? :[]
       pattern, *parts = parts
       matches =
@@ -149,7 +170,7 @@ module FakeFS
       if parts.empty? # we're done recursing
         matches
       else
-        matches.map { |entry| find_recurser(entry, parts, find_flags, gave_char_class) }
+        matches.map { |entry| find_with_glob_recurser(entry, parts, find_flags, gave_char_class) }
       end
     end
 

data/lib/fakefs/fileutils.rb

@@ -232,7 +232,7 @@ module FakeFS
       list = Array(list)
       list.each do |file|
         chown(user, group, file)
-        [FileSystem.find("#{file}/**/**")].flatten.each do |f|
+        [FileSystem.find_with_glob("#{file}/**/**")].flatten.each do |f|
           chown(user, group, f.to_s)
         end
       end
@@ -255,7 +255,7 @@ module FakeFS
       list = Array(list)
       list.each do |file|
         chmod(mode, file)
-        [FileSystem.find("#{file}/**/**")].flatten.each do |f|
+        [FileSystem.find_with_glob("#{file}/**/**")].flatten.each do |f|
           chmod(mode, f.to_s)
         end
       end

data/lib/fakefs/version.rb

@@ -1,7 +1,7 @@
 module FakeFS
   # Version module
   module Version
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.3.0'.freeze
 
     def self.to_s
       VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakefs
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump