github-migration/whenever
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve whitespace at the end of crontab contents (issue #95)

Browse Source
This commit is contained in:
Rich Meyers 2010-11-01 17:07:09 -04:00
parent ca10a69e83
commit c4abbefe00
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/whenever/command_line.rb
View File

@ -106,7 +106,11 @@ module Whenever
end end
def prepare(contents) def prepare(contents)
contents.split("\n")[@options[:cut]..-1].join("\n") # Some cron implementations require all non-comment lines to be newline-terminated.
# Preserve any whitespace at the end of contents. (issue #95)
stripped_contents = contents.strip
tail = contents[stripped_contents.length..-1]
stripped_contents.split("\n")[@options[:cut]..-1].join("\n") + tail
end end
def comment_base def comment_base

6
test/functional/command_line_test.rb
View File

@ -281,8 +281,7 @@ My whenever job that was already here
# End Whenever generated tasks for: My identifier # End Whenever generated tasks for: My identifier
EXISTING_CRON EXISTING_CRON
# here-doc adds an extra newline we need removed assert_equal existing, @command.send(:prepare, existing)
assert_equal existing.strip, @command.send(:prepare, existing)
end end
should "trim off the top lines of the file" do should "trim off the top lines of the file" do
@ -302,8 +301,7 @@ My whenever job that was already here
# End Whenever generated tasks for: My identifier # End Whenever generated tasks for: My identifier
NEW_CRON NEW_CRON
# here-doc adds an extra newline we need removed assert_equal new_cron, @command.send(:prepare, existing)
assert_equal new_cron.strip, @command.send(:prepare, existing)
end end
end end