diff --git a/lib/git-scribe/generate.rb b/lib/git-scribe/generate.rb index ed6a93e..934bc66 100644 --- a/lib/git-scribe/generate.rb +++ b/lib/git-scribe/generate.rb @@ -330,7 +330,7 @@ def liquid_template(file) # create a new file by concatenating all the ones we find def gather_and_process files = Dir.glob("book/*") - FileUtils.cp_r files, 'output' + FileUtils.cp_r files, 'output', :remove_destination => true end def ex(command) diff --git a/test/gen_test.rb b/test/gen_test.rb index 610f68a..80e8ccf 100644 --- a/test/gen_test.rb +++ b/test/gen_test.rb @@ -11,6 +11,23 @@ end end + test "scribe don't crash on symlinks when run twice" do + in_temp_dir do + @scribe.init('t') + Dir.chdir('t') do + FileUtils.mkdir_p 'book/includes/sub1' + FileUtils.mkdir_p 'book/includes/sub2' + FileUtils.touch 'book/includes/sub1/real_file' + FileUtils.ln_s '../sub1/real_file', 'book/includes/sub2/link_file' + + assert_nothing_raised do + @scribe.gen('html') + @scribe.gen('html') + end + end + end + end + test "scribe can generate single page html" do in_temp_dir do @scribe.init('t')