fakefs 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a4da28e46b56875973439b5aaee5395293a8d0fff5e7a72f25e0dbd1ea12dee
-  data.tar.gz: da232cb25e279d1c932ceeb0fa52f016f6e3ce7b208b42aca72c8609e1c235b2
+  metadata.gz: 2bfa54005c100676feb93956681fe9cd686030fe16e3dab3a54109e5c29b2361
+  data.tar.gz: 30c51f9bcf1e221ca4cd3fbb43ee987979c7fa57b2aa1865f9387bfab755d66b
 SHA512:
-  metadata.gz: 7d2d9f03153e6c42aeb5441b171ec8903b5b2b64939474dfa6f2e7f6d6bfdb59ba4147c19ed4975377633a8d3dbab25e1eed1a23a3e53f7240e9bef7a55fab87
-  data.tar.gz: 105499836a07529c55b9efd8a3313fe02bf42cfb52a23e6854935ef45eb7e516aeba2265c6652bc21d314c0496c03e39edd993ec209957de5d77cc9cfaf02363
+  metadata.gz: 6929e502b22c9f1f632b0d98379caad07a7abcda53c658fb258d321dda15e53d60e4c927365beb6ec62d2e9d30c77aa70e746e0cd693bf6f02256c64eb4ab5a2
+  data.tar.gz: 2d80c942fbfea67e1dfa031f1b859115cefe783e9cb35a246a7f44b6f1d55511c40a758782dafad2557eefcbf7cabcea7f338c35a6f207a7ea94ec204bb99aea

data/lib/fakefs/dir.rb

@@ -117,9 +117,9 @@ module FakeFS
       Dir.open(dirname) { |file| yield file }
     end
 
-    def self.glob(pattern, _flags = 0, &block)
+    def self.glob(pattern, flags = 0, &block)
       matches_for_pattern = lambda do |matcher|
