fakefs 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bfa54005c100676feb93956681fe9cd686030fe16e3dab3a54109e5c29b2361
-  data.tar.gz: 30c51f9bcf1e221ca4cd3fbb43ee987979c7fa57b2aa1865f9387bfab755d66b
+  metadata.gz: 2615742cb54b7cea91ad40e51e1b1baf037ea9295eff338b0432fc20f1ea9483
+  data.tar.gz: e9e136d1eb2d10a18b0470ed45c8058b88656af040d45136f78a53fb21bf42c0
 SHA512:
-  metadata.gz: 6929e502b22c9f1f632b0d98379caad07a7abcda53c658fb258d321dda15e53d60e4c927365beb6ec62d2e9d30c77aa70e746e0cd693bf6f02256c64eb4ab5a2
-  data.tar.gz: 2d80c942fbfea67e1dfa031f1b859115cefe783e9cb35a246a7f44b6f1d55511c40a758782dafad2557eefcbf7cabcea7f338c35a6f207a7ea94ec204bb99aea
+  metadata.gz: 790f25734bd4b9bf2c4b82750421bbe40114a591efa327b909b61e0ef341360f5bdbde7c5d99c06a3931f46d655710f1fc7c302a24b67590cb849e506e750450
+  data.tar.gz: 73578d236fa95d8307311c87c9fba693c101295bdc915b2bc6adda0c074e9ea5eb782121af5cc3c3446cf8292d57a6ed8dd5c6979a4cdee9be2fb11053c4b65c

data/lib/fakefs/dir.rb

@@ -119,7 +119,7 @@ module FakeFS
 
     def self.glob(pattern, flags = 0, &block)
       matches_for_pattern = lambda do |matcher|
-        [FileSystem.find(matcher, flags) || []].flatten.map do |e|
+        [FileSystem.find(matcher, flags, true) || []].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.rb

@@ -53,16 +53,20 @@ module FakeFS
     class << self
       alias exists? exist?
 
-      # Assuming that everyone can read and write files
-      alias readable? exist?
-      alias writable? exist?
-
       # Assume nothing is sticky.
       def sticky?(_path)
         false
       end
     end
 
+    def self.readable?(path)
+      File.lstat(path).readable?
+    end
+
+    def self.writable?(path)
+      File.lstat(path).writable?
+    end
+
     def self.mtime(path)
       if exists?(path)
         FileSystem.find(path).mtime
@@ -363,13 +367,28 @@ module FakeFS
         'file'
       end
 
-      # assumes, like above, that all files are readable and writable.
       def readable?
-        true
+        # a file is readable if, and only if, it has the following bits:
+        #   4 ( read permission )
+        #   5 ( read + execute permission )
+        #   6 ( read + write permission )
+        #   7 ( read + write + execute permission )
+        # for each group we will isolate the wanted numbers ( for owner, world, or group )
+        # and see if the third bit is set ( as that is the bit for read )
+        read_bit = 4
+        check_if_bit_set(read_bit)
       end
 
       def writable?
-        true
+        # a file is writable if, and only if, it has the following bits:
+        #   2 ( write permission )
+        #   3 ( write + execute permission )
+        #   6 ( read + write permission )
+        #   7 ( read + write + execute permission )
+        # for each group we will isolate the wanted numbers ( for owner, world, or group )
+        # and see if the second bit is set ( as that is the bit for write )
+        write_bit = 2
+        check_if_bit_set(write_bit)
       end
 
       # Assume nothing is sticky.
@@ -412,6 +431,41 @@ module FakeFS
       def <=>(other)
         @mtime <=> other.mtime
       end
+
+      private
+
+      def check_if_bit_set(bit)
+        # get user's group and user ids
+        # NOTE: I am picking `Process` over `Etc` as we use `Process`
+        # when instaniating file classes. It may be worth it to ensure
+        # our Process/Group detection scheme is robust in all cases
+        uid = Process.uid
+        gid = Process.gid
+
+        # check if bit set for owner
+        owner_bits = (@mode >> 6) & 0o7
+        if uid == @uid
+          # the user is locked out of the file if they are owner of the file
+          # but do not have the bit set at the user level
+          return true if owner_bits & bit == bit
+          return false
+        end
+
+        # check if bit set for group
+        group_bits = (@mode >> 3) & 0o7
+        if gid == @gid
+          # the user is locked out of the file if they are in the group that
+          # owns the file but do not have the bit set at the group level
+          return true if group_bits & bit == bit
+          return false
+        end
+
+        # check if bit set for world
+        world_bits = @mode & 0o7
+        return true if world_bits & bit == bit
+
+        false
+      end
     end
 
     attr_reader :path

data/lib/fakefs/file_system.rb

@@ -20,13 +20,13 @@ module FakeFS
       fs.entries
     end
 
-    def find(path, find_flags = 0)
+    def find(path, find_flags = 0, gave_char_class = false)
       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, find_flags).flatten
+        find_recurser(fs, parts, find_flags, gave_char_class).flatten
       end
 
       case entries.length
@@ -88,6 +88,7 @@ module FakeFS
       dir_levels.push dir if blk
 
       raise Errno::ENOENT, dir unless new_dir
+      raise Errno::ENOTDIR, dir unless File.directory? new_dir
 
       dir_levels.push dir unless blk
       yield(dir) if blk
@@ -116,7 +117,7 @@ module FakeFS
 
     private
 
-    def find_recurser(dir, parts, find_flags = 0)
+    def find_recurser(dir, parts, find_flags = 0, gave_char_class = false)
       return [] unless dir.respond_to? :[]
       pattern, *parts = parts
       matches =
@@ -139,14 +140,14 @@ module FakeFS
           end
         else
           Globber.expand(pattern).flat_map do |subpattern|
-            dir.matches(Globber.regexp(subpattern, find_flags))
+            dir.matches(Globber.regexp(subpattern, find_flags, gave_char_class))
           end
         end
 
       if parts.empty? # we're done recursing
         matches
       else
-        matches.map { |entry| find_recurser(entry, parts, find_flags) }
+        matches.map { |entry| find_recurser(entry, parts, find_flags, gave_char_class) }
       end
     end
 

data/lib/fakefs/globber.rb

@@ -60,7 +60,7 @@ module FakeFS
       drop_root(result).reject(&:empty?)
     end
 
-    def regexp(pattern, find_flags = 0)
+    def regexp(pattern, find_flags = 0, gave_char_class = false)
       pattern = pattern.to_s
 
       regex_body =
@@ -73,6 +73,12 @@ module FakeFS
         .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(']', '\]')
+      end
+
       # This matches nested braces and attempts to do something correct most of the time
       # There are known issues (i.e. {,*,*/*}) that cannot be resolved with out a total
       # refactoring

data/lib/fakefs/version.rb

@@ -1,7 +1,7 @@
 module FakeFS
   # Version module
   module Version
-    VERSION = '0.16.0'.freeze
+    VERSION = '0.17.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.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump