chronic_cron 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b0ea744fa7e77efc5ec721eb6fca1bcad81660
-  data.tar.gz: b6bb72784ba74696827041ad09ba5ef64c70f288
+  metadata.gz: 853b5f2a3c7ee683d680e2304124c46a6b9aa178
+  data.tar.gz: ce201e7682eba76ec3a29ccbe8b11a1d2ce6168b
 SHA512:
-  metadata.gz: 5e3d02e52753d8b49fd13f846e552abdc58e05e3e954a03dde7c234cd08cb85d304bc5f3cf861471938c6934aedbb80b662ecfb98345abff1e587995f47d3512
-  data.tar.gz: 8b05d09f7c3b335f672aa62f8a4145b4de43625c2f37a8515282f904ff510d91a469ca7489be68a192c2a4a34f391e67bdc0d8ed7604da1bea7beb7fb1778ed1
+  metadata.gz: 82310745fcde76212ada8ac07920994eaca560974e800a7138f115651cbf13e62f1f3890df7105fbb13f5c5555c3b43b336631fce5075ba9be5ac18fafc25dfb
+  data.tar.gz: 17dfb8016753beaa8b7d96b54191ad6f6126c17ad14be4ddbba36ff7dd38db99e50d5d1f910fc86038b2192c8be506e27de2680865bebf1b6d324a2cee9aad7d

data/lib/chronic_cron.rb

@@ -21,12 +21,17 @@ class ChronicCron
     @params = {input: s}
     expressions(@params)
 
-    expression = find_expression(s.sub(/^(?:on|at)\s+/,''))
+    expression = find_expression(s.sub(/^(?:on|at|from|starting)\s+/,''))
     @cf = CronFormat.new(expression, now)    
     @to_expression = @cf.to_expression
 
   end
   
+  def inspect() 
+    "#<ChronicCron:%s @to_expression=\"%s\", @to_time=\"%s\">" % 
+        [self.object_id, @to_expression, @cf.to_time]
+  end
+  
   def next()    @cf.next    end
   def to_time() @cf.to_time end
     
@@ -35,26 +40,29 @@ class ChronicCron
   def expressions(params) 
 
     r = '[0-9\*,\?\/\-]+'
+    daily = '(?:every day|daily)'
+    
     # e.g. 00 5 15 * *
     get /(#{r}\s+#{r}\s+#{r}\s#{r}\s#{r})(\s#{r})?/ do
       "%s%s" % params[:captures]
     end
 
     # e.g. 9:00-18:00 every day
-    get /(\d{1,2}):(\d{1,2})-(\d{1,2}):\d{1,2}\s+every day/ do
+    get /(\d{1,2}):(\d{1,2})-(\d{1,2}):\d{1,2}\s+#{daily}/ 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|
+         puts 'cute'
       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 
+    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+#{daily}/ 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
@@ -62,7 +70,7 @@ class ChronicCron
     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 
+    get /(\d{1,2}):(\d{1,2})([ap]m)(?:\s+until\s+|\s*-\s*)(\d{1,2}):\d{1,2}([ap]m)\s+#{daily}/ 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
@@ -70,8 +78,9 @@ class ChronicCron
     end    
 
     # e.g. 10:15am every day
-    get /(\d{1,2}):(\d{1,2})([ap]m)?\s+every day/ do |raw_hrs, mins, meridiem|
+    get /(\d{1,2}):(\d{1,2})([ap]m)?\s+#{daily}/ do |raw_hrs, mins, meridiem|
       hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      puts 'book'
       "%s %s * * *" % [mins.to_i, hrs]
     end
 
@@ -83,7 +92,7 @@ class ChronicCron
     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
+    get /(\d{1,2}):(\d{1,2}) and (\d{1,2}):\d{1,2} (?:on )?#{daily}/ do
       "%s %s,%s * * *" % params[:captures].values_at(1,0,2)
     end
 
@@ -96,15 +105,18 @@ class ChronicCron
     get('yearly')   {'0 0 1 1 *'}
     get('annually') {'0 0 1 1 *'}
     
+    weekday = '((?:mon|tue|wed|thu|fri|sat|sun)\w*)'
+    
     # e.g. at 10:30pm on every Monday
-    get /(\d{1,2}):(\d{1,2})([ap]m)?\s+(?:on )?every (\w+)/ do 
+    get /(\d{1,2}):(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do 
                                               |raw_hrs, mins, meridiem, wday|                                              
       hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
+      puts 'hmmm'
       "%s %s * * %s" % [mins, hrs , wday]
     end
     
     # e.g. at 10pm on every Monday
-    get /(\d{1,2})([ap]m)?\s+(?:on )?every ((?:mon|tue|wed|thu|fri|sat|sun)\w*)/i do 
+    get /(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do 
                                               |raw_hrs, meridiem, wday|
       hrs = meridiem == 'pm' ? raw_hrs.to_i + 12 : raw_hrs
       "0 %s * * %s" % [hrs , wday]
@@ -120,7 +132,7 @@ class ChronicCron
     
     # e.g. every 2 days
     get(/every (\d{1,2}) days?/){|days| "* * */%s * *" % [days]}    
-    get(/every day/){ "0 0 * * *"}
+    get(/#{daily}/){ "0 0 * * *"}
     
     get /any\s?time today/ do
       self.instance_eval %q(
@@ -134,20 +146,21 @@ class ChronicCron
     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
+    get /every\s+#{weekday}\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
+    get /every\s+#{weekday}\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
+      puts 'coo'
       "%s %s * * %s" % [mins, hrs , wday]
     end    
     
-
+    # e.g. starting 05-Aug@15:03 every 2 weeks
     get /(.*) every (\d) weeks/ do |raw_date, interval|
 
       t = Chronic.parse(raw_date)
@@ -155,6 +168,23 @@ class ChronicCron
       "%s %s %s %s %s/%s %s" % [mins, hrs, day, month, t.wday, interval, year]
     end        
     
+    # e.g. from 05-Aug@12:34 fortnightly
+    get /(.*)\s+(?:biweekly|fortnightly)/ do |raw_date|
+
+      t = Chronic.parse(raw_date)
+      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            
+
+    # e.g. from 06-Aug@1pm every week
+    get /(.*)\s+(?:weekly|every week)/ do |raw_date|
+
+      t = Chronic.parse(raw_date)
+      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. 04-Aug@12:34
     get '*' do
       
       t = Chronic.parse(params[:input])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes