parse-cron 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDU3MTY0MGQ1YWE1YTlmNjVhODMzZDk2MjgxMzFiMDNhOGE2OWNmNA==
+  data.tar.gz: !binary |-
+    OGQ0ZmJlMTZlNTU0MDk1YmY4YjFhMzBhNWE4YTM2N2VjNDg2Yjc3MA==
+SHA512:
+  metadata.gz: !binary |-
+    Mzg4N2NiZTNhNWI2NDcwYTEwNTJkMGU5NDI3ZGRmMmVmOTkwY2E4ZGZmOGY5
+    MjQ0NDI2YTA5N2Y2YWUzNmRlZTNjOGM3NmUyMmIzY2YxOWRlZWJiMGIwYmQ1
+    YzE5YmIzMDc0NGM4ZTYzZWJiYWQ3MWM1NTA4NWIzN2U4MGQ3NDM=
+  data.tar.gz: !binary |-
+    ODRhNDM0ZTUyOTBlN2ZhNzkzNjc0NzdhYTA2NTMzY2ZjZTQ0MTVjZTE4ZDM4
+    YTBjNWQ2MzFkMmFmYjk0YjdmZjA3NzlmZWUxYzIyNGQyNWRhNDUyMDk4NGY4
+    NDQzNTMxMThlMDllYzgzODJjMmNkYTkxZDc1MTFiMDk3OTg0OTc=

data/.gitignore

@@ -3,3 +3,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/lib/cron_parser.rb

@@ -52,15 +52,34 @@ class CronParser
   }
 
   def initialize(source,time_source = Time)
-    @source = source
+    @source = interpret_vixieisms(source)
     @time_source = time_source
     validate_source
   end
+  
+  def interpret_vixieisms(spec)
+    case spec
+    when '@reboot'
+      raise ArgumentError, "Can't predict last/next run of @reboot"
+    when '@yearly', '@annually'
+      '0 0 1 1 *'
+    when '@monthly'
+      '0 0 1 * *'
+    when '@weekly'
+      '0 0 * * 0'
+    when '@daily', '@midnight'
+      '0 0 * * *'
+    when '@hourly'
+      '0 * * * *'
+    else
+      spec
+    end
+  end
 
 
   # returns the next occurence after the given date
   def next(now = @time_source.now)
-    t = InternalTime.new(now,@time_source)
+    t = InternalTime.new(now, @time_source)
 
     unless time_specs[:month][0].include?(t.month)
       nudge_month(t)
@@ -123,18 +142,18 @@ class CronParser
             [$1.to_i]
           end
         else
-          raise "Bad Vixie-style specification #{subel}"
+          raise ArgumentError, "Bad Vixie-style specification #{subel}"
         end
       end
     end.flatten.sort
 
-    [Set.new(values), values]
+    [Set.new(values), values, elem]
   end
 
 
   protected
 
-  # returns a list of days which do both match time_spec[:dom] and time_spec[:dow]
+  # returns a list of days which do both match time_spec[:dom] or time_spec[:dow]
   def interpolate_weekdays(year, month)
     @_interpolate_weekdays_cache ||= {}
     @_interpolate_weekdays_cache["#{year}-#{month}"] ||= interpolate_weekdays_without_cache(year, month)
@@ -142,12 +161,21 @@ class CronParser
 
   def interpolate_weekdays_without_cache(year, month)
     t = Date.new(year, month, 1)
-    valid_mday = time_specs[:dom][0]
-    valid_wday = time_specs[:dow][0]
+    valid_mday, _, mday_field = time_specs[:dom]
+    valid_wday, _, wday_field = time_specs[:dow]
+    
+    # Careful, if both DOW and DOM fields are non-wildcard,
+    # then we only need to match *one* for cron to run the job:
+    if not (mday_field == '*' and wday_field == '*')
+      valid_mday = [] if mday_field == '*'
+      valid_wday = [] if wday_field == '*'
+    end
+    # Careful: crontabs may use either 0 or 7 for Sunday:
+    valid_wday << 0 if valid_wday.include?(7)
 
     result = []
     while t.month == month
