chronic_cron 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e96a490a0772cc3fb664d21a43ff08e1c75c57313a22d5ae439e4f8a0d9afe66
-  data.tar.gz: 7408f6ee2a8cf3b96f49df24701f497b5d9b5bb4a38589e0c16f5c89ba9ebdf3
+  metadata.gz: 71cb9fbaff016e7cf04a40aa56dedba54844753254825889c6e1525aa680be7b
+  data.tar.gz: e5b614c4fdd6c3935eb7276387206c6b1e5ed90cf84c18c1a16ef8819fd6c318
 SHA512:
-  metadata.gz: f75d5c571167e0f57ad4af8dbd5f79597f2eed929f03d83050b9b6e8e24bd90d9aca7cad1e029c2bb768b1db7fa9e24b96f91d1a0ce866b9b25fdcc15511b460
-  data.tar.gz: 793fdf3d0f8ba26a03450d9a8ba939f6dd8d54e472eff0c872b3793942a494b5eac98306e04866d2ebad27ef5b29ad11e407eebffd3242dd62258aff72a1bd72
+  metadata.gz: 2ca9ba056ab67289a9a63bfc865ab45f3d7cdf70caeb28db11c912f80e0161f6cf9aa7cf74a812c7cd5ee0372c14ca9b875c50d9321880bf29909fc1079fad5a
+  data.tar.gz: 067d8f29da520258af4fa0054e446084bb49cedb04260821a94f5ce0800b82ed4f9f7772f392d7d46ef7c87708dc2d3d4b1a891fe5ee9d5dbf8230351d2c34e5

data/lib/chronic_cron.rb

@@ -11,77 +11,77 @@ require 'timetoday'
 class ChronicCron
   include AppRoutes
   using ColouredText
-  
-  attr_reader :to_expression  
-  
+
+  attr_reader :to_expression
+
   def self.parse(s)
     r = new(s)
     r.valid? ? r : nil
   end
-  
+
   def initialize(s, now=Time.now, log: nil, debug: false)
-    
+
     @now, @log, @debug = now, log, debug
-    
-    puts ('@now: ' + @now.inspect).debug if @debug    
-    
+
+    puts ('@now: ' + @now.inspect).debug if @debug
+
     super()
     @params = {input: s}
     expressions(@params)
 
     if s =~ /^tomorrow/i then
-      
+
       s.sub!(/^tomorrow /i,'')
       expression = find_expression(s.downcase\
                                  .sub(/^(?:is|on|at|from|starting)\s+/,''))
-      @cf = CronFormat.new(expression, now)      
+      @cf = CronFormat.new(expression, now)
       @cf.adjust_date @cf.to_time - (24 * 60 * 60)
-      
+
     else
-      
+
       expression = find_expression(s.downcase\
                                  .sub(/^(?:on|at|from|starting)\s+/,''))
       puts 'expression: ' + expression.inspect if @debug
       return unless expression
-      
-      @cf = CronFormat.new(expression, now)      
-      
+
+      @cf = CronFormat.new(expression, now)
+
     end
-    
+
 
     @to_expression = @cf.to_expression
 
   end
-  
+
   def inspect()
     if @cf then
-      "#<ChronicCron:%s @to_expression=\"%s\", @to_time=\"%s\">" % 
+      "#<ChronicCron:%s @to_expression=\"%s\", @to_time=\"%s\">" %
         [self.object_id, @to_expression, @cf.to_time]
     else
       "#<ChronicCron:%s >" % [self.object_id]
     end
   end
-  
+
   def next()
     @cf.next
   end
-    
-  def to_date() 
+
+  def to_date()
     @cf.to_time.to_date
   end
-  
+
   def to_time()
     @cf.to_time
   end
-  
+
   def valid?
     @cf.respond_to? :to_time
   end
-    
+
   protected
 
-  def expressions(params) 
-    
+  def expressions(params)
+
     log = @log
 
     r = '[0-9\*,\?\/\-]+'
@@ -89,83 +89,83 @@ class ChronicCron
 
     # e.g. 00 5 15 * *
     get /(#{r}\s+#{r}\s+#{r}\s#{r}\s#{r})(\s#{r})?/ do
-      
+
       puts 'ChronicCron#expressions 10' if @debug
-      
+
       "%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+#{daily}/ do
-      
+
       puts 'ChronicCron#expressions 20' if @debug
-      
+
       "%s %s-%s * * *" % params[:captures].values_at(1,0,2)
-    end    
+    end
 
     # e.g. every 30mins from 8:00am until 8:00pm mon-fri
-    get /every\s+(\d+)\s*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+)/x do 
+    get /every\s+(\d+)\s*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+)/x 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
-      
+
       puts 'ChronicCron#expressions 30' if @debug
-      
+
       "%s/%s %s-%s * * %s" % [mins1.to_i, interval_mins, hrs1, hrs2, wdays]
-    end        
-    
+    end
+
     # e.g. every 30mins from 8:00am until 8:00pm every day
-    get /every\s+(\d+)\s*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 
+    get /every\s+(\d+)\s*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
-      
+
       puts 'ChronicCron#expressions 40' if @debug
-      
+
       "%s/%s %s-%s * * *" % [mins1.to_i, interval_mins, hrs1, hrs2]
-    end        
-    
+    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+#{daily}/ 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
-      
+
       puts 'ChronicCron#expressions 50' if @debug
-      
+
       "%s %s-%s * * *" % [mins1.to_i, hrs1, hrs2]
-    end    
+    end
 
     # e.g. 10:15am every day
     get /(\d{1,2}):?(\d{1,2})([ap]m)?\s+#{daily}/ do |raw_hrs, mins, meridiem|
       hrs = in24hrs(raw_hrs, meridiem)
-      
+
       puts 'ChronicCron#expressions 60' if @debug
-      
+
       "%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 
+    get /(\d{1,2}):?(\d{1,2})([ap]m)?\s+(\w+) to (\w+)/ do
                                   |raw_hrs, mins, meridiem, wday1, wday2|
       hrs = in24hrs(raw_hrs, meridiem)
-      
+
       puts 'ChronicCron#expressions 70' if @debug
-      
+
       "%s %s * * %s-%s" % [mins.to_i, hrs , wday1, wday2]
-    end      
-    
+    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 )?#{daily}/ do
-      
+
       puts 'ChronicCron#expressions 80' if @debug
-      
+
       "%s %s,%s * * *" % params[:captures].values_at(1,0,2)
     end
 
-    
-    get('hourly')   {'0 * * * *'}    
+
+    get('hourly')   {'0 * * * *'}
     get('daily')    {'0 0 * * *'}
     get('midnight') {'0 0 * * *'}
     get('weekly')   {'0 0 * * 0'}
@@ -174,44 +174,44 @@ class ChronicCron
     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 #{weekday}/i do 
-                                              |raw_hrs, mins, meridiem, wday|                                              
+    get /(\d{1,2}):?(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do
+                                              |raw_hrs, mins, meridiem, wday|
       hrs = in24hrs(raw_hrs, meridiem)
-      
+
       puts 'ChronicCron#expressions 90' if @debug
-      
+
       "%s %s * * %s" % [mins, hrs , wday]
     end
-    
+
     # e.g. at 10pm on every Monday
-    get /(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do 
+    get /(\d{1,2})([ap]m)?\s+(?:on )?every #{weekday}/i do
                                               |raw_hrs, meridiem, wday|
       hrs = in24hrs(raw_hrs, meridiem)
-      
+
       puts 'ChronicCron#expressions 100' if @debug
-      
+
       "0 %s * * %s" % [hrs , wday]
-    end    
-    
+    end
+
     # e.g. every 10 minutes
     get(/every (\d{1,2}) min(?:ute)?s?/){|mins| "*/%s * * * *" % [mins]}
     get(/every min(?:ute)?/){"* * * * *"}
-    
+
     # e.g. every 2 hours
     get(/every (\d{1,2}) h(?:ou)?rs?/){|hrs| "* */%s * * *" % [hrs]}
     get(/every hour/){ "0 * * * *"}
-    
+
     # e.g. every 2 days
     get(/every (\d{1,2}) days?/) do |days|
-      
+
       log.info 'ChronicCron/expressions/get: r130' if log
       puts 'ChronicCron#expressions 150' if @debug
-      
+
       "* * */%s * *" % [days]
     end
-    
+
     get(/#{daily}/){ "0 0 * * *"}
 
     get /(?:any\s?time)?(?: today)? between (\S+) and (\S+)/ do |s1, s2|
@@ -222,12 +222,12 @@ class ChronicCron
         t
       end
       )
-      
+
       puts 'ChronicCron#expressions 170' if @debug
-      
+
       "%s %s %s %s *" % TimeToday.between(s1,s2).to_a[1..4]
     end
-    
+
     get /any\s?time today/ do
       self.instance_eval %q(
       def next()
@@ -237,10 +237,10 @@ class ChronicCron
       end
       )
       puts 'ChronicCron#expressions 180' if @debug
-      
+
       "%s %s %s %s *" % TimeToday.future.to_a[1..4]
     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]+))?/i do
@@ -249,9 +249,9 @@ class ChronicCron
       month = @now.month
 
       h = {
-            /first|1st/i       => '1-7', 
-            /second|2nd/i      => '8-14', 
-            /third|3rd/i       => '15-21', 
+            /first|1st/i       => '1-7',
+            /second|2nd/i      => '8-14',
+            /third|3rd/i       => '15-21',
             /fourth|4th|last/i => '22-28'
       }
 
@@ -262,80 +262,80 @@ class ChronicCron
       raw_time ||= '6:00am'
 
       minute, hour = Chronic.parse(raw_time).to_a[1,2]
-      
+
       puts 'ChronicCron#expressions 190' if @debug
-      
+
       "%s %s %s * %s" % [minute, hour, day_range, wday]
 
     end
-    
+
     # e.g. every tuesday at 4pm
     get /every\s+#{weekday}\s+(?:at\s+)?(\d{1,2})([ap]m)/i do
                                               |wday, raw_hrs, meridiem, |
 
-      hrs = in24hrs(raw_hrs, meridiem)      
-      
+      hrs = in24hrs(raw_hrs, meridiem)
+
       puts 'ChronicCron#expressions 200' if @debug
-      
+
       "0 %s * * %s" % [hrs , Date::DAYNAMES.index(wday.capitalize)]
     end
-    
-    
+
+
     # e.g. last sunday of March at 1am
