cron_format 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ae188fa6fbdd52dfef8995dc0b9b1f164d036bd77e9a15c5e30e9acc5ae8575
-  data.tar.gz: 362ebbce43c0f775441efb0106a611b175cae5ecceccd803ebc8b583b92ae408
+  metadata.gz: 892de132d0417d5060080143683755b47c1e89af1c814c0c2df5ad8fda54b27d
+  data.tar.gz: cb300817a2585aad227d75e2718616991550c5f3367ee546b10ad173c06eabd8
 SHA512:
-  metadata.gz: 48cb5f44186323f31f2ed2d3cec40a0031955c4de6bd1a66cc19fb5ef05f30d3e6059f2788e786c75f3dffc9e1f088ae6253a87c7a333a3dd618f654d261dcb5
-  data.tar.gz: 4774ef323ddcdcc36f4313b2bd5ee91f5b5d2b5a8a5bdbb02c6fec79ce4e06b3bd806b34647ce6182eaf18492c58744a91ebae2ade7da3b929983c210b7e1dc5
+  metadata.gz: 06614ad37ee7e682d2aa2c39fc8e33d0169f1a5a26cf7ba96fc52aaa9b904995b27126105db37a3aecb1f642d4c40961efa6b57c17f8223a994e06589f6b4dd7
+  data.tar.gz: 79278c3a5ff3db3e04790c5bef10309cd5b7a189af3251f8a3adc66bab551ff4c06014afa301f2ca23ff061f2c634ac5fcb009b3eee526690778a600385576e8

data/lib/cron_format.rb

@@ -49,7 +49,7 @@ class CronFormat
     
     nudge() #unless @cron_string =~ %r{/}
     #puts ':to_time : ' + @to_time.inspect
-    parse()
+    parse(nudged: true)
   end
   
   private    
@@ -130,7 +130,7 @@ class CronFormat
 
   end    
   
-  def parse()
+  def parse(nudged: false)
     
     puts ('0. @to_time: ' + @to_time.inspect).debug if @debug
 
@@ -337,6 +337,7 @@ class CronFormat
           and t.min < @to_time.min and raw_a[1] != '*') ) \
             and raw_a[2] == '*' then
 
+          puts 'incrementing the day' if @debug
           # increment the day
           t += DAY * ((@to_time.day - d[2].to_i) + 1)
         elsif t.min < @to_time.min and raw_a[1] == '*' then
@@ -372,7 +373,7 @@ class CronFormat
 
       # finally, if the date is still less than the current time we can
       #      increment the date using any repeating intervals
-      if t <= @to_time and repeaters.any? then
+      if (t < @to_time or (!nudged and t == @to_time)) and repeaters.any? then
 
         repeaters.each_with_index do |x,i|
 
@@ -399,6 +400,8 @@ class CronFormat
   end  
 
   def increment_month(d)
+    
+    puts 'inside increment_month' if @debug
 
     if d[3].to_i <= 11 then
       d[3].succ!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNDA5MjI1MzA3WhcN
-  MTkwNDA5MjI1MzA3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDqyw5Y
-  GTvVJJWLpkQqhlUx6RNmZLFRgqTQmle7sIyEtiB7qAtxSZxt2SEKEP+NgQUimlgH
-  HwXx40mQ9crGr1d3+6bwkbi306MTZ6bdRsFfPwthMaevxvK86GGx2MbIpUQ/M0Qx
-  RUuV1mwXFweHHARXwK7bHcGxOwpcPs1ehM7dDAv39OJU6YjJeHq69akXUMGqEPqV
-  y9oK4CtgFHNrB+ytDwUh7mQpAdkNCKA3SwiWnrUpPbQeK0V7sjRlCkTXTs5E7o9e
-  hyL8XQDmCTxYK2fhDU3l1iX+gI9RPWGozWOGOLJNFeRm9eGLbmBjbMkeLLVvX8R4
-  gK4ilPzRXmgGzq17AgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFKYNYBOjGqMFEfPgNRRYtEzq+4pEMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBABMssk3Im1Vin+rHeBKp
-  y3dTWfi4t4oYBkytTb9n68lZtJ16LZgNX42o89w/8WoV9rqoo5rW4A1b1NE1srdZ
-  7Yrs6mVVu1xUfAodPRGdy+P2F+yqzz0hqYBqcBFLdR5oqkP3kvx05w2txGJLZMvv
-  N/ETFF5O4SD1tsPaLS5/kjAk+epirsb/UR8gLq37tyosM79P10HeikBdOMqXmN7U
-  8Wj31raYqIS2rUA0lp+u+e4gKg4r0EBcIqH3pHahMd5le9D3yIwfPLuURhHwBw6R
-  Jde8bC6zoA/f/DUUzBf2TtjXPuoAdtsV3CT3nIo880mXyihT9CL9ulTHMJCBR73I
-  fsk=
+  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
+  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
   -----END CERTIFICATE-----
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
@@ -78,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Accepts a cron expression and outputs the relative time (e.g. 0 7 1 1 * *