-      result << t.mday if valid_mday.include?(t.mday) && valid_wday.include?(t.wday)
+      result << t.mday if valid_mday.include?(t.mday) || valid_wday.include?(t.wday)
       t = t.succ
     end
 

data/lib/parse-cron/version.rb

@@ -1,5 +1,5 @@
 module Parse
   module Cron
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/spec/cron_parser_spec.rb

@@ -26,26 +26,57 @@ end
 
 describe "CronParser#next" do
   [
-    ["* * * * *",       "2011-08-15 12:00",  "2011-08-15 12:01"],
-    ["* * * * *",       "2011-08-15 02:25",  "2011-08-15 02:26"],
-    ["* * * * *",       "2011-08-15 02:59",  "2011-08-15 03:00"],
-    ["*/15 * * * *",    "2011-08-15 02:02",  "2011-08-15 02:15"],
-    ["*/15,25 * * * *", "2011-08-15 02:15",  "2011-08-15 02:25"],
-    ["30 3,6,9 * * *",  "2011-08-15 02:15",  "2011-08-15 03:30"],
-    ["30 9 * * *",      "2011-08-15 10:15",  "2011-08-16 09:30"],
-    ["30 9 * * *",      "2011-08-31 10:15",  "2011-09-01 09:30"],
-    ["30 9 * * *",      "2011-09-30 10:15",  "2011-10-01 09:30"],
-    ["0 9 * * *",       "2011-12-31 10:15",  "2012-01-01 09:00"],
-    ["* * 12 * *",      "2010-04-15 10:15",  "2010-05-12 00:00"],
-    ["* * * * 1,3",     "2010-04-15 10:15",  "2010-04-19 00:00"],
-    ["* * * * MON,WED", "2010-04-15 10:15",  "2010-04-19 00:00"],
-    ["0 0 1 1 *",       "2010-04-15 10:15",  "2011-01-01 00:00"],
-    ["0 0 * * 1",       "2011-08-01 00:00",  "2011-08-08 00:00"],
-    ["0 0 * * 1",       "2011-07-25 00:00",  "2011-08-01 00:00"],
-    ["45 23 7 3 *",     "2011-01-01 00:00",  "2011-03-07 23:45"],
-    ["0 0 1 jun *",     "2013-05-14 11:20",  "2013-06-01 00:00"],
-    ["0 0 1 may,jul *", "2013-05-14 15:00",  "2013-07-01 00:00"],
-    ["0 0 1 MAY,JUL *", "2013-05-14 15:00",  "2013-07-01 00:00"],
+    ["* * * * *",             "2011-08-15 12:00",  "2011-08-15 12:01"],
+    ["* * * * *",             "2011-08-15 02:25",  "2011-08-15 02:26"],
+    ["* * * * *",             "2011-08-15 02:59",  "2011-08-15 03:00"],
+    ["*/15 * * * *",          "2011-08-15 02:02",  "2011-08-15 02:15"],
+    ["*/15,25 * * * *",       "2011-08-15 02:15",  "2011-08-15 02:25"],
+    ["30 3,6,9 * * *",        "2011-08-15 02:15",  "2011-08-15 03:30"],
+    ["30 9 * * *",            "2011-08-15 10:15",  "2011-08-16 09:30"],
+    ["30 9 * * *",            "2011-08-31 10:15",  "2011-09-01 09:30"],
+    ["30 9 * * *",            "2011-09-30 10:15",  "2011-10-01 09:30"],
+    ["0 9 * * *",             "2011-12-31 10:15",  "2012-01-01 09:00"],
+    ["* * 12 * *",            "2010-04-15 10:15",  "2010-05-12 00:00"],
+    ["* * * * 1,3",           "2010-04-15 10:15",  "2010-04-19 00:00"],
+    ["* * * * MON,WED",       "2010-04-15 10:15",  "2010-04-19 00:00"],
+    ["0 0 1 1 *",             "2010-04-15 10:15",  "2011-01-01 00:00"],
+    ["0 0 * * 1",             "2011-08-01 00:00",  "2011-08-08 00:00"],
+    ["0 0 * * 1",             "2011-07-25 00:00",  "2011-08-01 00:00"],
+    ["45 23 7 3 *",           "2011-01-01 00:00",  "2011-03-07 23:45"],
+    ["0 0 1 jun *",           "2013-05-14 11:20",  "2013-06-01 00:00"],
+    ["0 0 1 may,jul *",       "2013-05-14 15:00",  "2013-07-01 00:00"],
+    ["0 0 1 MAY,JUL *",       "2013-05-14 15:00",  "2013-07-01 00:00"],
+    ["40 5 * * *",            "2014-02-01 15:56",  "2014-02-02 05:40"],
+    ["0 5 * * 1",             "2014-02-01 15:56",  "2014-02-03 05:00"],
+    ["10 8 15 * *",           "2014-02-01 15:56",  "2014-02-15 08:10"],
+    ["50 6 * * 1",            "2014-02-01 15:56",  "2014-02-03 06:50"],
+    ["1 2 * apr mOn",         "2014-02-01 15:56",  "2014-04-07 02:01"],
+    ["1 2 3 4 7",             "2014-02-01 15:56",  "2014-04-03 02:01"],
+    ["1 2 3 4 7",             "2014-04-04 15:56",  "2014-04-06 02:01"],
+    ["1-20/3 * * * *",        "2014-02-01 15:56",  "2014-02-01 16:01"],
+    ["1,2,3 * * * *",         "2014-02-01 15:56",  "2014-02-01 16:01"],
+    ["1-9,15-30 * * * *",     "2014-02-01 15:56",  "2014-02-01 16:01"],
+    ["1-9/3,15-30/4 * * * *", "2014-02-01 15:56",  "2014-02-01 16:01"],
+    ["1 2 3 jan mon",         "2014-02-01 15:56",  "2015-01-03 02:01"],
+    ["1 2 3 4 mON",           "2014-02-01 15:56",  "2014-04-03 02:01"],
+    ["1 2 3 jan 5",           "2014-02-01 15:56",  "2015-01-02 02:01"],
+    ["@yearly",               "2014-02-01 15:56",  "2015-01-01 00:00"],
+    ["@annually",             "2014-02-01 15:56",  "2015-01-01 00:00"],
+    ["@monthly",              "2014-02-01 15:56",  "2014-03-01 00:00"],
+    ["@weekly",               "2014-02-01 15:56",  "2014-02-02 00:00"],
+    ["@daily",                "2014-02-01 15:56",  "2014-02-02 00:00"],
+    ["@midnight",             "2014-02-01 15:56",  "2014-02-02 00:00"],
+    ["@hourly",               "2014-02-01 15:56",  "2014-02-01 16:00"],
+    ["*/3 * * * *",           "2014-02-01 15:56",  "2014-02-01 15:57"],
+    ["0 5 * 2,3 *",           "2014-02-01 15:56",  "2014-02-02 05:00"],
+    ["15-59/15 * * * *",      "2014-02-01 15:56",  "2014-02-01 16:15"],
+    ["15-59/15 * * * *",      "2014-02-01 15:00",  "2014-02-01 15:15"],
+    ["15-59/15 * * * *",      "2014-02-01 15:01",  "2014-02-01 15:15"],
+    ["15-59/15 * * * *",      "2014-02-01 15:16",  "2014-02-01 15:30"],
+    ["15-59/15 * * * *",      "2014-02-01 15:26",  "2014-02-01 15:30"],
+    ["15-59/15 * * * *",      "2014-02-01 15:36",  "2014-02-01 15:45"],
+    ["15-59/15 * * * *",      "2014-02-01 15:45",  "2014-02-01 16:15"],
+    ["15-59/15 * * * *",      "2014-02-01 15:46",  "2014-02-01 16:15"],
   ].each do |line, now, expected_next|
     it "should return #{expected_next} for '#{line}' when now is #{now}" do
       now = parse_date(now)
@@ -60,24 +91,55 @@ end
 
 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"],
+    ["* * * * *",             "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"],
   ].each do |line, now, expected_next|
     it "should return #{expected_next} for '#{line}' when now is #{now}" do
       now = parse_date(now)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: parse-cron
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Siebert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,26 +46,25 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/siebertm/parse-cron
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: parse-cron
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parses cron expressions and calculates the next occurence
 test_files: []