Skip to content

Commit

Permalink
Fix minute approximation
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonnynux
jonnynux committed Oct 7, 2020
1 parent feae0d6 commit b31e2a7
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 101 deletions.
1 change: 1 addition & 0 deletions lib/cron_parser.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ def nudge_hour(t, dir = :next)

def nudge_minute(t, dir = :next)
spec = time_specs[:minute][1]
t.min = t.min + 1 unless dir == :next
next_value = find_best_next(t.min, spec, dir)
t.min = next_value || (dir == :next ? spec.first : spec.last)

Expand Down
204 changes: 103 additions & 101 deletions spec/cron_parser_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,58 +26,58 @@ def parse_date(str)

describe "CronParser#next" do
[
["* * * * *", "2011-08-15 12:00", "2011-08-15 12:01", 1],
["* * * * *", "2011-08-15 02:25", "2011-08-15 02:26", 1],
["* * * * *", "2011-08-15 02:59", "2011-08-15 03:00", 1],
["*/15 * * * *", "2011-08-15 02:02", "2011-08-15 02:15", 1],
["*/15,25 * * * *", "2011-08-15 02:15", "2011-08-15 02:25", 1],
["30 3,6,9 * * *", "2011-08-15 02:15", "2011-08-15 03:30", 1],
["30 9 * * *", "2011-08-15 10:15", "2011-08-16 09:30", 1],
["30 9 * * *", "2011-08-31 10:15", "2011-09-01 09:30", 1],
["30 9 * * *", "2011-09-30 10:15", "2011-10-01 09:30", 1],
["0 9 * * *", "2011-12-31 10:15", "2012-01-01 09:00", 1],
["* * 12 * *", "2010-04-15 10:15", "2010-05-12 00:00", 1],
["* * * * 1,3", "2010-04-15 10:15", "2010-04-19 00:00", 1],
["* * * * MON,WED", "2010-04-15 10:15", "2010-04-19 00:00", 1],
["0 0 1 1 *", "2010-04-15 10:15", "2011-01-01 00:00", 1],
["0 0 * * 1", "2011-08-01 00:00", "2011-08-08 00:00", 1],
["0 0 * * 1", "2011-07-25 00:00", "2011-08-01 00:00", 1],
["45 23 7 3 *", "2011-01-01 00:00", "2011-03-07 23:45", 1],
["0 0 1 jun *", "2013-05-14 11:20", "2013-06-01 00:00", 1],
["0 0 1 may,jul *", "2013-05-14 15:00", "2013-07-01 00:00", 1],
["0 0 1 MAY,JUL *", "2013-05-14 15:00", "2013-07-01 00:00", 1],
["40 5 * * *", "2014-02-01 15:56", "2014-02-02 05:40", 1],
["0 5 * * 1", "2014-02-01 15:56", "2014-02-03 05:00", 1],
["10 8 15 * *", "2014-02-01 15:56", "2014-02-15 08:10", 1],
["50 6 * * 1", "2014-02-01 15:56", "2014-02-03 06:50", 1],
["1 2 * apr mOn", "2014-02-01 15:56", "2014-04-07 02:01", 1],
["1 2 3 4 7", "2014-02-01 15:56", "2014-04-03 02:01", 1],
["1 2 3 4 7", "2014-04-04 15:56", "2014-04-06 02:01", 1],
["1-20/3 * * * *", "2014-02-01 15:56", "2014-02-01 16:01", 1],
["1,2,3 * * * *", "2014-02-01 15:56", "2014-02-01 16:01", 1],
["1-9,15-30 * * * *", "2014-02-01 15:56", "2014-02-01 16:01", 1],
["1-9/3,15-30/4 * * * *", "2014-02-01 15:56", "2014-02-01 16:01", 1],
["1 2 3 jan mon", "2014-02-01 15:56", "2015-01-03 02:01", 1],
["1 2 3 4 mON", "2014-02-01 15:56", "2014-04-03 02:01", 1],
["1 2 3 jan 5", "2014-02-01 15:56", "2015-01-02 02:01", 1],
["@yearly", "2014-02-01 15:56", "2015-01-01 00:00", 1],
["@annually", "2014-02-01 15:56", "2015-01-01 00:00", 1],
["@monthly", "2014-02-01 15:56", "2014-03-01 00:00", 1],
["@weekly", "2014-02-01 15:56", "2014-02-02 00:00", 1],
["@daily", "2014-02-01 15:56", "2014-02-02 00:00", 1],
["@midnight", "2014-02-01 15:56", "2014-02-02 00:00", 1],
["@hourly", "2014-02-01 15:56", "2014-02-01 16:00", 1],
["*/3 * * * *", "2014-02-01 15:56", "2014-02-01 15:57", 1],
["0 5 * 2,3 *", "2014-02-01 15:56", "2014-02-02 05:00", 1],
["15-59/15 * * * *", "2014-02-01 15:56", "2014-02-01 16:15", 1],
["15-59/15 * * * *", "2014-02-01 15:00", "2014-02-01 15:15", 1],
["15-59/15 * * * *", "2014-02-01 15:01", "2014-02-01 15:15", 1],
["15-59/15 * * * *", "2014-02-01 15:16", "2014-02-01 15:30", 1],
["15-59/15 * * * *", "2014-02-01 15:26", "2014-02-01 15:30", 1],
["15-59/15 * * * *", "2014-02-01 15:36", "2014-02-01 15:45", 1],
["15-59/15 * * * *", "2014-02-01 15:45", "2014-02-01 16:15", 4],
["15-59/15 * * * *", "2014-02-01 15:46", "2014-02-01 16:15", 3],
["15-59/15 * * * *", "2014-02-01 15:46", "2014-02-01 16:15", 2]
["* * * * *", "2011-08-15 12:00:15", "2011-08-15 12:01:00", 1],
["* * * * *", "2011-08-15 02:25:30", "2011-08-15 02:26:00", 1],
["* * * * *", "2011-08-15 02:59:45", "2011-08-15 03:00:00", 1],
["*/15 * * * *", "2011-08-15 02:02:55", "2011-08-15 02:15:00", 1],
["*/15,25 * * * *", "2011-08-15 02:15:01", "2011-08-15 02:25:00", 1],
["30 3,6,9 * * *", "2011-08-15 02:15:34", "2011-08-15 03:30:00", 1],
["30 9 * * *", "2011-08-15 10:15:22", "2011-08-16 09:30:00", 1],
["30 9 * * *", "2011-08-31 10:15:59", "2011-09-01 09:30:00", 1],
["30 9 * * *", "2011-09-30 10:15:12", "2011-10-01 09:30:00", 1],
["0 9 * * *", "2011-12-31 10:15:45", "2012-01-01 09:00:00", 1],
["* * 12 * *", "2010-04-15 10:15:33", "2010-05-12 00:00:00", 1],
["* * * * 1,3", "2010-04-15 10:15:12", "2010-04-19 00:00:00", 1],
["* * * * MON,WED", "2010-04-15 10:15:00", "2010-04-19 00:00:00", 1],
["0 0 1 1 *", "2010-04-15 10:15:21", "2011-01-01 00:00:00", 1],
["0 0 * * 1", "2011-08-01 00:00:00", "2011-08-08 00:00:00", 1],
["0 0 * * 1", "2011-07-25 00:00:19", "2011-08-01 00:00:00", 1],
["45 23 7 3 *", "2011-01-01 00:00:11", "2011-03-07 23:45:00", 1],
["0 0 1 jun *", "2013-05-14 11:20:32", "2013-06-01 00:00:00", 1],
["0 0 1 may,jul *", "2013-05-14 15:00:00", "2013-07-01 00:00:00", 1],
["0 0 1 MAY,JUL *", "2013-05-14 15:00:00", "2013-07-01 00:00:00", 1],
["40 5 * * *", "2014-02-01 15:56:54", "2014-02-02 05:40:00", 1],
["0 5 * * 1", "2014-02-01 15:56:34", "2014-02-03 05:00:00", 1],
["10 8 15 * *", "2014-02-01 15:56:12", "2014-02-15 08:10:00", 1],
["50 6 * * 1", "2014-02-01 15:56:43", "2014-02-03 06:50:00", 1],
["1 2 * apr mOn", "2014-02-01 15:56:11", "2014-04-07 02:01:00", 1],
["1 2 3 4 7", "2014-02-01 15:56:44", "2014-04-03 02:01:00", 1],
["1 2 3 4 7", "2014-04-04 15:56:00", "2014-04-06 02:01:00", 1],
["1-20/3 * * * *", "2014-02-01 15:56:44", "2014-02-01 16:01:00", 1],
["1,2,3 * * * *", "2014-02-01 15:56:43", "2014-02-01 16:01:00", 1],
["1-9,15-30 * * * *", "2014-02-01 15:56:12", "2014-02-01 16:01:00", 1],
["1-9/3,15-30/4 * * * *", "2014-02-01 15:56:00", "2014-02-01 16:01:00", 1],
["1 2 3 jan mon", "2014-02-01 15:56:13", "2015-01-03 02:01:00", 1],
["1 2 3 4 mON", "2014-02-01 15:56:00", "2014-04-03 02:01:00", 1],
["1 2 3 jan 5", "2014-02-01 15:56:26", "2015-01-02 02:01:00", 1],
["@yearly", "2014-02-01 15:56:00", "2015-01-01 00:00:00", 1],
["@annually", "2014-02-01 15:56:37", "2015-01-01 00:00:00", 1],
["@monthly", "2014-02-01 15:56:14", "2014-03-01 00:00:00", 1],
["@weekly", "2014-02-01 15:56:00", "2014-02-02 00:00:00", 1],
["@daily", "2014-02-01 15:56:23", "2014-02-02 00:00:00", 1],
["@midnight", "2014-02-01 15:56:17", "2014-02-02 00:00:00", 1],
["@hourly", "2014-02-01 15:56:00", "2014-02-01 16:00:00", 1],
["*/3 * * * *", "2014-02-01 15:56:00", "2014-02-01 15:57:00", 1],
["0 5 * 2,3 *", "2014-02-01 15:56:19", "2014-02-02 05:00:00", 1],
["15-59/15 * * * *", "2014-02-01 15:56:00", "2014-02-01 16:15:00", 1],
["15-59/15 * * * *", "2014-02-01 15:00:00", "2014-02-01 15:15:00", 1],
["15-59/15 * * * *", "2014-02-01 15:01:21", "2014-02-01 15:15:00", 1],
["15-59/15 * * * *", "2014-02-01 15:16:22", "2014-02-01 15:30:00", 1],
["15-59/15 * * * *", "2014-02-01 15:26:00", "2014-02-01 15:30:00", 1],
["15-59/15 * * * *", "2014-02-01 15:36:38", "2014-02-01 15:45:00", 1],
["15-59/15 * * * *", "2014-02-01 15:45:00", "2014-02-01 16:15:00", 4],
["15-59/15 * * * *", "2014-02-01 15:46:36", "2014-02-01 16:15:00", 3],
["15-59/15 * * * *", "2014-02-01 15:46:00", "2014-02-01 16:15:00", 2]
].each do |line, now, expected_next, num|
it "returns #{expected_next} for '#{line}' when now is #{now}" do
parsed_now = parse_date(now)
Expand Down Expand Up @@ -112,55 +112,57 @@ def parse_date(str)

