chronic_cron 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9ea4752e7ad0897c73210502784661e2b28e3b
-  data.tar.gz: 8be6295f0f7e8167c3dcef25a01edd9b32fdcd9b
+  metadata.gz: 0d7c7abf5cc1f534726e758672d9c323f78e3426
+  data.tar.gz: fea193074527c2868b5d9bb0bcdffc82375df313
 SHA512:
-  metadata.gz: ff383491ee4acf1c7596c07f38a58430f510b556392d4fcfe115d4534ad0e1cdb463b0c9f839d8981a602e3f56c8ed6cbff1210d1c60b078e215d9042c6d5188
-  data.tar.gz: 9b1c11cc9bdf367657cc61816cd7268de4909adf02e2d8c3d7c067789ccae867abec8d06d8aa736b3e5bc2144c7749f917c6e9367c351e3dc67116840bafdc0d
+  metadata.gz: 1b91b1730c74cbe6c6d336e298c7cdb4b3efe034dc72b05cb711326e899295570ea6c74ffa72574efc81864231ef5ab3446ceadf9b2908a4faf194bcb67836f5
+  data.tar.gz: 542d93e2005e754b5a37697674a12bb20908f4fe90ae01dbba0a72a764c2b604915133e5c1ff0a173f7410f35f4ba6427b839fca3cb5d2dae905a4d8d81137aa

data/lib/chronic_cron.rb

@@ -8,6 +8,8 @@ require 'cron_format'
 require 'timetoday'
 
 
+WEEK = DAY * 7
+
 class ChronicCron
   include AppRoutes
   
@@ -22,6 +24,7 @@ class ChronicCron
     expressions(@params)
 
     expression = find_expression(s.sub(/^(?:on|at|from|starting)\s+/,''))
+
     @cf = CronFormat.new(expression, now)    
     @to_expression = @cf.to_expression
 
@@ -160,7 +163,7 @@ class ChronicCron
     # e.g. starting 05-Aug@15:03 every 2 weeks
     get /(.*) every (\d) weeks/ do |raw_date, interval|
 
-      t = Chronic.parse(raw_date)
+      t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
       "%s %s %s %s %s/%s %s" % [mins, hrs, day, month, t.wday, interval, year]
     end        
@@ -168,7 +171,7 @@ class ChronicCron
     # e.g. from 05-Aug@12:34 fortnightly
     get /(.*)\s+(?:biweekly|fortnightly)/ do |raw_date|
 
-      t = Chronic.parse(raw_date)
+      t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
       "%s %s %s %s %s/2 %s" % [mins, hrs, day, month, t.wday, year]
     end            
@@ -176,19 +179,51 @@ class ChronicCron
     # e.g. from 06-Aug@1pm every week
     get /(.*)\s+(?:weekly|every week)/ do |raw_date|
 
-      t = Chronic.parse(raw_date)
+      t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
       "%s %s %s %s %s %s" % [mins, hrs, day, month, t.wday, year]
     end            
     
+    # e.g. first thursday of each month at 7:30pm
+    nday = '(\w+(?:st|rd|nd))\s+' + weekday + '\s+'
+    get /#{nday}(?:of\s+)?(?:the|each|every)\s+month(?:\s+at\s+([^\s]+))?/ do
+                                                  |nth_week, day_of_week, time|
+
+      month = @now.month
+
+      h = {
+            /first|1st/       => 0, 
+            /second|2nd/      => 1, 
+            /third|3rd/       => 2, 
+            /fourth|4th|last/ => 3
+      }
+
+      _, nweek = h.find{|k,_| nth_week[k]}
+
+      def make_date(day_of_week, month, time, nweek)
+
+        Chronic.parse([day_of_week,month,time].join(' '), :now => @now) \
+          + WEEK * nweek
+      end
+
+      months = %w(jan feb mar apr may jun jul aug sep oct nov dec)
+      t = make_date day_of_week, months[month-1], time, nweek
+
+      if t < Time.now
+        t = make_date(day_of_week, months.rotate[month-1], time, nweek)
+      end
+
+      "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+    end 
+
     # e.g. 04-Aug@12:34
     get '*' do
       
-      t = Chronic.parse(params[:input])
+      t = Chronic.parse(params[:input], :now => @now)
       "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
     end    
   end
   
   alias find_expression run_route
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - James Robertson
@@ -29,62 +29,62 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cron_format
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timetoday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -104,12 +104,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []