cron_format 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892de132d0417d5060080143683755b47c1e89af1c814c0c2df5ad8fda54b27d
-  data.tar.gz: cb300817a2585aad227d75e2718616991550c5f3367ee546b10ad173c06eabd8
+  metadata.gz: 176722aed0424cfe698ec0bb9bc159a962a747e665b25ab4754101e078295248
+  data.tar.gz: e298aa75482b25335176e367f61fe9578fcca8c1539de5b0c0c8fa39dc88f580
 SHA512:
-  metadata.gz: 06614ad37ee7e682d2aa2c39fc8e33d0169f1a5a26cf7ba96fc52aaa9b904995b27126105db37a3aecb1f642d4c40961efa6b57c17f8223a994e06589f6b4dd7
-  data.tar.gz: 79278c3a5ff3db3e04790c5bef10309cd5b7a189af3251f8a3adc66bab551ff4c06014afa301f2ca23ff061f2c634ac5fcb009b3eee526690778a600385576e8
+  metadata.gz: 9ced118aab5b8e497844b1fc6e3978203ad3dc9849d33e5974cca00a5e4abe5512dff9314b0dbced73cab7c74eb6b008a6733e2da784b1f7472140800308a578
+  data.tar.gz: 9143586bcba2e3ab259a169e583c1733a72c24dc388c784287b256458800b75a6fbe1a4432df43beb84cc13a36aa8688cbdfa60bd3b42fb63156116a0510a56e

data/lib/cron_format.rb

@@ -19,68 +19,68 @@ class CronFormat
 
   attr_reader :to_time, :to_expression
 
-  def initialize(cron_string, now=Time.now, debug: false)  
-    
+  def initialize(cron_string, now=Time.now, debug: false)
+
     puts 'inside CronFormat'.info if debug
     @cron_string, @now, @debug = cron_string, now, debug
     @to_time = @now
     parse()
-    
+
   end
-  
-  # supply a Time object. Modifying the date can be helpful when 
-  # triggering a day before an actual expression date e.g. the day 
+
+  # supply a Time object. Modifying the date can be helpful when
+  # triggering a day before an actual expression date e.g. the day
   # before the last sunday in March (British summer time).
   #
   def adjust_date(d)
-    
+
     @to_time = d
     m, h, dd, mm, yy = @to_expression.split
-    
+
     day = dd =~ /^\d+$/ ? d.day : dd
     month = mm =~ /^\d+$/  ? d.month : mm
     year = yy =~ /^\d+$/ ? d.year : yy
-    
+
     @to_expression = [m, h, day, month, year].join(' ')
-    
+
   end
-  
+
   def next()
-    
+
     nudge() #unless @cron_string =~ %r{/}
     #puts ':to_time : ' + @to_time.inspect
     parse(nudged: true)
   end
-  
-  private    
-  
+
+  private
+
   def nudge()
 
     t1 = @to_time
     puts ('t1: ' + t1.inspect).debug if @debug
     a  =  @cron_string.split
-    
+
     val = if @cron_string =~ %r{[/,-]} then
       a.reverse.detect{|x| x[/[\/,-]/]}
     else
       a[1..-1].detect{|x| x != '*'}
     end
-    
+
     index, n = 0, 1
-    
+
     puts ('val: ' + val.inspect).debug if @debug
 
     if val then
       index = a.index(val)
 
-      r = val[/,|\/(\d+)$/,1]      
+      r = val[/,|\/(\d+)$/,1]
 
       n =  if r then
-      
+
         index == 4 ? r.to_i * 7 : 0
-        
+
       else
-                
+
         if val =~ /[,-]/ then
           1
         else
@@ -90,7 +90,7 @@ class CronFormat
     end
 
     puts ('index: ' + index.inspect).debug if @debug