describe "CronParser#last" do
[
["* * * * *", "2011-08-15 12:00", "2011-08-15 11:59"],
["* * * * *", "2011-08-15 02:25", "2011-08-15 02:24"],
["* * * * *", "2011-08-15 03:00", "2011-08-15 02:59"],
["*/15 * * * *", "2011-08-15 02:02", "2011-08-15 02:00"],
["*/15,45 * * * *", "2011-08-15 02:55", "2011-08-15 02:45"],
["*/15,25 * * * *", "2011-08-15 02:35", "2011-08-15 02:30"],
["30 3,6,9 * * *", "2011-08-15 02:15", "2011-08-14 09:30"],
["30 9 * * *", "2011-08-15 10:15", "2011-08-15 09:30"],
["30 9 * * *", "2011-09-01 08:15", "2011-08-31 09:30"],
["30 9 * * *", "2011-10-01 08:15", "2011-09-30 09:30"],
["0 9 * * *", "2012-01-01 00:15", "2011-12-31 09:00"],
["* * 12 * *", "2010-04-15 10:15", "2010-04-12 23:59"],
["* * * * 1,3", "2010-04-15 10:15", "2010-04-14 23:59"],
["* * * * MON,WED", "2010-04-15 10:15", "2010-04-14 23:59"],
["0 0 1 1 *", "2010-04-15 10:15", "2010-01-01 00:00"],
["0 0 1 jun *", "2013-05-14 11:20", "2012-06-01 00:00"],
["0 0 1 may,jul *", "2013-05-14 15:00", "2013-05-01 00:00"],
["0 0 1 MAY,JUL *", "2013-05-14 15:00", "2013-05-01 00:00"],
["40 5 * * *", "2014-02-01 15:56", "2014-02-01 05:40"],
["0 5 * * 1", "2014-02-01 15:56", "2014-01-27 05:00"],
["10 8 15 * *", "2014-02-01 15:56", "2014-01-15 08:10"],
["50 6 * * 1", "2014-02-01 15:56", "2014-01-27 06:50"],
["1 2 * apr mOn", "2014-02-01 15:56", "2013-04-29 02:01"],
["1 2 3 4 7", "2014-02-01 15:56", "2013-04-28 02:01"],
["1 2 3 4 7", "2014-04-04 15:56", "2014-04-03 02:01"],
["1-20/3 * * * *", "2014-02-01 15:56", "2014-02-01 15:19"],
["1,2,3 * * * *", "2014-02-01 15:56", "2014-02-01 15:03"],
["1-9,15-30 * * * *", "2014-02-01 15:56", "2014-02-01 15:30"],
["1-9/3,15-30/4 * * * *", "2014-02-01 15:56", "2014-02-01 15:27"],
["1 2 3 jan mon", "2014-02-01 15:56", "2014-01-27 02:01"],
["1 2 3 4 mON", "2014-02-01 15:56", "2013-04-29 02:01"],
["1 2 3 jan 5", "2014-02-01 15:56", "2014-01-31 02:01"],
["@yearly", "2014-02-01 15:56", "2014-01-01 00:00"],
["@annually", "2014-02-01 15:56", "2014-01-01 00:00"],
["@monthly", "2014-02-01 15:56", "2014-02-01 00:00"],
["@weekly", "2014-02-01 15:56", "2014-01-26 00:00"],
["@daily", "2014-02-01 15:56", "2014-02-01 00:00"],
["@midnight", "2014-02-01 15:56", "2014-02-01 00:00"],
["@hourly", "2014-02-01 15:56", "2014-02-01 15:00"],
["*/3 * * * *", "2014-02-01 15:56", "2014-02-01 15:54"],
["0 5 * 2,3 *", "2014-02-01 15:56", "2014-02-01 05:00"],
["15-59/15 * * * *", "2014-02-01 15:56", "2014-02-01 15:45"],
["15-59/15 * * * *", "2014-02-01 15:00", "2014-02-01 14:45"],
["15-59/15 * * * *", "2014-02-01 15:01", "2014-02-01 14:45"],
["15-59/15 * * * *", "2014-02-01 15:16", "2014-02-01 15:15"],
["15-59/15 * * * *", "2014-02-01 15:26", "2014-02-01 15:15"],
["15-59/15 * * * *", "2014-02-01 15:36", "2014-02-01 15:30"],
["15-59/15 * * * *", "2014-02-01 15:45", "2014-02-01 15:30"],
["15-59/15 * * * *", "2014-02-01 15:46", "2014-02-01 15:45"]
["* * * * *", "2011-08-15 12:00:00", "2011-08-15 12:00:00"],
["* * * * *", "2011-08-15 02:25:13", "2011-08-15 02:25:00"],
["* * * * *", "2011-08-15 03:00:59", "2011-08-15 03:00:00"],
["*/15 * * * *", "2011-08-15 02:02:00", "2011-08-15 02:00:00"],
["*/15 * * * *", "2011-08-15 02:15:01", "2011-08-15 02:15:00"],
["*/15,45 * * * *", "2011-08-15 02:55:00", "2011-08-15 02:45:00"],
["*/15,25 * * * *", "2011-08-15 02:35:00", "2011-08-15 02:30:00"],
["30 3,6,9 * * *", "2011-08-15 02:15:00", "2011-08-14 09:30:00"],
["30 9 * * *", "2011-08-15 10:15:00", "2011-08-15 09:30:00"],
["30 9 * * *", "2011-09-01 08:15:00", "2011-08-31 09:30:00"],
["30 9 * * *", "2011-10-01 08:15:00", "2011-09-30 09:30:00"],
["30 9 * * *", "2011-10-01 09:30:11", "2011-10-01 09:30:00"],
["0 9 * * *", "2012-01-01 00:15:00", "2011-12-31 09:00:00"],
["* * 12 * *", "2010-04-15 10:15:00", "2010-04-12 23:59:00"],
["* * * * 1,3", "2010-04-15 10:15:00", "2010-04-14 23:59:00"],
["* * * * MON,WED", "2010-04-15 10:15:00", "2010-04-14 23:59:00"],
["0 0 1 1 *", "2010-04-15 10:15:00", "2010-01-01 00:00:00"],
["0 0 1 jun *", "2013-05-14 11:20:00", "2012-06-01 00:00:00"],
["0 0 1 may,jul *", "2013-05-14 15:00:00", "2013-05-01 00:00:00"],
["0 0 1 MAY,JUL *", "2013-05-14 15:00:00", "2013-05-01 00:00:00"],
["40 5 * * *", "2014-02-01 15:56:00", "2014-02-01 05:40:00"],
["0 5 * * 1", "2014-02-01 15:56:00", "2014-01-27 05:00:00"],
["10 8 15 * *", "2014-02-01 15:56:00", "2014-01-15 08:10:00"],
["50 6 * * 1", "2014-02-01 15:56:00", "2014-01-27 06:50:00"],
["1 2 * apr mOn", "2014-02-01 15:56:00", "2013-04-29 02:01:00"],
["1 2 3 4 7", "2014-02-01 15:56:00", "2013-04-28 02:01:00"],
["1 2 3 4 7", "2014-04-04 15:56:00", "2014-04-03 02:01:00"],
["1-20/3 * * * *", "2014-02-01 15:56:00", "2014-02-01 15:19:00"],
["1,2,3 * * * *", "2014-02-01 15:56:00", "2014-02-01 15:03:00"],
["1-9,15-30 * * * *", "2014-02-01 15:56:00", "2014-02-01 15:30:00"],
["1-9/3,15-30/4 * * * *", "2014-02-01 15:56:00", "2014-02-01 15:27:00"],
["1 2 3 jan mon", "2014-02-01 15:56:00", "2014-01-27 02:01:00"],
["1 2 3 4 mON", "2014-02-01 15:56:00", "2013-04-29 02:01:00"],
["1 2 3 jan 5", "2014-02-01 15:56:00", "2014-01-31 02:01:00"],
["@yearly", "2014-02-01 15:56:00", "2014-01-01 00:00:00"],
["@annually", "2014-02-01 15:56:00", "2014-01-01 00:00:00"],
["@monthly", "2014-02-01 15:56:00", "2014-02-01 00:00:00"],
["@weekly", "2014-02-01 15:56:00", "2014-01-26 00:00:00"],
["@daily", "2014-02-01 15:56:00", "2014-02-01 00:00:00"],
["@midnight", "2014-02-01 15:56:00", "2014-02-01 00:00:00"],
["@hourly", "2014-02-01 15:56:00", "2014-02-01 15:00:00"],
["*/3 * * * *", "2014-02-01 15:56:00", "2014-02-01 15:54:00"],
["0 5 * 2,3 *", "2014-02-01 15:56:00", "2014-02-01 05:00:00"],
["15-59/15 * * * *", "2014-02-01 15:56:00", "2014-02-01 15:45:00"],
["15-59/15 * * * *", "2014-02-01 15:00:00", "2014-02-01 14:45:00"],
["15-59/15 * * * *", "2014-02-01 15:01:00", "2014-02-01 14:45:00"],
["15-59/15 * * * *", "2014-02-01 15:16:00", "2014-02-01 15:15:00"],
["15-59/15 * * * *", "2014-02-01 15:26:00", "2014-02-01 15:15:00"],
["15-59/15 * * * *", "2014-02-01 15:36:00", "2014-02-01 15:30:00"],
["15-59/15 * * * *", "2014-02-01 15:45:00", "2014-02-01 15:45:00"],
["15-59/15 * * * *", "2014-02-01 15:46:00", "2014-02-01 15:45:00"]
].each do |line, now, expected_last|
it "should return #{expected_last} for '#{line}' when now is #{now}" do
parsed_now = parse_date(now)
Expand Down

0 comments on commit b31e2a7

Please sign in to comment.