fakefs 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05aa1f68c0f9298802a4171ba6b109e53cb2e020b9b6f2973872ce4cc4de6ce1
-  data.tar.gz: 566bdaeab08f35a081857a4a76170c6b94f29bf928735f81470a19e4280297e4
+  metadata.gz: e62fc76c0ca1c48b09e7b4051d5888a3f361b7f6e72434275bf3820d972c05d0
+  data.tar.gz: fc2e3377b5948b04302f06893fd4b961311699c597dfe431a9ab04046b488d67
 SHA512:
-  metadata.gz: 25dd82ac5d99560aee6642ee5faea80ee35cf0b70610d6b1f7b3e4cd7369c78f9acf9fce6567ad4ae0409c82e388917a220f4acc2637875768df486127491cf9
-  data.tar.gz: 8d087e11e9c7ba065bf07b4cff4ff51011ecf903fd830aa5ec51d8dcb2c18ded53c3cfbf38cc8226f7d4f46590bc3868fa902bfcc2011c1e19c1586868a920eb
+  metadata.gz: 3c43a34b04c1d010a783da8646dfff11d50892a15faa5660730e9d284b046dfdf921adbcaff550ca0b2a25bbc5537060b457f37e11c7d64aa6bb7271cd8975ae
+  data.tar.gz: e0523fab127204c4400921d2e1bc6bdbf8ed6c61b8c731707d92b8fa916e1c7320290c18546168bee757888dfd2ae3ad5953cb1b55557e9e5f40997428cb66d4

data/lib/fakefs/dir.rb

@@ -117,10 +117,10 @@ 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|
-          pwd = 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)

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/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

data/lib/fakefs/version.rb

@@ -1,7 +1,7 @@
 module FakeFS
   # Version module
   module Version
-    VERSION = '1.3.2'.freeze
+    VERSION = '1.4.0'.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.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-10-21 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.2.16
 signing_key: 
 specification_version: 4
 summary: A fake filesystem. Use it in your tests.