whenever 0.9.7 → 1.0.0

data/lib/whenever/cron.rb

@@ -3,16 +3,20 @@ require 'chronic'
 module Whenever
   module Output
     class Cron
+      DAYS = %w(sun mon tue wed thu fri sat)
+      MONTHS = %w(jan feb mar apr may jun jul aug sep oct nov dec)
       KEYWORDS = [:reboot, :yearly, :annually, :monthly, :weekly, :daily, :midnight, :hourly]
-      REGEX = /^(@(#{KEYWORDS.join '|'})|((\*?[\d\/,\-]*)\s*){5})$/
+      REGEX = /^(@(#{KEYWORDS.join '|'})|((\*?[\d\/,\-]*)\s){3}(\*?([\d\/,\-]|(#{MONTHS.join '|'}))*\s)(\*?([\d\/,\-]|(#{DAYS.join '|'}))*))$/i
 
       attr_accessor :time, :task
 
-      def initialize(time = nil, task = nil, at = nil)
+      def initialize(time = nil, task = nil, at = nil, options = {})
+        chronic_options = options[:chronic_options] || {}
+
         @at_given = at
         @time = time
         @task = task
-        @at   = at.is_a?(String) ? (Chronic.parse(at) || 0) : (at || 0)
+        @at   = at.is_a?(String) ? (Chronic.parse(at, chronic_options) || 0) : (at || 0)
       end
 
       def self.enumerate(item, detect_cron = true)
@@ -30,10 +34,10 @@ module Whenever
         items
       end
 
-      def self.output(times, job)
+      def self.output(times, job, options = {})
         enumerate(times).each do |time|
           enumerate(job.at, false).each do |at|
-            yield new(time, job.output, at).output
+            yield new(time, job.output, at, options).output
           end
         end
       end
@@ -54,18 +58,18 @@ module Whenever
 
     protected
       def day_given?
-        months = %w(jan feb mar apr may jun jul aug sep oct nov dec)
-        @at_given.is_a?(String) && months.any? { |m| @at_given.downcase.index(m) }
+        @at_given.is_a?(String) && (MONTHS.any? { |m| @at_given.downcase.index(m) } || @at_given[/\d\/\d/])
       end
 
       def parse_symbol
         shortcut = case @time
           when *KEYWORDS then "@#{@time}" # :reboot => '@reboot'
-          when :year     then Whenever.seconds(12, :months)
+          when :year     then Whenever.seconds(1, :year)
           when :day      then Whenever.seconds(1, :day)
           when :month    then Whenever.seconds(1, :month)
           when :week     then Whenever.seconds(1, :week)
           when :hour     then Whenever.seconds(1, :hour)
+          when :minute   then Whenever.seconds(1, :minute)
         end
 
         if shortcut.is_a?(Numeric)
@@ -92,23 +96,36 @@ module Whenever
             timing[0] = comma_separated_timing(minute_frequency, 59, @at || 0)
           when Whenever.seconds(1, :hour)...Whenever.seconds(1, :day)
             hour_frequency = (@time / 60 / 60).round
-            timing[0] = @at.is_a?(Time) ? @at.min : @at
+            timing[0] = @at.is_a?(Time) ? @at.min : range_or_integer(@at, 0..59, 'Minute')
             timing[1] = comma_separated_timing(hour_frequency, 23)
           when Whenever.seconds(1, :day)...Whenever.seconds(1, :month)
             day_frequency = (@time / 24 / 60 / 60).round
             timing[0] = @at.is_a?(Time) ? @at.min  : 0
-            timing[1] = @at.is_a?(Time) ? @at.hour : @at
+            timing[1] = @at.is_a?(Time) ? @at.hour : range_or_integer(@at, 0..23, 'Hour')
             timing[2] = comma_separated_timing(day_frequency, 31, 1)
-          when Whenever.seconds(1, :month)..Whenever.seconds(12, :months)
-            month_frequency = (@time / 30  / 24 / 60 / 60).round
+          when Whenever.seconds(1, :month)...Whenever.seconds(1, :year)
+            month_frequency = (@time / 30 / 24 / 60 / 60).round
             timing[0] = @at.is_a?(Time) ? @at.min  : 0
             timing[1] = @at.is_a?(Time) ? @at.hour : 0
             timing[2] = if @at.is_a?(Time)
               day_given? ? @at.day : 1
             else
-              @at.zero? ? 1 : @at
+              @at == 0 ? 1 : range_or_integer(@at, 1..31, 'Day')
             end
             timing[3] = comma_separated_timing(month_frequency, 12, 1)
+          when Whenever.seconds(1, :year)
+            timing[0] = @at.is_a?(Time) ? @at.min  : 0
+            timing[1] = @at.is_a?(Time) ? @at.hour : 0
+            timing[2] = if @at.is_a?(Time)
+              day_given? ? @at.day : 1
+            else
+              1
+            end
+            timing[3] = if @at.is_a?(Time)
+              day_given? ? @at.month : 1
+            else
+              @at == 0 ? 1 : range_or_integer(@at, 1..12, 'Month')
+            end
           else
             return parse_as_string
         end
@@ -126,11 +143,22 @@ module Whenever
         return (timing << '1-5') * " " if string.downcase.index('weekday')
         return (timing << '6,0') * " " if string.downcase.index('weekend')
 
-        %w(sun mon tue wed thu fri sat).each_with_index do |day, i|
+        DAYS.each_with_index do |day, i|
           return (timing << i) * " " if string.downcase.index(day)
         end
 
-        raise ArgumentError, "Couldn't parse: #{@time}"
+        raise ArgumentError, "Couldn't parse: #{@time.inspect}"
+      end
+
+      def range_or_integer(at, valid_range, name)
+        must_be_between = "#{name} must be between #{valid_range.min}-#{valid_range.max}"
+        if at.is_a?(Range)
+          raise ArgumentError, "#{must_be_between}, #{at.min} given" unless valid_range.include?(at.min)
+          raise ArgumentError, "#{must_be_between}, #{at.max} given" unless valid_range.include?(at.max)
+          return "#{at.min}-#{at.max}"
+        end
+        raise ArgumentError, "#{must_be_between}, #{at} given" unless valid_range.include?(at)
+        at
       end
 
       def comma_separated_timing(frequency, max, start = 0)

data/lib/whenever/job.rb

@@ -2,12 +2,13 @@ require 'shellwords'
 
 module Whenever
   class Job
-    attr_reader :at, :roles
+    attr_reader :at, :roles, :mailto
 
     def initialize(options = {})
       @options = options
       @at                               = options.delete(:at)
       @template                         = options.delete(:template)
+      @mailto                           = options.fetch(:mailto, :default_mailto)
       @job_template                     = options.delete(:job_template) || ":job"
       @roles                            = Array(options.delete(:roles))
       @options[:output]                 = options.has_key?(:output) ? Whenever::Output::Redirection.new(options[:output]).to_s : ''

data/lib/whenever/job_list.rb

@@ -30,10 +30,17 @@ module Whenever
       return if @pre_set_variables[variable]
 
       instance_variable_set("@#{variable}".to_sym, value)
-      self.class.send(:attr_reader, variable.to_sym)
       @set_variables[variable] = value
     end
 
+    def method_missing(name, *args, &block)
+      @set_variables.has_key?(name) ? @set_variables[name] : super
+    end
+
+    def self.respond_to?(name, include_private = false)
+      @set_variables.has_key?(name) || super
+    end
+
     def env(variable, value)
       @env[variable.to_s] = value
     end
@@ -50,13 +57,16 @@ module Whenever
           options = { :task => task, :template => template }
           options.merge!(args[0]) if args[0].is_a? Hash
 
+          options[:mailto] ||= @options.fetch(:mailto, :default_mailto)
+
           # :cron_log was an old option for output redirection, it remains for backwards compatibility
           options[:output] = (options[:cron_log] || @cron_log) if defined?(@cron_log) || options.has_key?(:cron_log)
           # :output is the newer, more flexible option.
           options[:output] = @output if defined?(@output) && !options.has_key?(:output)
 
-          @jobs[@current_time_scope] ||= []
-          @jobs[@current_time_scope] << Whenever::Job.new(@options.merge(@set_variables).merge(options))
+          @jobs[options.fetch(:mailto)] ||= {}
+          @jobs[options.fetch(:mailto)][@current_time_scope] ||= []
+          @jobs[options.fetch(:mailto)][@current_time_scope] << Whenever::Job.new(@options.merge(@set_variables).merge(options))
         end
       end
     end
@@ -125,31 +135,51 @@ module Whenever
       entries.map { |entry| entry.join(' ') }
     end
 
+    def cron_jobs_of_time(time, jobs)
+      shortcut_jobs, regular_jobs = [], []
+
+      jobs.each do |job|
+        next unless roles.empty? || roles.any? do |r|
+          job.has_role?(r)
+        end
+        Whenever::Output::Cron.output(time, job, :chronic_options => @chronic_options) do |cron|
+          cron << "\n\n"
+
+          if cron[0,1] == "@"
+            shortcut_jobs << cron
+          else
+            regular_jobs << cron
+          end
+        end
+      end
+
+      shortcut_jobs.join + combine(regular_jobs).join
+    end
+
     def cron_jobs
       return if @jobs.empty?
 
-      shortcut_jobs = []
-      regular_jobs = []
+      output = []
 
-      output_all = roles.empty?
-      @jobs.each do |time, jobs|
-        jobs.each do |job|
-          next unless output_all || roles.any? do |r|
-            job.has_role?(r)
-          end
-          Whenever::Output::Cron.output(time, job) do |cron|
-            cron << "\n\n"
+      # jobs with default mailto's must be output before the ones with non-default mailto's.
+      @jobs.delete(:default_mailto) { Hash.new }.each do |time, jobs|
+        output << cron_jobs_of_time(time, jobs)
+      end
 
-            if cron[0,1] == "@"
-              shortcut_jobs << cron
-            else
-              regular_jobs << cron
-            end
-          end
+      @jobs.each do |mailto, time_and_jobs|
+        output_jobs = []
+
+        time_and_jobs.each do |time, jobs|
+          output_jobs << cron_jobs_of_time(time, jobs)
         end
+
+        output_jobs.reject! { |output_job| output_job.empty? }
+
+        output << "MAILTO=#{mailto}\n\n" unless output_jobs.empty?
+        output << output_jobs
       end
 
-      shortcut_jobs.join + combine(regular_jobs).join
+      output.join
     end
   end
 end

data/lib/whenever/numeric.rb

@@ -1,4 +1,4 @@
-class Numeric
+Numeric.class_eval do
   def respond_to?(method, include_private = false)
     super || Whenever::NumericSeconds.public_method_defined?(method)
   end

data/lib/whenever/setup.rb

@@ -5,6 +5,10 @@ set :environment, "production"
 # Path defaults to the directory `whenever` was run from
 set :path, Whenever.path
 
+# Custom Chronic configuration for time parsing, empty by default
+# Full list of options at: https://github.com/mojombo/chronic/blob/master/lib/chronic/parser.rb
+set :chronic_options, {}
+
 # All jobs are wrapped in this template.
 # http://blog.scoutapp.com/articles/2010/09/07/rvm-and-cron-in-production
 set :job_template, "/bin/bash -l -c ':job'"

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.9.7'
+  VERSION = '1.0.0'
 end

data/test/functional/command_line_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class CommandLineWriteTest < Whenever::TestCase
   setup do
+    Time.stubs(:now).returns(Time.new(2017, 2, 24, 16, 21, 30, '+01:00'))
     File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:write => true, :identifier => 'My identifier')
     @task = "#{two_hours} /my/command"
@@ -10,9 +11,9 @@ class CommandLineWriteTest < Whenever::TestCase
 
   should "output the cron job with identifier blocks" do
     output = <<-EXPECTED
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 #{@task}
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 EXPECTED
 
     assert_equal output, @command.send(:whenever_cron)
@@ -26,6 +27,7 @@ end
 
 class CommandLineUpdateTest < Whenever::TestCase
   setup do
+    Time.stubs(:now).returns(Time.new(2017, 2, 24, 16, 21, 30, '+01:00'))
     File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
     @task = "#{two_hours} /my/command"
@@ -39,9 +41,9 @@ class CommandLineUpdateTest < Whenever::TestCase
     new_cron = <<-EXPECTED
 #{existing}
 
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 #{@task}
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 EXPECTED
 
     assert_equal new_cron, @command.send(:updated_crontab)
@@ -50,7 +52,71 @@ EXPECTED
     assert @command.run
   end
 
-  should "replace an existing block if the identifier matches" do
+  should "replace an existing block if the identifier matches and the timestamp doesn't" do
+    existing = <<-EXISTING_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier at: 2017-01-03 08:02:22 +0500
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier at: 2017-01-03 08:22:22 +0500
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+EXISTING_CRON
+
+    new_cron = <<-NEW_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
+#{@task}
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+NEW_CRON
+
+    @command.expects(:read_crontab).at_least_once.returns(existing)
+    assert_equal new_cron, @command.send(:updated_crontab)
+
+    @command.expects(:write_crontab).with(new_cron).returns(true)
+    assert @command.run
+  end
+
+  should "replace an existing block if the identifier matches and the UTC timestamp doesn't" do
+    existing = <<-EXISTING_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier at: 2017-01-03 08:02:22 UTC
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier at: 2017-01-03 08:22:22 UTC
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+EXISTING_CRON
+
+    new_cron = <<-NEW_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
+#{@task}
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+NEW_CRON
+
+    @command.expects(:read_crontab).at_least_once.returns(existing)
+    assert_equal new_cron, @command.send(:updated_crontab)
+
+    @command.expects(:write_crontab).with(new_cron).returns(true)
+    assert @command.run
+  end
+
+  should "replace an existing block if the identifier matches and it doesn't contain a timestamp" do
     existing = <<-EXISTING_CRON
 # Something
 
@@ -58,21 +124,21 @@ EXPECTED
 My whenever job that was already here
 # End Whenever generated tasks for: My identifier
 
-# Begin Whenever generated tasks for: Other identifier
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 This shouldn't get replaced
-# End Whenever generated tasks for: Other identifier
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 EXISTING_CRON
 
     new_cron = <<-NEW_CRON
 # Something
 
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 #{@task}
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 
-# Begin Whenever generated tasks for: Other identifier
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 This shouldn't get replaced
-# End Whenever generated tasks for: Other identifier
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 NEW_CRON
 
     @command.expects(:read_crontab).at_least_once.returns(existing)
@@ -85,10 +151,11 @@ end
 
 class CommandLineUpdateWithBackslashesTest < Whenever::TestCase
   setup do
+    Time.stubs(:now).returns(Time.new(2017, 2, 24, 16, 21, 30, '+01:00'))
     @existing = <<-EXISTING_CRON
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 script/runner -e production 'puts '\\''hello'\\'''
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 EXISTING_CRON
     File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
@@ -104,12 +171,12 @@ end
 class CommandLineUpdateToSimilarCrontabTest < Whenever::TestCase
   setup do
     @existing = <<-EXISTING_CRON
-# Begin Whenever generated tasks for: WheneverExisting
-# End Whenever generated tasks for: WheneverExisting
+# Begin Whenever generated tasks for: WheneverExisting at: 2017-02-24 16:21:30 +0100
+# End Whenever generated tasks for: WheneverExisting at: 2017-02-24 16:21:30 +0100
 EXISTING_CRON
     @new = <<-NEW_CRON
-# Begin Whenever generated tasks for: Whenever
-# End Whenever generated tasks for: Whenever
+# Begin Whenever generated tasks for: Whenever at: 2017-02-24 16:21:30 +0100
+# End Whenever generated tasks for: Whenever at: 2017-02-24 16:21:30 +0100
 NEW_CRON
     File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:update => true, :identifier => 'Whenever')
@@ -124,12 +191,71 @@ end
 
 class CommandLineClearTest < Whenever::TestCase
   setup do
+    Time.stubs(:now).returns(Time.new(2017, 2, 24, 16, 21, 30, '+01:00'))
     File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
     @task = "#{two_hours} /my/command"
   end
 
-  should "clear an existing block if the identifier matches" do
+  should "clear an existing block if the identifier matches and the timestamp doesn't" do
+    existing = <<-EXISTING_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier at: 2017-01-03 08:20:02 +0500
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier at: 2017-01-03 08:20:02 +0500
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+EXISTING_CRON
+
+    @command.expects(:read_crontab).at_least_once.returns(existing)
+
+    new_cron = <<-NEW_CRON
+# Something
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+NEW_CRON
+
+    assert_equal new_cron, @command.send(:updated_crontab)
+
+    @command.expects(:write_crontab).with(new_cron).returns(true)
+    assert @command.run
+  end
+
+  should "clear an existing block if the identifier matches and the UTC timestamp doesn't" do
+    existing = <<-EXISTING_CRON
+# Something
+
+# Begin Whenever generated tasks for: My identifier at: 2017-01-03 08:20:02 UTC
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier at: 2017-01-03 08:20:02 UTC
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+EXISTING_CRON
+
+    @command.expects(:read_crontab).at_least_once.returns(existing)
+
+    new_cron = <<-NEW_CRON
+# Something
+
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+This shouldn't get replaced
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
+NEW_CRON
+
+    assert_equal new_cron, @command.send(:updated_crontab)
+
+    @command.expects(:write_crontab).with(new_cron).returns(true)
+    assert @command.run
+  end
+
+  should "clear an existing block if the identifier matches and it doesn't have a timestamp" do
     existing = <<-EXISTING_CRON
 # Something
 
@@ -137,9 +263,9 @@ class CommandLineClearTest < Whenever::TestCase
 My whenever job that was already here
 # End Whenever generated tasks for: My identifier
 
-# Begin Whenever generated tasks for: Other identifier
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 This shouldn't get replaced
-# End Whenever generated tasks for: Other identifier
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 EXISTING_CRON
 
     @command.expects(:read_crontab).at_least_once.returns(existing)
@@ -147,9 +273,9 @@ EXISTING_CRON
     new_cron = <<-NEW_CRON
 # Something
 
-# Begin Whenever generated tasks for: Other identifier
+# Begin Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 This shouldn't get replaced
-# End Whenever generated tasks for: Other identifier
+# End Whenever generated tasks for: Other identifier at: 2017-02-24 16:21:30 +0100
 NEW_CRON
 
     assert_equal new_cron, @command.send(:updated_crontab)
@@ -173,13 +299,14 @@ end
 
 class CommandLineUpdateWithNoIdentifierTest < Whenever::TestCase
   setup do
+    Time.stubs(:now).returns(Time.new(2017, 2, 24, 16, 21, 30, '+01:00'))
     File.expects(:exist?).with('config/schedule.rb').returns(true)
     Whenever::CommandLine.any_instance.expects(:default_identifier).returns('DEFAULT')
-    @command = Whenever::CommandLine.new(:update => true, :file => @file)
+    @command = Whenever::CommandLine.new(:update => true)
   end
 
   should "use the default identifier" do
-    assert_equal "Whenever generated tasks for: DEFAULT", @command.send(:comment_base)
+    assert_equal "Whenever generated tasks for: DEFAULT at: 2017-02-24 16:21:30 +0100", @command.send(:comment_base)
   end
 end
 
@@ -287,9 +414,9 @@ class PreparingOutputTest < Whenever::TestCase
 # Useless Comments
 # at the top of the file
 
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 My whenever job that was already here
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 EXISTING_CRON
 
     assert_equal existing, @command.send(:prepare, existing)
@@ -301,15 +428,15 @@ EXISTING_CRON
 # Useless Comments
 # at the top of the file
 
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 My whenever job that was already here
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 EXISTING_CRON
 
     new_cron = <<-NEW_CRON
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 My whenever job that was already here
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 NEW_CRON
 
     assert_equal new_cron, @command.send(:prepare, existing)
@@ -318,9 +445,9 @@ NEW_CRON
   should "preserve terminating newlines in files" do
     @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
     existing = <<-EXISTING_CRON
-# Begin Whenever generated tasks for: My identifier
+# Begin Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 My whenever job that was already here
-# End Whenever generated tasks for: My identifier
+# End Whenever generated tasks for: My identifier at: 2017-02-24 16:21:30 +0100
 
 # A non-Whenever task
 My non-whenever job that was already here

data/test/functional/output_at_test.rb

@@ -204,4 +204,43 @@ class OutputAtTest < Whenever::TestCase
 
     assert_match '0 0 27,31 * * blahblah', output
   end
+
+  test "using custom Chronic configuration to specify time using 24 hour clock" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :chronic_options, :hours24 => true
+      every 1.day, :at => '03:00' do
+        command "blahblah"
+      end
+    file
+
+    assert_match '0 3 * * * blahblah', output
+  end
+
+  test "using custom Chronic configuration to specify date using little endian preference" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :chronic_options, :endian_precedence => :little
+      every 1.month, :at => '02/03 10:15' do
+        command "blahblah"
+      end
+    file
+
+    assert_match '15 10 2 * * blahblah', output
+  end
+
+  test "using custom Chronic configuration to specify time using 24 hour clock and date using little endian preference" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :chronic_options, :hours24 => true, :endian_precedence => :little
+      every 1.month, :at => '01/02 04:30' do
+        command "blahblah"
+      end
+    file
+
+    assert_match '30 4 1 * * blahblah', output
+  end
 end