chronic_cron 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 458ff279c84a6b33d0170d439a8fe778a84c99dd
-  data.tar.gz: eff7fd81c420c20244e6868b9846d10a0f70644e
+  metadata.gz: 2905fbb74f2751ec5e4c11dbd7252c3d8cfa18aa
+  data.tar.gz: 7cb2895a989f2b69e32d4fb09a9879d09cd900fc
 SHA512:
-  metadata.gz: 1b9f06bc8eb7d6d19596eefbd1fc3694a8292d441cf30b386d6af7b77fa3c731397162dc5a562fd5019ab97712ade38de1f920feb6fe2aceac9c9a9beb5ba4d6
-  data.tar.gz: 91e75c9295098912cb337171dd40acc40a31a626cfaa61b33aaeaada642c1f29fadd9fddfefb1665e17a2e5b10b0dfd69ef57bd710880b872a949e9522013010
+  metadata.gz: ec977ff378adcc1d2d58f2715422188b4e59e9e3472e5ccc8389c4eaef697f875f8ecab61a18cae5a153a171db91080d61286c5acf50cd9a595a8ccfdeae656b
+  data.tar.gz: 3a15e52e2938834d2f51baace5486ebe54846b343587c1af62b581a5ac609271eb37ca48c1b420645fa56854e0b7f3572ad856b17c4bea5d2dc2a4bc9d08f796

data/lib/chronic_cron.rb

@@ -44,11 +44,18 @@ class ChronicCron
     end
 
     # e.g. 10:15am every day
-    get /(\d{1,2}):(\d{1,2})([ap]m)? every day/ do |raw_hrs, mins, meridiem|
+    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]
     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]
+    end      
+    
     # e.g. at 11:00 and 16:00 on every day
     get /(\d{1,2}):(\d{1,2}) and (\d{1,2}):\d{1,2} (?:on )?every day/ do
       "%s %s,%s * * *" % params[:captures].values_at(1,0,2)
@@ -63,7 +70,7 @@ class ChronicCron
     get('annually') {'0 0 1 1 *'}
     
     # e.g. at 10:30pm on every Monday
-    get /(\d{1,2}):(\d{1,2})([ap]m)? (?:on )?every (\w+)/ do 
+    get /(\d{1,2}):(\d{1,2})([ap]m)?\s+(?:on )?every (\w+)/ do 
                                               |raw_hrs, mins, meridiem, wday|
       hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
       "%s %s * * %s" % [mins, hrs , wday]
@@ -91,8 +98,9 @@ class ChronicCron
       )
       "%s %s %s %s *" % TimeToday.future.to_a[1..4]
     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.13
+  version: 0.2.14
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes