chronic_cron 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2aa1ee213393540b1f82770bdd33cfa00443a7d0c1d23571f46450cb51c51eb
-  data.tar.gz: ab48a734ac469da60395a23e6c4587ff1af4026801e8dbe46e0b20c4ff88884e
+  metadata.gz: 74e6c6b5e6aafa964b67958982e125192dff761eb9368ed437918ba129f579d3
+  data.tar.gz: c261b87089908765d850751596efc61d41fff9a963096a46a592db5b58d374a4
 SHA512:
-  metadata.gz: f5f34e35492918a0709184ba47b5a6dfb113bbd6f3e4f9b03bc7258c1805c261a45cc6f67f0af57e8d69743cdb574b0a4ff2047d3a3903b232d29768ea5cd06c
-  data.tar.gz: bf88b16ff4fa13c1fa5efaa367821b1afabe194be4927cdda20c98daf8fbd23f5111f38f6d86164a406331a53958d1b6564e5f8b948ecf9a793450a676160f9b
+  metadata.gz: 6aeca1b4badf614977581b0dfbfc246746b483f2c4b69fe212e3e066b529019d56a2ad45e215868e7e346d91f70e5fc599cdcb2f1f2064e6f543a2d265825fa4
+  data.tar.gz: 4e62f03e153be58292d68512abd4a338f2337b9443b9fe5dbda504daf39f6b7b45646cf2410b19c3ca0536a1e9575bc716a130f330419341f45fd29bbe9ed836

data/lib/chronic_cron.rb

@@ -8,64 +8,82 @@ require 'cron_format'
 require 'timetoday'
 
 
+MONTHS =  (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1]).join('|')
+
 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+/,''))
-      @cf = CronFormat.new(expression, now)      
-      
+      puts 'expression: ' + expression.inspect if @debug
+      return unless expression
+      puts 'now: ' + now.inspect if @debug
+      @cf = CronFormat.new(expression, now)
+
     end
-    
+
 
     @to_expression = @cf.to_expression
 
   end
-  
-  def inspect() 
-    "#<ChronicCron:%s @to_expression=\"%s\", @to_time=\"%s\">" % 
+
+  def inspect()
+    if @cf then
+      "#<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\*,\?\/\-]+'
@@ -73,83 +91,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'}
@@ -158,44 +176,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|
@@ -206,12 +224,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()
@@ -221,10 +239,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
@@ -233,9 +251,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'
       }
 
