fakefs 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8bd326fd88f546556eaca2194662454a12234d2da597e8002a663e5dba757cb
-  data.tar.gz: c70378d690483115a4419f80d11a5775b0848c7fd2a2ceaec098f07b4196d6c5
+  metadata.gz: b92c729c5ace776ebe3f2b5f396532b900f15997884de6239d67d9d41e21d16e
+  data.tar.gz: b331cf5fcafafd27e677c96386670099998acb126fbe84beb81774ff32e04a85
 SHA512:
-  metadata.gz: cf22c7d97a54dbc02f382ba3ee7feb75673e792340336446816411bbae4b04886d9b1b7587a4230aee0c0f12ff64ad42102d4e3369dad223c3d27444b63f34b6
-  data.tar.gz: 96077a4735d8a880bb8073e5abc2c8869a99b688b18082253f0eb026800c11df7dcdb139a0e22be2e6993b1caadf86b12adb76eadd2dfd20c4ea2877b1cc39db
+  metadata.gz: 9325e6abc81df8f759d9898e0946432f7ef6f1f554d26d0d231663340f6dba9363ae1dc065a8bb91645c2d266a528002ca3be8eebece8579a0e02cba3b9b716e
+  data.tar.gz: 94457dccf10cff791ff60061b72994143fd3bd7771d71f48a90591709a0825439c852ad166f4212616f0476bca7bbc632f00e1bc77ed64700796a0f46b90c772

data/lib/fakefs/dir.rb

@@ -117,14 +117,16 @@ module FakeFS
       Dir.open(dirname) { |file| yield file }
     end
 
-    def self.glob(pattern, flags = 0, &block)
+    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) || []].flatten.map do |e|
-          if Dir.pwd.match(%r{\A/?\z}) ||
-             !e.to_s.match(%r{\A#{Dir.pwd}/?})
+        [FileSystem.find(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)
             e.to_s
           else
-            e.to_s.match(%r{\A#{Dir.pwd}/?}).post_match
+            e.to_s.match(pwd_regex).post_match
           end
         end.sort
       end

data/lib/fakefs/file_system.rb

@@ -20,12 +20,12 @@ module FakeFS
       fs.entries
     end
 
-    def find(path, find_flags = 0, gave_char_class = false)
-      parts = path_parts(normalize_path(path))
+    def find(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))
+        parts = path_parts(normalize_path(pattern, dir: dir))
         find_recurser(fs, parts, find_flags, gave_char_class).flatten
       end
 
@@ -100,11 +100,13 @@ module FakeFS
       Globber.path_components(path)
     end
 
-    def normalize_path(path)
+    def normalize_path(path, dir: nil)
       if Pathname.new(path).absolute?
         RealFile.expand_path(path)
       else
-        parts = dir_levels + [path]
+        dir ||= dir_levels
+        dir = Array(dir)
+        parts = dir + [path]
         RealFile.expand_path(parts.reduce do |base, part|
                                Pathname(base) + part
                              end.to_s)

data/lib/fakefs/globber.rb

@@ -63,20 +63,21 @@ module FakeFS
     def regexp(pattern, find_flags = 0, gave_char_class = false)
       pattern = pattern.to_s
 
+      # Escape .+?*()$ characters unless already escaped.
       regex_body =
         pattern
-        .gsub('.', '\.')
-        .gsub('+') { '\+' }
-        .gsub('?', '.')
-        .gsub('*', '.*')
-        .gsub('(', '\(')
-        .gsub(')', '\)')
-        .gsub('$', '\$')
-
-      # unless we're expecting character class contructs in regexes, escape all brackets
-      # since if we're expecting them, the string should already be properly escaped
+        .gsub(/(?<!\\)\./, '\.')
+        .gsub(/(?<!\\)\+/) { '\+' }
+        .gsub(/(?<!\\)\?/, '.')
+        .gsub(/(?<!\\)\*/, '.*')
+        .gsub(/(?<!\\)\(/, '\(')
+        .gsub(/(?<!\\)\)/, '\)')
+        .gsub(/(?<!\\)\$/, '\$')
+
+      # Unless we're expecting character class contructs in regexes, escape all brackets
+      # since if we're expecting them, the string should already be properly escaped.
       unless gave_char_class
-        regex_body = regex_body.gsub('[', '\[').gsub(']', '\]')
+        regex_body = regex_body.gsub(/(?<!\\)([\[\]])/, '\\\\\1')
       end
 
       # This matches nested braces and attempts to do something correct most of the time

data/lib/fakefs/pathname.rb

@@ -909,11 +909,11 @@ module FakeFS
   # Pathname class
   class Pathname # * Dir *
     # See <tt>Dir.glob</tt>.  Returns or yields Pathname objects.
-    def self.glob(*args) # :yield: pathname
+    def self.glob(*args, **opts) # :yield: pathname
       if block_given?
-        Dir.glob(*args) { |f| yield new(f) }
+        Dir.glob(*args, **opts) { |f| yield new(f) }
       else
-        Dir.glob(*args).map { |f| new(f) }
+        Dir.glob(*args, **opts).map { |f| new(f) }
       end
     end
 
@@ -953,6 +953,14 @@ module FakeFS
     def opendir(&block) # :yield: dir
       Dir.open(@path, &block)
     end
+
+    def glob(pattern, flags = 0)
+      if block_given?
+        Dir.glob(pattern, flags: flags, base: self) { |f| yield join(f) }
+      else
+        Dir.glob(pattern, flags: flags, base: self).map { |f| join(f) }
+      end
+    end
   end
 
   # Pathname class
@@ -1027,6 +1035,6 @@ module FakeFS
 
   # Pathname class
   class Pathname
-    undef =~
+    undef =~ if respond_to?(:=~)
   end
 end

data/lib/fakefs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakefs
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A fake filesystem. Use it in your tests.