-        [FileSystem.find(matcher) || []].flatten.map do |e|
+        [FileSystem.find(matcher, flags) || []].flatten.map do |e|
           if Dir.pwd.match(%r{\A/?\z}) ||
              !e.to_s.match(%r{\A#{Dir.pwd}/?})
             e.to_s

data/lib/fakefs/file_system.rb

@@ -20,13 +20,13 @@ module FakeFS
       fs.entries
     end
 
-    def find(path)
+    def find(path, find_flags = 0)
       parts = path_parts(normalize_path(path))
       return fs if parts.empty? # '/'
 
       entries = Globber.expand(path).flat_map do |pattern|
         parts = path_parts(normalize_path(pattern))
-        find_recurser(fs, parts).flatten
+        find_recurser(fs, parts, find_flags).flatten
       end
 
       case entries.length
@@ -116,9 +116,9 @@ module FakeFS
 
     private
 
-    def find_recurser(dir, parts)
+    def find_recurser(dir, parts, find_flags = 0)
       return [] unless dir.respond_to? :[]
-      pattern, *parts = parts # rubocop:disable Lint/ShadowedArgument
+      pattern, *parts = parts
       matches =
         case pattern
         when '**'
@@ -139,14 +139,14 @@ module FakeFS
           end
         else
           Globber.expand(pattern).flat_map do |subpattern|
-            dir.matches(Globber.regexp(subpattern))
+            dir.matches(Globber.regexp(subpattern, find_flags))
           end
         end
 
       if parts.empty? # we're done recursing
         matches
       else
-        matches.map { |entry| find_recurser(entry, parts) }
+        matches.map { |entry| find_recurser(entry, parts, find_flags) }
       end
     end
 

data/lib/fakefs/globber.rb

@@ -60,7 +60,7 @@ module FakeFS
       drop_root(result).reject(&:empty?)
     end
 
-    def regexp(pattern)
+    def regexp(pattern, find_flags = 0)
       pattern = pattern.to_s
 
       regex_body =
@@ -82,8 +82,12 @@ module FakeFS
         end
       end
 
-      regex_body = regex_body.gsub(/\A\./, '(?!\.).')
+      # if we are matching dot files/directories, add that to the regex
+      if find_flags == File::FNM_DOTMATCH
+        regex_body = "(\.)?" + regex_body
+      end
 
+      regex_body = regex_body.gsub(/\A\./, '(?!\.).')
       /\A#{regex_body}\Z/
     end
 

data/lib/fakefs/pathname.rb

@@ -138,43 +138,6 @@ module FakeFS
       self.class.new(@path.chomp(ext) + repl)
     end
 
-    # chop_basename(path) -> [pre-basename, basename] or nil
-    def chop_basename(path)
-      base = File.basename(path)
-      if /\A#{SEPARATOR_PAT}?\z/o =~ base
-        return nil
-      else
-        return path[0, path.rindex(base)], base
-      end
-    end
-    private :chop_basename
-
-    # split_names(path) -> prefix, [name, ...]
-    def split_names(path)
-      names = []
-      while (r = chop_basename(path))
-        path, basename = r
-        names.unshift basename
-      end
-
-      [path, names]
-    end
-
-    private :split_names
-
-    def prepend_prefix(prefix, relpath)
-      if relpath.empty?
-        File.dirname(prefix)
-      elsif /#{SEPARATOR_PAT}/o =~ prefix
-        prefix = File.dirname(prefix)
-        prefix = File.join(prefix, '') if File.basename(prefix + 'a') != 'a'
-        prefix + relpath
-      else
-        prefix + relpath
-      end
-    end
-    private :prepend_prefix
-
     # Returns clean pathname of +self+ with consecutive slashes and
     # useless dots removed. The filesystem is not accessed.
     #
@@ -192,97 +155,6 @@ module FakeFS
       end
     end
 
-    #
-    # Clean the path simply by resolving and removing excess
-    # "." and ".." entries.
-    # Nothing more, nothing less.
-    #
-    def cleanpath_aggressive
-      path = @path
-      names = []
-      pre = path
-      while (r = chop_basename(pre))
-        pre, base = r
-        case base
-        when '.' # rubocop:disable Lint/EmptyWhen
-        when '..'
-          names.unshift base
-        else
-          if names[0] == '..'
-            names.shift
-          else
-            names.unshift base
-          end
-        end
-      end
-      if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
-        names.shift while names[0] == '..'
-      end
-      self.class.new(prepend_prefix(pre, File.join(*names)))
-    end
-    private :cleanpath_aggressive
-
-    # trailing_separator?(path) -> bool
-    def trailing_separator?(path)
-      if (r = chop_basename(path))
-        pre, basename = r
-        pre.length + basename.length < path.length
-      else
-        false
-      end
-    end
-
-    private :trailing_separator?
-
-    # add_trailing_separator(path) -> path
-    def add_trailing_separator(path)
-      if File.basename(path + 'a') == 'a'
-        path
-      else
-        # xxx: Is File.join is appropriate to add separator?
-        File.join(path, '')
-      end
-    end
-    private :add_trailing_separator
-
-    def del_trailing_separator(path)
-      if (r = chop_basename(path))
-        pre, basename = r
-        pre + basename
-      elsif /#{SEPARATOR_PAT}+\z/o =~ path
-        $` + File.dirname(path)[/#{SEPARATOR_PAT}*\z/o]
-      else
-        path
-      end
-    end
-    private :del_trailing_separator
-
-    def cleanpath_conservative
-      path = @path
-      names = []
-      pre = path
-      while (r = chop_basename(pre))
-        pre, base = r
-        names.unshift base if base != '.'
-      end
-      if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
-        names.shift while names[0] == '..'
-      end
-      if names.empty?
-        self.class.new(File.dirname(pre))
-      else
-        names << '.' if names.last != '..' && File.basename(path) == '.'
-
-        result = prepend_prefix(pre, File.join(*names))
-        if /\A(?:\.|\.\.)\z/ !~ names.last && trailing_separator?(path)
-          self.class.new(add_trailing_separator(result))
-        else
-          self.class.new(result)
-        end
-      end
-    end
-    private :cleanpath_conservative
-
     #
     # Returns the real (absolute) pathname of +self+ in the actual
     # filesystem not containing symlinks or useless dots.
@@ -438,54 +310,6 @@ module FakeFS
     end
     alias / +
 
-    def plus(path1, path2) # -> path
-      prefix2 = path2
-      index_list2 = []
-      basename_list2 = []
-      while (r2 = chop_basename(prefix2))
-        prefix2, basename2 = r2
-        index_list2.unshift prefix2.length
-        basename_list2.unshift basename2
-      end
-
-      return path2 if prefix2 != ''
-
-      prefix1 = path1
-      while (r1 = chop_basename(prefix1))
-        while !basename_list2.empty? && basename_list2.first == '.'
-          index_list2.shift
-          basename_list2.shift
-        end
-
-        prefix1, basename1 = r1
-        next if basename1 == '.'
-        if basename1 == '..' ||
-           basename_list2.empty? ||
-           basename_list2.first != '..'
-          prefix1 += basename1
-          break
-        end
-        index_list2.shift
-        basename_list2.shift
-      end
-
-      r1 = chop_basename(prefix1)
-      if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
-        while !basename_list2.empty? && basename_list2.first == '..'
-          index_list2.shift
-          basename_list2.shift
-        end
-      end
-
-      if !basename_list2.empty?
-        suffix2 = path2[index_list2.first..-1]
-        r1 ? File.join(prefix1, suffix2) : prefix1 + suffix2
-      else
-        r1 ? prefix1 : File.dirname(prefix1)
-      end
-    end
-    private :plus
-
     #
     # Pathname#join joins pathnames.
     #
@@ -625,6 +449,173 @@ module FakeFS
         Pathname.new(File.join(*relpath_names))
       end
     end
+
+    private
+
+    # chop_basename(path) -> [pre-basename, basename] or nil
+    def chop_basename(path)
+      base = File.basename(path)
+      if /\A#{SEPARATOR_PAT}?\z/o =~ base
+        return nil
+      else
+        return path[0, path.rindex(base)], base
+      end
+    end
+
+    # split_names(path) -> prefix, [name, ...]
+    def split_names(path)
+      names = []
+      while (r = chop_basename(path))
+        path, basename = r
+        names.unshift basename
+      end
+
+      [path, names]
+    end
+
+    def prepend_prefix(prefix, relpath)
+      if relpath.empty?
+        File.dirname(prefix)
+      elsif /#{SEPARATOR_PAT}/o =~ prefix
+        prefix = File.dirname(prefix)
+        prefix = File.join(prefix, '') if File.basename(prefix + 'a') != 'a'
+        prefix + relpath
+      else
+        prefix + relpath
+      end
+    end
+
+    #
+    # Clean the path simply by resolving and removing excess
+    # "." and ".." entries.
+    # Nothing more, nothing less.
+    #
+    def cleanpath_aggressive
+      path = @path
+      names = []
+      pre = path
+      while (r = chop_basename(pre))
+        pre, base = r
+        case base
+        when '.' # rubocop:disable Lint/EmptyWhen
+        when '..'
+          names.unshift base
+        else
+          if names[0] == '..'
+            names.shift
+          else
+            names.unshift base
+          end
+        end
+      end
+      if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+        names.shift while names[0] == '..'
+      end
+      self.class.new(prepend_prefix(pre, File.join(*names)))
+    end
+
+    # trailing_separator?(path) -> bool
+    def trailing_separator?(path)
+      if (r = chop_basename(path))
+        pre, basename = r
+        pre.length + basename.length < path.length
+      else
+        false
+      end
+    end
+
+    # add_trailing_separator(path) -> path
+    def add_trailing_separator(path)
+      if File.basename(path + 'a') == 'a'
+        path
+      else
+        # xxx: Is File.join is appropriate to add separator?
+        File.join(path, '')
+      end
+    end
+
+    def del_trailing_separator(path)
+      if (r = chop_basename(path))
+        pre, basename = r
+        pre + basename
+      elsif /#{SEPARATOR_PAT}+\z/o =~ path
+        $` + File.dirname(path)[/#{SEPARATOR_PAT}*\z/o]
+      else
+        path
+      end
+    end
+
+    def cleanpath_conservative
+      path = @path
+      names = []
+      pre = path
+      while (r = chop_basename(pre))
+        pre, base = r
+        names.unshift base if base != '.'
+      end
+      if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+        names.shift while names[0] == '..'
+      end
+      if names.empty?
+        self.class.new(File.dirname(pre))
+      else
+        names << '.' if names.last != '..' && File.basename(path) == '.'
+
+        result = prepend_prefix(pre, File.join(*names))
+        if /\A(?:\.|\.\.)\z/ !~ names.last && trailing_separator?(path)
+          self.class.new(add_trailing_separator(result))
+        else
+          self.class.new(result)
+        end
+      end
+    end
+
+    def plus(path1, path2) # -> path
+      prefix2 = path2
+      index_list2 = []
+      basename_list2 = []
+      while (r2 = chop_basename(prefix2))
+        prefix2, basename2 = r2
+        index_list2.unshift prefix2.length
+        basename_list2.unshift basename2
+      end
+
+      return path2 if prefix2 != ''
+
+      prefix1 = path1
+      while (r1 = chop_basename(prefix1))
+        while !basename_list2.empty? && basename_list2.first == '.'
+          index_list2.shift
+          basename_list2.shift
+        end
+
+        prefix1, basename1 = r1
+        next if basename1 == '.'
+        if basename1 == '..' ||
+           basename_list2.empty? ||
+           basename_list2.first != '..'
+          prefix1 += basename1
+          break
+        end
+        index_list2.shift
+        basename_list2.shift
+      end
+
+      r1 = chop_basename(prefix1)
+      if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
+        while !basename_list2.empty? && basename_list2.first == '..'
+          index_list2.shift
+          basename_list2.shift
+        end
+      end
+
+      if !basename_list2.empty?
+        suffix2 = path2[index_list2.first..-1]
+        r1 ? File.join(prefix1, suffix2) : prefix1 + suffix2
+      else
+        r1 ? prefix1 : File.dirname(prefix1)
+      end
+    end
   end
 
   # Pathname class

data/lib/fakefs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakefs
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -104,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.58.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.58.1
 description: A fake filesystem. Use it in your tests.
 email:
 - chris@ozmm.org