-    
+
     get /last (#{Date::DAYNAMES.join('|')}) (?:of|in) \
 (#{Date::MONTHNAMES[1..-1].join('|')})\s+at\s+(\d{1,2})(?::(\d{1,2}))?\
 ([ap]m)/i do |day, month,  raw_hrs, mins, meridiem|
 
       now = Chronic.parse(month, now: @now)
       puts ('now: ' + now.inspect).debug if @debug
-      
+
       d = last_wdayofmonth(day, now)
       puts ('d: ' + d.inspect).debug if @debug
 
       hrs = in24hrs(raw_hrs, meridiem)
-      
+
       puts 'ChronicCron#expressions 210' if @debug
-      
+
       "%s %s %s %s *" % [mins.to_i, hrs, d.day, d.month]
     end
-    
+
     # e.g. last sunday of October
-    
+
     get /last (#{Date::DAYNAMES.join('|')}) (?:of|in) \
 (#{Date::MONTHNAMES[1..-1].join('|')})/i do |day, month|
 
       now = Chronic.parse(month, now: @now)
 
       d = last_wdayofmonth(day, now)
-      
+
       puts 'ChronicCron#expressions 220' if @debug
-      
+
       "* * %s %s *" % [d.day, d.month]
     end
-    
+
 
     # e.g. every 2nd tuesday at 4:40pm
     get /every\s+2nd\s+#{weekday}\s+at\s+(\d{1,2})(?::(\d{1,2}))?([ap]m)/i do
                                             |wday, raw_hrs, mins, meridiem, |
       hrs = in24hrs(raw_hrs, meridiem)
-      log.info 'ChronicCron/expressions/get: r230' if log
-      
-      puts 'ChronicCron#expressions 220' if @debug
-      
+      log.info 'ChronicCron/expressions/get: r225' if log
+
+      puts 'ChronicCron#expressions 225' if @debug
+
       "%s %s * * %s/2" % [mins.to_i, hrs , wday]
-    end       
-    
+    end
+
     # e.g. every tuesday at 4:40pm
     get /every\s+#{weekday}\s+at\s+(\d{1,2}):(\d{1,2})([ap]m)/i do
                                             |wday, raw_hrs, mins, meridiem, |
       hrs = in24hrs(raw_hrs, meridiem)
-      
+
       puts 'ChronicCron#expressions 230' if @debug
-      
+
       "%s %s * * %s" % [mins, hrs , wday]
-    end    
-    
+    end
+
 
     # e.g. every 2nd week at 6am starting from 7th Jan
     get /every 2nd week\s+at\s+([^\s]+)/ do |raw_time|
@@ -343,20 +343,20 @@ class ChronicCron
       t = Chronic.parse(raw_time, :now => @now)
       log.info 'ChronicCron/expressions/get: r250' if log
       puts 'ChronicCron#expressions 240' if @debug
-      
+
       "%s %s * * %s/2" % [t.min,t.hour,t.wday]
 
-    end        
-    
-    
+    end
+
+
     # e.g. every 2nd monday
     get /every 2nd #{weekday}/ do |wday|
 
       puts 'ChronicCron#expressions 250' if @debug
       "* * * * %s/2" % [wday]
 
-    end       
-    
+    end
+
 
     # e.g.  every 2 weeks (starting 7th Jan 2020)
     get /^every (\w+) weeks \(starting ([^\)]+)/ do |interval, raw_date|
@@ -365,19 +365,19 @@ class ChronicCron
         puts ('raw_date: ' + raw_date.inspect).debug
         puts ('now: ' + @now.inspect).debug
       end
-      
+
       t = raw_date ? Chronic.parse(raw_date, :now => @now) : @now
       t += WEEK * interval.to_i until t > @now
       mins, hrs = t.to_a.values_at(1,2)
-      
-      log.info 'ChronicCron/expressions/get: r260' if log      
+
+      log.info 'ChronicCron/expressions/get: r260' if log
       if @debug then
         puts 'ChronicCron#expressions 260'
         puts ('t: ' + t.inspect).debug
       end
 
       "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
-    end    
+    end
 
     # e.g.  every 2 weeks at 6am starting from 7th Jan
      get /^every (\w+) weeks(?:\s+at\s+([^\s]+))?/ do |interval, raw_time|
@@ -386,19 +386,19 @@ class ChronicCron
         puts ('raw_time: ' + raw_time.inspect).debug
         puts ('now: ' + @now.inspect).debug
       end
-      
+
       t = raw_time ? Chronic.parse(raw_time, :now => @now) : @now
       t += WEEK * interval.to_i until t > @now
       mins, hrs = t.to_a.values_at(1,2)
-      
-      log.info 'ChronicCron/expressions/get: r270' if log      
+
+      log.info 'ChronicCron/expressions/get: r270' if log
       if @debug then
         puts 'ChronicCron#expressions 270'
         puts ('t: ' + t.inspect).debug
       end
 
       "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
-    end    
+    end
 
 
     # e.g. starting 05-Aug@15:03 every 2 weeks
@@ -407,19 +407,19 @@ class ChronicCron
       t = Chronic.parse(raw_date, :now => @now)
       mins, hrs = t.to_a.values_at(1,2)
       puts 'ChronicCron#expressions 280' if @debug
-      
+
       "%s %s * * %s/%s" % [mins, hrs, t.wday, interval]
-    end    
-    
+    end
+
     # e.g. from 05-Aug@12:34 fortnightly
     get /(.*)\s+(?:biweekly|fortnightly)/ do |raw_date|
 
       t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
       puts 'ChronicCron#expressions 290' if @debug
-      
+
       "%s %s %s %s %s/2 %s" % [mins, hrs, day, month, t.wday, year]
-    end            
+    end
 
     # e.g. from 06-Aug@1pm every week
     get /(.*)\s+(?:weekly|every week)/ do |raw_date|
@@ -427,18 +427,18 @@ class ChronicCron
       t = Chronic.parse(raw_date, :now => @now)
       mins, hrs, day, month, year = t.to_a.values_at(1,2,3,4,5)
       puts 'ChronicCron#expressions 300' if @debug
-      
+
       "%s %s %s %s %s %s" % [mins, hrs, day, month, t.wday, year]
-    end            
-        
+    end
+
     # e.g. every sunday
     get /every\s+#{weekday}/ do |wday|
-      
+
       puts 'ChronicCron#expressions 310' if @debug
-      
+
       "0 12 * * %s" % wday
-    end    
-    
+    end
+
     # e.g. 04-Aug@12:34
     get '*' do
 
@@ -452,29 +452,31 @@ class ChronicCron
 
     def in24hrs(raw_hrs, meridiem)
 
+      puts 'raw_hrs: ' + raw_hrs.inspect if @debug
+
       hrs = if meridiem == 'pm' then
-        raw_hrs.to_i + 12
+        raw_hrs.to_i < 12 ? raw_hrs.to_i + 12 : raw_hrs.to_i
       else
         raw_hrs.to_i == 12 ? 0 : raw_hrs
       end
-    end    
+    end
   end
-  
-  
+
+
   alias find_expression run_route
-  
+
   private
-  
+
   def last_wdayofmonth(day, now)
-    
+
     wday = Date::DAYNAMES.map(&:downcase).index(day)
 
     d2 = Date.today
     date = Date.civil(now.year, now.month, -1)
-    date -= 1 until date.wday == wday       
-      
+    date -= 1 until date.wday == wday
+
     return date
-    
+
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic_cron
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   Yot8KuDDSCrW7txuQr8nBdP8TtGBceStvkqoqSGvzsppfoAzykAkc8zujoN1s8d2
   ioSUG4tmSnO/l+mykryWcbFA
   -----END CERTIFICATE-----
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -118,7 +118,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []