Merge branch 'new_line_after_closing_comment'

lib/command_line.rb

@@ -40,7 +40,7 @@ def default_identifier
     end
 
     def whenever_cron
-      @whenever_cron ||= [comment_open, Whenever.cron(@options), comment_close].join("\n")
+      @whenever_cron ||= [comment_open, Whenever.cron(@options), comment_close].join("\n") + "\n"
     end
 
     def read_crontab
@@ -86,7 +86,7 @@ def updated_crontab
 
       # If an existing identier block is found, replace it with the new cron entries
       if read_crontab.index(comment_open) && read_crontab.index(comment_close)
-        read_crontab.gsub(Regexp.new("#{comment_open}.+#{comment_close}", Regexp::MULTILINE), whenever_cron)
+        read_crontab.gsub(Regexp.new("#{comment_open}.+#{comment_close}", Regexp::MULTILINE), whenever_cron.chomp)
       else # Otherwise, append the new cron entries after any existing ones
         [read_crontab, whenever_cron].join("\n\n")
       end

test/command_line_test.rb

@@ -11,13 +11,13 @@ class CommandLineTest < Test::Unit::TestCase
     end
 
     should "output the cron job with identifier blocks" do
-      output = <<-expected
-      # Begin Whenever generated tasks for: My identifier
-      #{@task}
-      # End Whenever generated tasks for: My identifier
-      expected
+      output = <<-EXPECTED
+# Begin Whenever generated tasks for: My identifier
+#{@task}
+# End Whenever generated tasks for: My identifier
+EXPECTED
 
-      assert_equal unindent(output).chomp, @command.send(:whenever_cron).chomp
+      assert_equal output, @command.send(:whenever_cron)
     end
 
     should "write the crontab when run" do
@@ -38,49 +38,50 @@ class CommandLineTest < Test::Unit::TestCase
       existing = '# Existing crontab'
       @command.expects(:read_crontab).at_least_once.returns(existing)
 
-      new_cron = <<-expected
-      #{existing}
-      
-      # Begin Whenever generated tasks for: My identifier
-      #{@task}
-      # End Whenever generated tasks for: My identifier
-      expected
+      new_cron = <<-EXPECTED
+#{existing}
+
+# Begin Whenever generated tasks for: My identifier
+#{@task}
+# End Whenever generated tasks for: My identifier
+EXPECTED
 
-      assert_equal unindent(new_cron).chomp, @command.send(:updated_crontab).chomp
+      assert_equal new_cron, @command.send(:updated_crontab)
 
-      @command.expects(:write_crontab).with(unindent(new_cron)).returns(true)
+      @command.expects(:write_crontab).with(new_cron).returns(true)
       assert @command.run
     end
 
     should "replace an existing block if the identifier matches" do
-      existing = <<-existing
-      # Something
-      
-      # Begin Whenever generated tasks for: My identifier
-      My whenever job that was already here
-      # End Whenever generated tasks for: My identifier
-      
-      # Begin Whenever generated tasks for: Other identifier
-      This shouldn't get replaced
-      # End Whenever generated tasks for: Other identifier
-      existing
-      @command.expects(:read_crontab).at_least_once.returns(unindent(existing))
-
-      new_cron = <<-new_cron
-      # Something
-      
-      # Begin Whenever generated tasks for: My identifier
-      #{@task}
-      # End Whenever generated tasks for: My identifier
+      existing = <<-EXISTING_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier
+
+# Begin Whenever generated tasks for: Other identifier
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier
+EXISTING_CRON
+
+      @command.expects(:read_crontab).at_least_once.returns(existing)
 
-      # Begin Whenever generated tasks for: Other identifier
-      This shouldn't get replaced
-      # End Whenever generated tasks for: Other identifier
-      new_cron
+      new_cron = <<-NEW_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier
+#{@task}
+# End Whenever generated tasks for: My identifier
+
+# Begin Whenever generated tasks for: Other identifier
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier
+NEW_CRON
 
-      assert_equal unindent(new_cron).chomp, @command.send(:updated_crontab).chomp
+      assert_equal new_cron, @command.send(:updated_crontab)
 
-      @command.expects(:write_crontab).with(unindent(new_cron)).returns(true)
+      @command.expects(:write_crontab).with(new_cron).returns(true)
       assert @command.run
     end
   end
@@ -97,11 +98,4 @@ class CommandLineTest < Test::Unit::TestCase
     end
   end
 
-private
-
-  def unindent(string)
-    indentation = string[/\A\s*/]
-    string.strip.gsub(/^#{indentation}/, "")
-  end
-
 end