chronic_cron 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a52bba0dc03a218eba9cf03cf536a92da1e0b18
-  data.tar.gz: 60c510cc9a7527502d7aae13bdc895ba288d223b
+  metadata.gz: 8bfa9beb76e7abb91b85a3ccd52823c1d36b9873
+  data.tar.gz: d1bd4a8b022373d6b64c545e8a14d185b6cdb64f
 SHA512:
-  metadata.gz: a6a5ee2e8a4a2d7d37803495677f04237288e7cff8dc8eadc883b7674bac9600e3f649421d76767adc130e3085502560a9d7611e281e13cbe74103700b6dd2b8
-  data.tar.gz: 34bed762ce488b1b98e29aaace360dc9f4bba0361fc009f30fca6d8db521c05cd83cba9e436619774e5826989b0f77b1512ef9e5609dd2d837b1b9af8799eb95
+  metadata.gz: da41b6adb933b072841e64855f4120c2835d145d08fd1a3ae5106aba3acd8703de02cbfb074b3bb9247bcbdd244b900eea47d5c83ac484d9e1671ffe1b373edf
+  data.tar.gz: fa1ad5d0c0192ee15fff38c53b3b3410f97b34b8640f495dc6add91734e4766c9b13927814b9a355f8c81a16820b4b4f7d9127ad05e5d76fe98aa3c75631107a

data/lib/chronic_cron.rb

@@ -14,19 +14,16 @@ class ChronicCron
   attr_reader :to_expression  
   
   def initialize(s, now=Time.now)
+    
     @now = now
+    
     super()
-    @params = {}
+    @params = {input: s}
     expressions(@params)
 
-    @to_expression = find_expression(s.sub(/^(?:on|at)\s+/,''))
-
-    if @to_expression.nil? then
-      t = Chronic.parse(s)
-      @to_expression = "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
-    end
-    
-    @cf = CronFormat.new(@to_expression, now)    
+    expression = find_expression(s.sub(/^(?:on|at)\s+/,''))
+    @cf = CronFormat.new(expression, now)    
+    @to_expression = @cf.to_expression
 
   end
   
@@ -47,18 +44,42 @@ class ChronicCron
     get /(\d{1,2}):(\d{1,2})-(\d{1,2}):\d{1,2}\s+every day/ do
       "%s %s-%s * * *" % params[:captures].values_at(1,0,2)
     end    
+
+    # e.g. every 30mins from 8:00am until 8:00pm mon-fri
+    get /every\s+(\d+)mins\s+from\s+(\d{1,2}):(\d{1,2})([ap]m)(?:\s+until\s+|\s*-\s*)(\d{1,2}):\d{1,2}([ap]m)\s+(\w+\-\w+)/ do 
+         |interval_mins, r_hrs1, mins1, meridiem1, r_hrs2, meridiem2, wdays|
+      hrs1 = meridiem1 == 'pm' ? r_hrs1.to_i + 12 : r_hrs1
+      hrs2 = meridiem2 == 'pm' ? r_hrs2.to_i + 12 : r_hrs2
+      "%s/%s %s-%s * * %s" % [mins1.to_i, interval_mins, hrs1, hrs2, wdays]
+    end        
     
+    # e.g. every 30mins from 8:00am until 8:00pm every day
+    get /every\s+(\d+)mins\s+from\s+(\d{1,2}):(\d{1,2})([ap]m)(?:\s+until\s+|\s*-\s*)(\d{1,2}):\d{1,2}([ap]m)\s+every day/ do 
+                  |interval_mins, r_hrs1, mins1, meridiem1, r_hrs2, meridiem2|
+      hrs1 = meridiem1 == 'pm' ? r_hrs1.to_i + 12 : r_hrs1
+      hrs2 = meridiem2 == 'pm' ? r_hrs2.to_i + 12 : r_hrs2
+      "%s/%s %s-%s * * *" % [mins1.to_i, interval_mins, hrs1, hrs2]
+    end        
+    
+    # e.g. 8:00am until 8:00pm every day
+    get /(\d{1,2}):(\d{1,2})([ap]m)(?:\s+until\s+|\s*-\s*)(\d{1,2}):\d{1,2}([ap]m)\s+every day/ do 
+                                  |r_hrs1, mins1, meridiem1, r_hrs2, meridiem2|
+      hrs1 = meridiem1 == 'pm' ? r_hrs1.to_i + 12 : r_hrs1
+      hrs2 = meridiem2 == 'pm' ? r_hrs2.to_i + 12 : r_hrs2
+      "%s %s-%s * * *" % [mins1.to_i, hrs1, hrs2]
+    end    
+
     # e.g. 10:15am every day
     get /(\d{1,2}):(\d{1,2})([ap]m)?\s+every day/ do |raw_hrs, mins, meridiem|
       hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
-      "%s %s * * *" % [mins, hrs]
+      "%s %s * * *" % [mins.to_i, hrs]
     end
 
     # e.g. at 7:30am  Monday to Friday
     get /(\d{1,2}):(\d{1,2})([ap]m)?\s+(\w+) to (\w+)/ do 
                                   |raw_hrs, mins, meridiem, wday1, wday2|
       hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
-      "%s %s * * %s-%s" % [mins, hrs , wday1, wday2]
+      "%s %s * * %s-%s" % [mins.to_i, hrs , wday1, wday2]
     end      
     
     # e.g. at 11:00 and 16:00 on every day
@@ -82,6 +103,13 @@ class ChronicCron
       "%s %s * * %s" % [mins, hrs , wday]
     end
     
+    # e.g. at 10pm on every Monday
+    get /(\d{1,2})([ap]m)?\s+(?:on )?every (\w+)/ do 
+                                              |raw_hrs, meridiem, wday|
+      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      "0 %s * * %s" % [hrs , wday]
+    end    
+    
     # e.g. every 10 minutes
     get(/every (\d{1,2}) min(?:ute)?s?/){|mins| "*/%s * * * *" % [mins]}
     get(/every min(?:ute)?/){"* * * * *"}
@@ -104,7 +132,25 @@ class ChronicCron
       )
       "%s %s %s %s *" % TimeToday.future.to_a[1..4]
     end
-      
+    
+    # e.g. every tuesday at 4pm
+    get /every\s+((?:mon|tue|wed|thu|fri|sat|sun)\w*)\s+at\s+(\d{1,2})([ap]m)/i do
+                                              |wday, raw_hrs, meridiem, |
+      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      "0 %s * * %s" % [hrs , wday]
+    end
+
+    # e.g. every tuesday at 4:40pm
+    get /every\s+((?:mon|tue|wed|thu|fri|sat|sun)\w*)\s+at\s+(\d{1,2}):(\d{1,2})([ap]m)/i do
+                                            |wday, raw_hrs, mins, meridiem, |
+      hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      "%s %s * * %s" % [mins, hrs , wday]
+    end    
+    
+    get '*' do
+      t = Chronic.parse(params[:input])
+      "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+    end    
   end
   
   alias find_expression run_route

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes