Permalink
Browse files

Remove deletion of dot files on cleanup.

This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.

All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
  • Loading branch information...
Jason Roelofs
Jason Roelofs committed Apr 4, 2012
1 parent 4499df8 commit 8368485fa0e92dd9ec6ebb2dfe1ce164bf46d55a
Showing with 2 additions and 6 deletions.
  1. +2 −2 lib/jekyll/site.rb
  2. +0 −4 test/test_site.rb
View
@@ -215,8 +215,8 @@ def render
def cleanup
# all files and directories in destination, including hidden ones
dest_files = Set.new
- Dir.glob(File.join(self.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
- dest_files << file unless file =~ /\/\.{1,2}$/
+ Dir.glob(File.join(self.dest, "**", "*")) do |file|
+ dest_files << file
end
# files to be written
View
@@ -171,8 +171,6 @@ class TestSite < Test::Unit::TestCase
clear_dest
@site.process
# generate some orphaned files:
- # hidden file
- File.open(dest_dir('.htpasswd'), 'w')
# single file
File.open(dest_dir('obsolete.html'), 'w')
# single file in sub directory
@@ -183,15 +181,13 @@ class TestSite < Test::Unit::TestCase
end
teardown do
- FileUtils.rm_f(dest_dir('.htpasswd'))
FileUtils.rm_f(dest_dir('obsolete.html'))
FileUtils.rm_rf(dest_dir('qux'))
FileUtils.rm_f(dest_dir('quux'))
end
should 'remove orphaned files in destination' do
@site.process
- assert !File.exist?(dest_dir('.htpasswd'))
assert !File.exist?(dest_dir('obsolete.html'))
assert !File.exist?(dest_dir('qux'))
assert !File.exist?(dest_dir('quux'))

0 comments on commit 8368485

Please sign in to comment.