@@ -246,101 +264,114 @@ 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}))?\
+(#{MONTHS})\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|
+(#{MONTHS})/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, |
+    #
+    get /every\s+2nd\s+#{weekday}\s+at\s+(\d{1,2})(?::(\d{1,2}))?([ap]m)(.*)/i do
+                                    |wday, raw_hrs, mins, meridiem, remaining|
+
+      log.info 'ChronicCron/expressions/get: r225' if log
+      puts 'ChronicCron#expressions 225' if @debug
+
       hrs = in24hrs(raw_hrs, meridiem)
-      log.info 'ChronicCron/expressions/get: r230' if log
-      
-      puts 'ChronicCron#expressions 220' if @debug
-      
-      "%s %s * * %s/2" % [mins.to_i, hrs , wday]
-    end       
-    
+      puts 'remaining: ' + remaining.inspect if @debug
+
+      if remaining =~ /#{MONTHS}/i then
+
+        t = Chronic.parse(remaining.gsub(/[\(\)]/,''), :now => @now)
+        "%s %s * * %s/2" % [mins.to_i, hrs, t.wday]
+
+      else
+
+        "%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|
 
       t = Chronic.parse(raw_time, :now => @now)
-      log.info 'ChronicCron/expressions/get: r250' if log
+      log.info 'ChronicCron/expressions/get: r240' 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|
@@ -349,19 +380,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|
@@ -370,19 +401,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
@@ -391,19 +422,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|
@@ -411,52 +442,56 @@ 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
 
       t = Chronic.parse(params[:input], :now => @now)
       puts 'ChronicCron#expressions 330' if @debug
-      
-      "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+      puts 't: ' + t.inspect if @debug
+      if t then
+        "%s %s %s %s * %s" % t.to_a.values_at(1,2,3,4,5)
+      end
     end
 
     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.0
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTEwMTczMDU2WhcN
-  MjAwOTA5MTczMDU2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQD+oxz1
-  IhGNszjzVKXOIivImj03s3bNue3UNjX7PPAXpDo5zP8uAGMGcdqjcNzgUziuSnuP
-  603LcDLmVqjAxaGoCq9nLMXij095YbDN4MZDBzXJw5tsb3jJXC43GWNCnFrO8xKP
-  PS2JtF8ou4Cgc+D0rzNvuW/iEDoVrPLAbCI2e3ANmcf7BQCaSETdz7iOZJUPLuKU
-  4PO25XNVVLncZ5t6Y7XLzKPZj2szaLKlHD8DolyF6+g8JA41QKn4KPsdGj9zyFu3
-  BFy7PDGeBRtCWyngl5jwyWQH/xZMGFw619pM/fAVneQF/Bh+IPwp+XU5cw3e7VAG
-  vOd9uAERpGOBNS4Oyh4CDoRK9Er3psySKWv3tGBdcRSfaPzYxaJbQ+KCOEFYgMdK
-  Sj1jMv+JRZq7WfZVn4Zw9ZUjmjVD0vrkGwQIhAe8gpEo2goVRtCVleZhl2mZB5sc
-  0KkOCDJ3oLXBtMB3WmvYvxO1hqBjK5iQ9ZsQj48b2UVu6PhMcVtk66i0qTMCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUhUUXcJrt
-  tdgHkH3nDEQuZnFvxkYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjIzMTIwMDUxWhcN
+  MjIwMjIzMTIwMDUxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCjirUC
+  k7cKAs7ZfV4qGlKIc5eRA/6/kpqIpAb8+YDEIpS5shCWGrGfwRczcO2imBsEcpBb
+  Lj7T0ol0tw0124awanj9q7E+8eJSPwvNrP891onsuJz9VBclOWHFAk0hNrJNGMYE
+  feeUY+LJO2DL8lVZctqMQsNtlmFq3ISm0fE9U8Uy8vaSd8ocBoZNE+ttRcVR69/R
+  bSZJOa+b2SizTJyXs+ynE0MLrQI0Upk6Ze2Pha3Mkuzn9JN5ylPmF7u+Ylh8NtM8
+  C1s0tWl91nN45k3TJQzJCjtBoobl30Fp+mRc36BttLhVs6DNjgNTSWWISbw6yWun
+  yYi5nb+AgbwZIGUGeuXUpiWgPR9IKYw63LQCYUkLqhMzg91Yb7xZrvSi/CkqzE8I
+  ApelfP+IlFac/Sue0BL+YOqCgT1UMY7S73jjInppGYQh/FiTElfyEKZallSWV5BI
+  liIktwj2xfFTY+gMTVkOOdPfxluHYfY26zvgy2Amgtb+quzrvYK2n0wndn8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUYicTvE9t
+  tQvwBoKkP+W51JemQaUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAflvokfPPdUQKrl2dENm7i9AzvnwMDE5AsQyU/+u0
-  RHo139tQZr5D55LxgkpcQx4M9RCygV3Jv+psxI4s/Utpai2fSzUe+HcZ5nbYDtQ1
-  rVRTUWel2UELJfJfUvpvZkGP80YS2uzM/VRnGBfs5/cQabw3FeC10+/Rb6hkxhaR
-  bkNt7UEQqcRRJ3+xktAA63KM1cgfKvjLdw8ZRyZ23rC6DRiPXqLnF9Ec1IM9iuf3
-  Khw3BV/KbJ0V/4adcv6w59Yt8QipeCiP8rC6oMVVUJ64zhyLqwOiG7gUndpz2+Fj
-  kVwMY2OIYwSnx8RzxhRJO9ubYwR8nj6hVlZFCeNqwy7KLfohyuTIrgkfvHGlMEMA
-  /IOiCQ02XiDAWeE1CekdGItDmcotFwoCSuWai+Y4rg+JX1JaJQApPEM0tabWX83n
-  djri2zyv3s3ucIBaOlC4bOZZiydDSAXx/S/SRGyvA1/ZKgR5h+zu6T2GKcusq7QA
-  2O89BwLoEmEP437kjQ6HjyqC
+  BgkqhkiG9w0BAQsFAAOCAYEAdbeP6iericAYpjgKrroRdFU+IXPXMwF48IoESx00
+  Wa4bqUsy+UnXe8mCP8VA2WK/4QJJKljU2hrS/9FumREOnwF4vPYnLVNJ8nITIpTh
+  1DSDinlg/hhaW/0cUwdJrFttoFqfe4EC32VgZkFlXPCD90ZX3pda6n/I4uvUVujb
+  LZgwewGILIRZ2UfV4cPq9gVJRMuL0Dz/9C5t0jjrXuQpScSKyZ814bBv4mvh1xWm
+  WEnkNkO9YKsS1PqWy3tVYd2hgfTGXRJk/THYT2Qyj07z2ksG8FzsjhV7VeKZmkBf
+  ow4kIK/ches8x97aJ5zbrHwK+he3lLFThcvjAJ0GbwYZrCuDaXIxBj0k+R4lWUpp
+  G6VQycIWs0Nb6F5NLLSO4k/mtOduJhmyPWkL3R/KMChXk0hu8xM2Orw1CpipzAX+
+  Yot8KuDDSCrW7txuQr8nBdP8TtGBceStvkqoqSGvzsppfoAzykAkc8zujoN1s8d2
+  ioSUG4tmSnO/l+mykryWcbFA
   -----END CERTIFICATE-----
-date: 2019-09-10 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: []
@@ -143,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Converts a human-readable time (e.g. 10:15 daily) into a cron format (e,g,