dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jason Roelofs 2012-04-03 21:33:32 -05:00
parent 4499df8033
commit 8368485fa0
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll/site.rb
View File

@ -215,8 +215,8 @@ module Jekyll
def cleanup def cleanup
# all files and directories in destination, including hidden ones # all files and directories in destination, including hidden ones
dest_files = Set.new dest_files = Set.new
Dir.glob(File.join(self.dest, "**", "*"), File::FNM_DOTMATCH) do |file| Dir.glob(File.join(self.dest, "**", "*")) do |file|
dest_files << file unless file =~ /\/\.{1,2}$/ dest_files << file
end end
# files to be written # files to be written

4
test/test_site.rb
View File

@ -171,8 +171,6 @@ class TestSite < Test::Unit::TestCase
clear_dest clear_dest
@site.process @site.process
# generate some orphaned files: # generate some orphaned files:
# hidden file
File.open(dest_dir('.htpasswd'), 'w')
# single file # single file
File.open(dest_dir('obsolete.html'), 'w') File.open(dest_dir('obsolete.html'), 'w')
# single file in sub directory # single file in sub directory
@ -183,7 +181,6 @@ class TestSite < Test::Unit::TestCase
end end
teardown do teardown do
FileUtils.rm_f(dest_dir('.htpasswd'))
FileUtils.rm_f(dest_dir('obsolete.html')) FileUtils.rm_f(dest_dir('obsolete.html'))
FileUtils.rm_rf(dest_dir('qux')) FileUtils.rm_rf(dest_dir('qux'))
FileUtils.rm_f(dest_dir('quux')) FileUtils.rm_f(dest_dir('quux'))
@ -191,7 +188,6 @@ class TestSite < Test::Unit::TestCase
should 'remove orphaned files in destination' do should 'remove orphaned files in destination' do
@site.process @site.process
assert !File.exist?(dest_dir('.htpasswd'))
assert !File.exist?(dest_dir('obsolete.html')) assert !File.exist?(dest_dir('obsolete.html'))
assert !File.exist?(dest_dir('qux')) assert !File.exist?(dest_dir('qux'))
assert !File.exist?(dest_dir('quux')) assert !File.exist?(dest_dir('quux'))