-    
+
     month_proc = lambda {|t1,n|
       a = t1.to_a
       a[4] = a[4] + n <= 12 ? a[4] + n  : a[4] + n - 12
@@ -102,97 +102,97 @@ class CronFormat
     day_proc = lambda {|x,n| x + n * DAY}
 
     units = [
-      lambda {|x,n| x + n * MINUTE}, 
-      lambda {|x,n| x + n * HOUR}, 
-      day_proc, 
+      lambda {|x,n| x + n * MINUTE},
+      lambda {|x,n| x + n * HOUR},
+      day_proc,
       month_proc,
       day_proc
     ]
-    
+
     if @debug then
       puts ('@to_time: ' + @to_time.inspect).debug
       puts ('n: ' + n.inspect).debug
     end
-    
+
     r = units[index].call @to_time, n
-    
+
     puts ('r: ' + r.inspect).debug if @debug
-    
+
     @to_time = if n > 1 then
-    
-      # given day light savings, ensure the time fragment is preserved 
+
+      # given day light savings, ensure the time fragment is preserved
       Time.new(r.year, r.month, r.day, t1.hour, t1.min)
-      
+
     else
       r
     end
     #r += MINUTE  if r == t1
 
-  end    
-  
+  end
+
   def parse(nudged: false)
-    
+
     puts ('0. @to_time: ' + @to_time.inspect).debug if @debug
 
     raw_a = @cron_string.split
     raw_a << '*' if raw_a.length <= 5 # add the year?
     mins, hours, day, month, wday, year = raw_a[0..5]
-    
+
     if day[/\d+/] and month[/\d+/] and year == '*' then
       @to_time += DAY until @to_time.day == day.to_i and \
                                                 @to_time.month == month.to_i
     end
-    
+
     puts ('1. @to_time: ' + @to_time.inspect).debug if @debug
-    
+
     #
-    
+
     if @debug then
-      puts ('1.5 @to_time: ' + @to_time.inspect).debug 
+      puts ('1.5 @to_time: ' + @to_time.inspect).debug
       puts ('hours: ' + hours.inspect).debug
       puts ('mins: ' + mins.inspect).debug
     end
-    
+
     if mins[/^\d+$/] and hours[/^\d+$/] then
 
       if @to_time.to_date != @now.to_date then
         @to_time = Time.local(@to_time.year, @to_time.month, @to_time.day)
       end
-      
+
       until (@to_time.min == mins.to_i and @to_time.hour == hours.to_i) \
           or (@to_time - 1).isdst != @to_time.isdst do
-        
+
         puts ('1.7 @to_time: ' + @to_time.inspect).debug if @debug
         @to_time += MINUTE
       end
       @to_time -= MINUTE
     else
-      
+
       if mins[/^\d+$/] then
-        @to_time += MINUTE until @to_time.min == mins.to_i 
+        @to_time += MINUTE until @to_time.min == mins.to_i
         @to_time -= MINUTE
       end
-      
+
       @to_time += HOUR until @to_time.hour == hours.to_i if hours[/^\d+$/]
     end
 
-    puts ('2. @to_time: ' + @to_time.inspect).debug if @debug    
-    
+    puts ('2. @to_time: ' + @to_time.inspect).debug if @debug
+
     if wday[/^[0-6]$/] and @to_time.wday != wday.to_i then
       @to_time += DAY until @to_time.wday == wday.to_i
     end
-    
+
     dayceiling = raw_a[2][/-(\d+)$/,1]
-   
+
     if dayceiling and dayceiling.to_i <= @to_time.day then
 
       dt2 = @to_time.to_datetime
       next_month = dt2.next_month.month
       dt2 += 1 until dt2.month == next_month
 
-      @to_time = dt2.to_time 
+      @to_time = dt2.to_time
     end
-    
+
     puts ('3. @to_time: ' + @to_time.inspect).debug if @debug
 
     units = @to_time.to_a.values_at(1..4) + [nil, @to_time.year]
@@ -200,13 +200,13 @@ class CronFormat
     procs = {
         min: lambda {|x, interval| x += (interval * MINUTE).to_i},
        hour: lambda {|x, interval| x += (interval * HOUR).to_i},
-        day: lambda {|x, interval| x += (interval * DAY).to_i}, 
-      month: lambda {|x, interval| 
+        day: lambda {|x, interval| x += (interval * DAY).to_i},
+      month: lambda {|x, interval|
          date = x.to_a.values_at(1..5)
          interval.times { date[3].succ! }
          Time.parse(TF % date.reverse)},
-       week: lambda {|x, interval| x += (interval * WEEK).to_i}, 
-       year: lambda {|x, interval| 
+       week: lambda {|x, interval| x += (interval * WEEK).to_i},
+       year: lambda {|x, interval|
          date = x.to_a.values_at(1..5)
          interval.times { date[4].succ! }
          Time.parse(TF % date.reverse)}
@@ -225,35 +225,35 @@ class CronFormat
       end
 
     end
-    
+
     # take any repeater out of the unit value
     raw_units, repeaters = [], []
-    
-    raw_a.each do |x| 
+
+    raw_a.each do |x|
       v1, v2 = x.split('/')
       raw_units << v1
       repeaters << v2
     end
-    
-    
+
+
     if raw_a[4] != '*' then
-      r = /(sun|mon|tues|wed|thurs|fri|satur|sun)(day)?|tue|thu|sat/i    
+      r = /(sun|mon|tues|wed|thurs|fri|satur|sun)(day)?|tue|thu|sat/i
 
       to_i = lambda {|x|
         a = Date::DAYNAMES
         a.index a.grep(/#{x}/i).first
       }
       raw_a[4].gsub!(r,&to_i)
-      raw_units[4].gsub!(r,&to_i) 
+      raw_units[4].gsub!(r,&to_i)
     end
-    
-    @to_expression = raw_a[0..4].join ' '  
+
+    @to_expression = raw_a[0..4].join ' '
 
     raw_date = raw_units.map.with_index {|x,i| dt[i].call(x) }
 
     # expand the repeater
 
-    ceil = {min: MINUTE, hour: 23, day: 31, month: 12}.values    
+    ceil = {min: MINUTE, hour: 23, day: 31, month: 12}.values
 
     if repeaters.any? then
       repeaters.each_with_index do |x,i|
@@ -261,14 +261,14 @@ class CronFormat
         next if i == 4
 
         if x and not raw_a[i][/^\*/] then
-          raw_date[i] = raw_date[i].map {|y|            
+          raw_date[i] = raw_date[i].map {|y|
             (y.to_i...ceil[i]).step(x.to_i).to_a.map(&:to_s)
           }.flatten
-        else  
+        else
           raw_date[i]
-        end 
+        end
       end
-    end  
+    end
 
     dates = inflate(raw_date)
 
@@ -281,23 +281,23 @@ class CronFormat
       d << year
 
       next unless day_valid? d.reverse.take 3
-      t = Time.parse(TF % d.reverse)      
-      # if there is a defined weekday, increment a day at 
+      t = Time.parse(TF % d.reverse)
+      # if there is a defined weekday, increment a day at
       #                          a time to match that weekday
       if wday and wday != t.wday then
-        
-        t = Time.parse(TF % d.reverse)        
+
+        t = Time.parse(TF % d.reverse)
 
         if repeaters[4] then
           t += repeaters[4].to_i * WEEK while t < @to_time
         else
-          d[2], d[3] = @to_time.to_a.values_at(3,4).map(&:to_s)         
-          t += DAY until t.wday == wday.to_i        
+          d[2], d[3] = @to_time.to_a.values_at(3,4).map(&:to_s)
+          t += DAY until t.wday == wday.to_i
         end
-        
+
       end
-      
-      # increment the month, day, hour, and minute for 
+
+      # increment the month, day, hour, and minute for
       #              expressions which match '* * * *' consecutively
       i = 3
 
@@ -308,14 +308,14 @@ class CronFormat
         i -= 1
       end
 
-      # starting from the biggest unit, attempt to increment that 
+      # starting from the biggest unit, attempt to increment that
       #                       unit where it is equal to '*'
 
       if @debug then
         puts ('t: ' + t.inspect).debug
         puts ('@to_time: ' + @to_time.inspect).debug
       end
-      
+
       if t < @to_time then
 
         if t.month < @to_time.month and raw_a[4] == '*' then
@@ -353,12 +353,12 @@ class CronFormat
           t = procs.values[i].call(t, repeaters[i].to_i) if repeaters[i]
         elsif raw_a[3] == '*' then
 
-          t = increment_month d        
-        end   
+          t = increment_month d
+        end
 
       end
 
-      # after the units have been incremented we need to 
+      # after the units have been incremented we need to
       #                   increment the weekday again if need be
       if wday then
 
@@ -371,6 +371,11 @@ class CronFormat
 
       end
 
+      if @debug then
+        puts ('2. t: ' + t.inspect).debug
+        puts ('2. @to_time: ' + @to_time.inspect).debug
+      end
+
       # finally, if the date is still less than the current time we can
       #      increment the date using any repeating intervals
       if (t < @to_time or (!nudged and t == @to_time)) and repeaters.any? then
@@ -383,35 +388,35 @@ class CronFormat
         end
       end
 
-      t     
+      t
     end
-    
+
     puts ('a: ' + a.inspect).debug if @debug
 
     @to_time = a.compact.min
   end
-    
+
   def day_valid?(date)
 
     year, month, day = date
-    last_day = DateTime.parse("%s-%s-%s" % [year, 
+    last_day = DateTime.parse("%s-%s-%s" % [year,
                       (month.to_i < 12 ? month.succ : 1), 1]) - 1
     day.to_i <= last_day.day
-  end  
+  end
 
   def increment_month(d)
-    
+
     puts 'inside increment_month' if @debug
 
     if d[3].to_i <= 11 then
       d[3].succ!
-    else 
+    else
       d[3] = '1'
       d[4].succ!
     end
 
     Time.parse(TF % d.reverse)
-  end  
+  end
 
   def inflate(raw_a)
 
@@ -421,5 +426,5 @@ class CronFormat
       a.map{|x| x.length <= 1 ? x.first : x.shift}
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,54 +11,54 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTEwMTI1MDI0WhcN
-  MjAwOTA5MTI1MDI0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCtHiaY
-  F6JNBkgrV3+F6hU+5sfBZmujn/m8WZpHzUVOvG8KnRBXBx4/1R5xbPkswo8Pmq/B
-  gqxu8JNFHzaUKseneuxWdSXokegiyeh7wgE1Io6cHU8Nc3G9DbBXQS9CI5Xc4w9+
-  OqVc/fY4yuHGrbW53lqc9mmq2+oxjPUmk2POAm5bbe9Q81YQsBhN2p+ni+nkTvI3
-  ntFFeoRwvP21rFWgqjyzlRmHlmorz1xaTxmb4XjpnuOEQqtj1dhFm54MR/fSXEqS
-  UTNcqFKuqpFfHjJb79VeoqkO2cjNyp1qJQvbP5H+0ebjgxeRZBh2L6Nxt4mUpRp/
-  3XeazK28JCGYiTJVHr/rTcxfNPCnOVxxgv3Yr7SwJSQT5AyYCwbhluZ2cFT34qRb
-  4ZCIEpbf+P2/htbDSPTpHkRIGYREhhdta/x6X7ayWeKRioL6YU1QZxTww9ElU9h+
-  90rGVXOTEhkQIkuhWJ4fcLvBfDz/zbFSc89lFOEw+vAQjKgpXWhB2f9L8yECAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU3H+pX6Dj
-  a4+oc8w9M/LCPwy4kGswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjAyMTM1NDI2WhcN
+  MjMwMjAyMTM1NDI2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDaqxbw
+  i8z4aBfUw7+JhsnZcVYu1jFVmXO63cYZ1G7VZ1mvBcDKmvdV/C1KsmvJwd/OF6Hw
+  CSypZVJP0RA37xnaKYP18uwhJZv8lQfjasdDe/4C4ZddH7P1QP3VP4WnzOf3Ve5F
+  cmTShT54uQfizdwRv2mG842hdyoX1DdaLZSA8adeMod/BJtkfSMVJjl971zO6o48
+  d7iWIYmYuZ6cNTv9iP3LbNwgqC7+zn/THw957Yck5yzGWAZu/ShxmlXFYU04V789
+  ++poeo7tNfvXmUcFdgOIOpLdy33ledbtMBM7MCUvX8KGn+CePyUfljcY/9nyGk7l
+  YRJ3P4bizbp3x9TKDShGxkSvZn28eJEjhq1sMzlB4JrrFlFVq9hDuasE3dkHVE30
+  KcO/vPbSs2LC2DQsrGeTSIye1S84pClYQtSAtlGqWczTz/6MWENwHwWI2vdnUdug
+  wZXBZeSpej/Dife8z0lL+JY+KN93pBtI4jqlij1OwlvUzJzDkqQKRCKkIisCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUsNZCEbjl
+  +Uq/N/Syy8npoZaD1+wwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAUJUtxM5fSHhA0dHtX8i06LRuSkYXr+tkF6wEcgqc
-  l83KNdi8SRT2mCiXTZSIVmN+nH8YkatpGyQVk+tpEONGLDyjp5uwMh5Xb7eobCmY
-  +E4Nxz+eWlozyzIAB+RXNcc/S6ACa2M/Fsd3gbjVZ6rZmlrefm1OaBy3i49NAp+0
-  uxM0sfh44SuH9nDixq5s7+yIVdaTT2495vJxeTBCMLxFvbdREy997Q33I6TqwIiQ
-  2B7mFz+NYWE9h76gknZRjabNqZkoIB0B/j5H98EDOyUTXYOG90NDMDdPaGpn7up9
-  tTLM6QEYgLe1FaUx88+ZU2NU8LIdV2I82VB/qgnjc20VwwQKVKN1oOROVil1B7MK
-  EOhYx2GL5jEPgQKXBS+ffeAN99v6T7SkHTEz7vFyucrEEMkngpp9oy+vlfZQWL7N
-  p6Ef7ciqPYpk9dcgBiC5AsmWmtb+cnHRrFQbEyU43PJ3jI5bx7OlgZGEU0V8g7hB
-  7wJJUc154LVYK+xBm6tZ/98Y
+  BgkqhkiG9w0BAQsFAAOCAYEAtBIY++5WxMTzCHiXGZK4dRJCNdRAkbmqm0fjJN1R
+  UYWdiFaxL7MHeAIfvHsak0h6LI3MPAQLaWkAyJ8L1ZLJIVRSvv0bx8fbLhBtN/FC
+  D0yfZMg72qhlRcsxzCVnG6wRQ5kluc4qhuNIKBYkOJ0WDPwzGDAZxyJ4yXHCLcRQ
+  OWJBYG8t1DmTKleEcp3CXAekJdO6l7Wi4cM7bYWQUCTxlOZa2D25YTvfqOpsk+EH
+  or4fMXtXEDQxaKx2wMkSBVy/rWBhyPg710+V/DEFeQ+hGhB9d99At57YF9D3y3+q
+  csZWukFdHN+hy4SdISkg8n8cWqcAwCwGqxF4xyxmVd0Ky7yO5qBmFAdNOkOfrB7+
+  ghwxte8R5fbBMm8cewDXZOQHxKxWGZRNdugo6RlR7qHdT4EB8/7quJkQtJq2wee7
+  IOc1Uet1LzHGtt67bFCbybnKiPeMGwdnC9KZwboHDQvntyk7WUSQuufvMrxo8AYF
+  I/8uxBZWY2iH3RgPYs9wlzDv
   -----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: c32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +83,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: Accepts a cron expression and outputs the relative time (e.g. 0 7 1 1 * *

metadata.gz.sig

@@ -1 +1,2 @@
-m��m��%W<��p�N�%�ԡԎ�e�},���R�$�dn51��M�Ḱ[K%ryЧ��}3t"���� ��Bv��y:��-$>���F�Z�n���f��m	~��_>\g��
���Ӫ���^RX��"�m.��Ȣ3�"���)�-l>?7�6[3���q���{B���f|��]���+T]��!|��j�Sla4>kg�g�'[��8��W���o��/��~�jJo�U��,`��1k�uZ� Wx�Q�����0<"9�V����b�I	ެS�Q)��\Ɖ�@5���M��>�E}�W(l�+�`���j�!�)$���INŨ�Z/�܍Fˑ���0j��n�
�	�����Ϙߧ�e��4����G��
+�*�ԜХ9��p���#����G��4WO�U��X��\!w:�O������QuZ3"�
U ��ё���\)��� ��M[�١�'՟φjK��e�N���Ț�rqW�nޚ��֠��Lu_�-b,�R(����^uw1i��n(�FQ�	��kXV�ep
̫��B���GT�c&c��Xd'���gX��U)��s(9�/���	�L���
+6�l�s1ْ��̹&w�!G��͕����tqR�V3.]�Zqzуx���l?c�(��l&��'ԙ�e�*$��	��5p�tƯp��ClN��(Cg��8�&�F�'