fakefs 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 56ce8f3a0f75895e325781ae4b269b380b7edda5
-  data.tar.gz: b3ccf2e1c5a712ec7f05eb0f6da3f881f91f14a6
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDg1ODBmOTkwMzAxY2RjNzU1YzFmOTJlZDU4MmQ5YTZiMWIyMzZiMg==
+  data.tar.gz: !binary |-
+    N2Y3OGI0ZDY4YjRmNTA1ZmYyZDcyMmI5MjE0NjI2Y2Y0NDQ2NjM2OA==
 SHA512:
-  metadata.gz: f165dc35f777b6117c2db4c04c1e5e75649bcff6d9b67e9ad877a01fbd9aac0e358930c78b3961c3cda3ff8ca6feaba6f1af2410119c493b814ac10b04f19216
-  data.tar.gz: c1d29b78cb3716070a7c5e29095bcbfc5fe73941712660f171e6710d1a7d040b6c6515f4ec6d210ae7ea35cce1ccafa49a248f124e6065a8d37e7ef077cf93aa
+  metadata.gz: !binary |-
+    MTE1NTY1NDM0ZWE5NGViNjdjNTU3M2Y4MTNjZTcwMTdiN2I3ODYxZmMyNjg5
+    ZGNkNjliOGQ2OWUxZGE0MDY4OTgwMjljN2M4MmQwYjMzOWM5MDdjZDgzYmJi
+    Mzc5NGYyN2M0YWEzZjhlMDM2NTU1YTExYTJiOWZiZDljNmJiODM=
+  data.tar.gz: !binary |-
+    NTNiZTFjNjU5YWRjZDA3MzZiZDY3ZmQ0YjhlMDY3NWVjMjM3MzY1NGNjMjQ0
+    ZDA0OWNmNzRmMTRmYTg5YjI1NzNjZDg4Yjc4YjAyZGUyZjc1ZWY5NTBlN2Q0
+    NWNjMTQxYmJkYzMzZGNlMjRhNjdkMDI5MWFjOTJlZGJlNzA4ODk=

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org/'
 
 gemspec
-
-gem 'pry-byebug'

data/README.markdown

@@ -170,4 +170,4 @@ Releasing
 
 1. Update version in lib/fakefs/version.rb
 2. Commit it
-3. rake publish
+3. run rake publish

data/Rakefile

@@ -26,15 +26,25 @@ rescue LoadError
   puts "Rubocop task can't be loaded. `gem install rubocop`"
 end
 
-task default: [:rubocop, :test, :spec]
+task default: [:test, :spec]
 
 desc 'Push a new version to rubygems.org'
-task :publish do
-  abort('Tests failed!') unless system('rake test')
-  Rake::Task[:release].invoke
-end
+task :publish => [:test, :spec, :update_contributors, :release]
 
 desc 'Update contributors'
 task :update_contributors do
-  sh 'git-rank-contributors > CONTRIBUTORS'
+  git_rank_contributors = "#{File.dirname(File.expand_path(__FILE__))}/etc/git-rank-contributors"
+
+  sh "#{git_rank_contributors} > CONTRIBUTORS"
+  if `git status | grep CONTRIBUTORS`.strip.length > 0
+    sh "git add CONTRIBUTORS"
+    sh "git commit -m 'Updates contributors for release'"
+  end
 end
+
+desc 'Release a new version'
+task :release do
+  sh "gem build fakefs.gemspec"
+
+  sh "gem push fakefs-*.gem"
+end

data/etc/git-rank-contributors

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+## git-rank-contributors: a simple script to trace through the logs and
+## rank contributors by the total size of the diffs they're responsible for.
+## A change counts twice as much as a plain addition or deletion.
+##
+## Output may or may not be suitable for inclusion in a CREDITS file.
+## Probably not without some editing, because people often commit from more
+## than one address.
+##
+## git-rank-contributors Copyright 2008 William Morgan <wmorgan-git-wt-add@masanjin.net>.
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You can find the GNU General Public License at:
+##   http://www.gnu.org/licenses/
+
+class String
+  def obfuscate; gsub(/@/, " at the ").gsub(/\.(\w+)(>|$)/, ' dot \1s\2') end
+end
+
+lines = {}
+verbose = ARGV.delete("-v")
+obfuscate = ARGV.delete("-o")
+
+author = nil
+state = :pre_author
+`git log -p --no-color`.lines.each do |l|
+  case
+  when (state == :pre_author || state == :post_author) && l =~ /Author: (.*)$/
+    author = $1
+    state = :post_author
+    lines[author] ||= 0
+  when state == :post_author && l =~ /^\+\+\+/
+    state = :in_diff
+  when state == :in_diff && l =~ /^[\+\-]/
+    lines[author] += 1
+  when state == :in_diff && l =~ /^commit /
+    state = :pre_author
+  end
+end
+
+lines.sort_by { |a, c| -c }.each do |a, c|
+  a = a.obfuscate if obfuscate
+  if verbose
+    puts "#{a}: #{c} lines of diff"
+  else
+    puts a
+  end
+end

data/fakefs.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rake", "~> 10.3"
+  spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency 'rubocop', '~>0.25'
 end

data/lib/fakefs/file.rb

@@ -517,14 +517,26 @@ module FakeFS
       def advise(_advice, _offset = 0, _len = 0)
       end
 
-      def self.write(filename, contents, offset = nil)
+      def self.write(filename, contents, offset = nil, open_args = {})
+        offset, open_args = nil, offset if offset.is_a?(Hash)
+        mode = offset ? 'a' : 'w'
+        if open_args.size > 0
+          if open_args[:open_args]
+            args = [filename, *open_args[:open_args]]
+          else
+            mode = open_args[:mode] || mode
+            args = [filename, mode, open_args]
+          end
+        else
+          args = [filename, mode]
+        end
         if offset
-          open(filename, 'a') do |f|
+          open(*args) do |f|
             f.seek(offset)
             f.write(contents)
           end
         else
-          open(filename, 'w') do |f|
+          open(*args) do |f|
             f << contents
           end
         end

data/lib/fakefs/file_system.rb

@@ -131,7 +131,8 @@ module FakeFS
                     parts = [] # end recursion
                     directories_under(dir).map do |d|
                       d.entries.select do |f|
-                        f.is_a?(FakeFile) || f.is_a?(FakeDir)
+                        (f.is_a?(FakeFile) || f.is_a?(FakeDir)) &&
+                          f.name.match(/\A(?!\.)/)
                       end
                     end.flatten.uniq
                   when []
@@ -149,6 +150,7 @@ module FakeFS
                     .gsub(/\{(.*?)\}/) do
                       "(#{Regexp.last_match[1].gsub(',', '|')})"
                     end
