fakefs 1.2.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05218e3b531393a48c565fe787759d6e4e89c64cc89047c3685d199ef0775921'
-  data.tar.gz: 59a65166fe4d0bc0dbc4d3fa002e0180d98a548548542447568d9e9ea45b0977
+  metadata.gz: e62fc76c0ca1c48b09e7b4051d5888a3f361b7f6e72434275bf3820d972c05d0
+  data.tar.gz: fc2e3377b5948b04302f06893fd4b961311699c597dfe431a9ab04046b488d67
 SHA512:
-  metadata.gz: a599803b52fd91196e05878a5570218de25884e2e0e47becebb49f0006b2d909b1de86f0699e983f7f315aedb2b789abe568765b42eefa2f8dce1080e6a2dc86
-  data.tar.gz: e6a99b4c246abbc1f2de43420b82dbc48700cdb50851c8b76906a14ed6147a4892511b7c70cbbf4a67c6d66ee9b8824db3dbc331da22f47614a6de83bf789b3b
+  metadata.gz: 3c43a34b04c1d010a783da8646dfff11d50892a15faa5660730e9d284b046dfdf921adbcaff550ca0b2a25bbc5537060b457f37e11c7d64aa6bb7271cd8975ae
+  data.tar.gz: e0523fab127204c4400921d2e1bc6bdbf8ed6c61b8c731707d92b8fa916e1c7320290c18546168bee757888dfd2ae3ad5953cb1b55557e9e5f40997428cb66d4

data/README.md

@@ -1,4 +1,4 @@
-FakeFS [![build status](https://travis-ci.org/fakefs/fakefs.svg?branch=master)](https://travis-ci.org/fakefs/fakefs)
+FakeFS [![build status](https://github.com/fakefs/fakefs/workflows/CI/badge.svg)](https://github.com/fakefs/fakefs/actions?query=branch%3Amaster)
 ======
 
 Mocking calls to FileUtils or File means tightly coupling tests with the implementation.
@@ -202,7 +202,7 @@ Meta
 * Code: `git clone git://github.com/fakefs/fakefs.git`
 * Home: <https://github.com/fakefs/fakefs>
 * Bugs: <https://github.com/fakefs/fakefs/issues>
-* Test: <https://travis-ci.org/fakefs/fakefs>
+* Test: <https://github.com/fakefs/fakefs/actions?query=branch%3Amaster>
 * Gems: <https://rubygems.org/gems/fakefs>
 
 [0]: https://help.github.com/forking/

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.rb

@@ -197,11 +197,11 @@ module FakeFS
       file.read(length)
     end
 
-    def self.readlines(path)
+    def self.readlines(path, chomp: false)
       file = new(path)
       if file.exists?
         FileSystem.find(path).atime = Time.now
-        file.readlines
+        chomp ? file.readlines.map(&:chomp) : file.readlines
       else
         raise Errno::ENOENT
       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

data/lib/fakefs/version.rb

@@ -1,7 +1,7 @@
 module FakeFS
   # Version module
   module Version
-    VERSION = '1.2.3'.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.2.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-06 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.