+                    .gsub(/\A\./, '(?!\.).')
                   dir.matches(/\A#{regex_body}\Z/)
                 end
 

data/lib/fakefs/file_test.rb

@@ -15,6 +15,10 @@ module FakeFS
       File.file?(file_name)
     end
 
+    def size?(file_name)
+      File.size?(file_name)
+    end
+
     def writable?(file_name)
       File.writable?(file_name)
     end

data/lib/fakefs/fileutils.rb

@@ -6,7 +6,26 @@ module FakeFS
     def mkdir_p(list, _options = {})
       list = [list] unless list.is_a?(Array)
       list.each do |path|
+        # FileSystem.add call adds all the necessary parent directories but
+        # can't set their mode. Thus, we have to collect created directories
+        # here and set the mode later.
+        if _options[:mode]
+          created_dirs = []
+          dir = path
+
+          until Dir.exists?(dir)
+            created_dirs << dir
+            dir = File.dirname(dir)
+          end
+        end
+
         FileSystem.add(path, FakeDir.new)
+
+        if _options[:mode]
+          created_dirs.each do |dir|
+            File.chmod(_options[:mode], dir)
+          end
+        end
       end
     end
 
@@ -44,11 +63,13 @@ module FakeFS
           (!options[:force] && fail(Errno::ENOENT, path))
       end
     end
-
-    alias_method :rm_rf, :rm
     alias_method :rm_r, :rm
     alias_method :rm_f, :rm
     alias_method :remove, :rm
+
+    def rm_rf(list, options = {})
+      rm_r(list, options.merge(:force => true))
+    end
     alias_method :rmtree, :rm_rf
     alias_method :safe_unlink, :rm_f
     alias_method :remove_entry_secure, :rm_rf

data/lib/fakefs/kernel.rb

@@ -9,12 +9,14 @@ module FakeFS
 
     def self.hijack!
       captives[:hijacked].each do |name, prc|
+        ::Kernel.send(:remove_method, name.to_sym)
         ::Kernel.send(:define_method, name.to_sym, &prc)
       end
     end
 
     def self.unhijack!
       captives[:original].each do |name, _prc|
+        ::Kernel.send(:remove_method, name.to_sym)
         ::Kernel.send(:define_method, name.to_sym, proc do |*args, &block|
           ::FakeFS::Kernel.captives[:original][name].call(*args, &block)
         end)

data/lib/fakefs/pathname.rb

@@ -587,13 +587,13 @@ module FakeFS
         base_directory = base_directory.cleanpath.to_s
         dest_prefix = dest_directory
         dest_names = []
-        while (r = chop_basename(dest_prefix)) == true
+        while (r = chop_basename(dest_prefix))
           dest_prefix, basename = r
           dest_names.unshift basename if basename != '.'
         end
         base_prefix = base_directory
         base_names = []
-        while (r = chop_basename(base_prefix)) == true
+        while (r = chop_basename(base_prefix))
           base_prefix, basename = r
           base_names.unshift basename if basename != '.'
         end

data/lib/fakefs/version.rb

@@ -1,7 +1,7 @@
 module FakeFS
   # Version module
   module Version
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
 
     def self.to_s
       VERSION

data/spec/fakefs/fakefs_bug_ruby_2.1.0-preview2_spec.rb

@@ -4,10 +4,11 @@ require 'fakefs/spec_helpers'
 RSpec.configure do |c|
   c.mock_with(:rspec)
   c.include(FakeFS::SpecHelpers, fakefs: true)
+  c.disable_monkey_patching!
 end
 
 if RUBY_VERSION >= '2.1'
-  describe 'Find.find', fakefs: true do
+  RSpec.describe 'Find.find', fakefs: true do
     it 'does not give an ArgumentError' do
       FileUtils.mkdir_p('/tmp/foo')
       found = Find.find('/tmp').to_a

data/spec/fakefs/spec_helpers_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # FakeFs module for tests
 module FakeFS
-  describe SpecHelpers do
+  RSpec.describe SpecHelpers do
     before do
       @rspec_example_group = Class.new do
         def self.before(_sym = :each)
@@ -18,29 +18,29 @@ module FakeFS
     describe 'when extending' do
       context 'before each' do
         it 'should call it' do
-          @rspec_example_group.should_receive(:before).with(:each)
+          expect(@rspec_example_group).to receive(:before).with(:each)
           @rspec_example_group.extend FakeFS::SpecHelpers
         end
 
         it 'should call FakeFS.activate!' do
-          FakeFS.should_receive(:activate!)
+          expect(FakeFS).to receive(:activate!)
           @rspec_example_group.extend FakeFS::SpecHelpers
         end
       end
 
       context 'after each' do
         it 'should call it' do
-          @rspec_example_group.should_receive(:after).with(:each)
+          expect(@rspec_example_group).to receive(:after).with(:each)
           @rspec_example_group.extend FakeFS::SpecHelpers
         end
 
         it 'should deactivate fakefs' do
-          FakeFS.should_receive(:deactivate!)
+          expect(FakeFS).to receive(:deactivate!)
           @rspec_example_group.extend FakeFS::SpecHelpers
         end
 
         it 'should clear the fakefs filesystem for the next run' do
-          FakeFS::FileSystem.should_receive(:clear)
+          expect(FakeFS::FileSystem).to receive(:clear)
           @rspec_example_group.extend FakeFS::SpecHelpers
         end
       end
@@ -48,7 +48,7 @@ module FakeFS
 
     describe 'when including' do
       it 'should call before :each' do
-        @rspec_example_group.should_receive(:before)
+        expect(@rspec_example_group).to receive(:before)
         @rspec_example_group.class_eval do
           include FakeFS::SpecHelpers
         end
@@ -59,29 +59,29 @@ module FakeFS
       describe 'when extending' do
         context 'before :all' do
           it 'should call it' do
-            @rspec_example_group.should_receive(:before).with(:all)
+            expect(@rspec_example_group).to receive(:before).with(:all)
             @rspec_example_group.extend FakeFS::SpecHelpers::All
           end
 
           it 'should call FakeFS.activate!' do
-            FakeFS.should_receive(:activate!)
+            expect(FakeFS).to receive(:activate!)
             @rspec_example_group.extend FakeFS::SpecHelpers::All
           end
         end
 
         context 'after :all' do
           it 'should call it' do
-            @rspec_example_group.should_receive(:after).with(:all)
+            expect(@rspec_example_group).to receive(:after).with(:all)
             @rspec_example_group.extend FakeFS::SpecHelpers::All
           end
 
           it 'should call FakeFS.deactivate!' do
-            FakeFS.should_receive(:deactivate!)
+            expect(FakeFS).to receive(:deactivate!)
             @rspec_example_group.extend FakeFS::SpecHelpers::All
           end
 
           it 'should not call FakeFS::FileSystem.clear' do
-            FakeFS::FileSystem.should_not_receive(:clear)
+            expect(FakeFS::FileSystem).to_not receive(:clear)
             @rspec_example_group.extend FakeFS::SpecHelpers::All
           end
         end
@@ -90,7 +90,7 @@ module FakeFS
       describe 'when including' do
         context 'before :all' do
           it 'should call it' do
-            @rspec_example_group.should_receive(:before)
+            expect(@rspec_example_group).to receive(:before)
             @rspec_example_group.class_eval do
               include FakeFS::SpecHelpers::All
             end

data/test/fake/file_test.rb

@@ -95,4 +95,18 @@ class FakeFileTest < Test::Unit::TestCase
     end
     assert_equal "No such file or directory - #{path}", msg
   end
+
+  def test_file_size_question_works
+    assert_nil FileTest.size?("does-not-exist.txt")
+
+    File.open("empty.txt", 'w') do |f|
+      f << ''
+    end
+    assert_nil FileTest.size?("empty.txt")
+
+    File.open("one-char.txt", 'w') do |f|
+      f << 'a'
+    end
+    assert_equal 1, FileTest.size?("one-char.txt")
+  end
 end

data/test/fakefs_test.rb

@@ -117,6 +117,12 @@ class FakeFSTest < Test::Unit::TestCase
     end
   end
 
+  def test_unlink_doesnt_error_on_file_not_found_with_rm_rf
+    assert_nothing_raised do
+      FileUtils.rm_rf("/foo")
+    end
+  end
+
   def test_can_delete_directories
     FileUtils.mkdir_p('/path/to/dir')
     FileUtils.rmdir('/path/to/dir')
@@ -136,7 +142,6 @@ class FakeFSTest < Test::Unit::TestCase
     assert FileUtils.respond_to?(:rm_f)
     assert FileUtils.respond_to?(:rm_r)
     assert FileUtils.respond_to?(:rm)
-    assert FileUtils.respond_to?(:rm_rf)
     assert FileUtils.respond_to?(:symlink)
     assert FileUtils.respond_to?(:move)
     assert FileUtils.respond_to?(:copy)
@@ -867,6 +872,27 @@ class FakeFSTest < Test::Unit::TestCase
     assert File.file?(path)
   end
 
+  def test_size_returns_size
+    first_file = 'first.txt'
+    File.open(first_file, 'w') do |f|
+      f.write '12345678'
+    end
+
+    assert_equal File.size?(first_file), 8
+
+    File.open(first_file, 'w') do |f|
+      f.write 'abcd'
+    end
+
+    assert_equal File.size?(first_file), 4
+
+    second_file = 'second.txt'
+    File.open(second_file, 'w') do |f|
+      f.write '1'
+    end
+    assert_equal File.size?(second_file), 1
+  end
+
   def test_File_io_returns_self
     f = File.open('foo', 'w')
     assert_equal f, f.to_io
@@ -1002,6 +1028,7 @@ class FakeFSTest < Test::Unit::TestCase
     FileUtils.mkdir_p '/path'
     File.open('/path/foo', 'w') { |f| f.write 'foo' }
     File.open('/path/foobar', 'w') { |f| f.write 'foo' }
+    File.open('/path/.bar', 'w') { |f| f.write 'foo' }
 
     FileUtils.mkdir_p '/path/bar'
     File.open('/path/bar/baz', 'w') { |f| f.write 'foo' }
@@ -1009,6 +1036,9 @@ class FakeFSTest < Test::Unit::TestCase
     FileUtils.cp_r '/path/bar', '/path/bar2'
 
     assert_equal ['/path'], Dir['/path']
+    assert_equal ['/path/.bar'], Dir['**/{.*}']
+    assert_equal ['/path/.bar'], Dir['/path**/{.*}']
+    assert_equal ['/path/.bar'], Dir['/path/{.*}']
     assert_equal %w( /path/bar /path/bar2 /path/foo /path/foobar ), Dir['/path/*']
 
     assert_equal ['/path/bar/baz'], Dir['/path/bar/*']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakefs
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,62 +12,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.25'
 description: A fake filesystem. Use it in your tests.
@@ -77,16 +77,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".autotest"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .autotest
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
+- etc/git-rank-contributors
 - fakefs.gemspec
 - lib/fakefs.rb
 - lib/fakefs/base.rb
@@ -131,17 +132,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A fake filesystem. Use it in your tests.