cron_format 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 770687981ae1603cae0ae5742d3361dc96b5a92e
-  data.tar.gz: 159e4a8dc03bafb524c3daf488c8cf95e5c5ddca
+  metadata.gz: 16b339c6d41735353e8cf1268fd8faf1bef76e8c
+  data.tar.gz: bdf4d4506b8234269bc979096a8cb58545758255
 SHA512:
-  metadata.gz: a6a96846405c3a0fb418f361d806fcb1535a7cee7682e58014937e83e36ee98523456178bd2386b16d0ec97619b7ec6a0273a04b02e33d2b076e282449bc1633
-  data.tar.gz: 36115594470e04363446f08bdc91516a6f3bce814500f6442ce8879eabc44ca6de8b6ff63cc66ddb930ba1e742aead7bebb2efddea3bc0749a29e8adec6121aa
+  metadata.gz: 8fd195d79177cdf7295dd15c35179b458914e0f6785999ce554bfc169dfb98dce90b155b5acce4a669662f56a10b026fba31ba31c0af6fdbcbbce30ea7b77365
+  data.tar.gz: 51e59d602b155bafa33692277762010bf21f563591a9d6fec6dc0fa4b3ef7e286f24e1a3ee8e1ba63a138d63f5fd92845b36612d9b5a8c1db6b4a724b82bd186

data/lib/cron_format.rb

@@ -17,8 +17,8 @@ class CronFormat
 
   attr_reader :to_time, :to_expression
 
-  def initialize(cron_string, now=Time.now)  
-    @cron_string, @to_time = cron_string, now
+  def initialize(cron_string, now=Time.now, debug: false)  
+    @cron_string, @to_time, @debug = cron_string, now, debug
     parse()
   end
   
@@ -51,6 +51,7 @@ class CronFormat
   def nudge()
 
     t1 = @to_time
+    puts 't1: ' + t1.inspect if @debug
     a  =  @cron_string.split
     
     val = if @cron_string =~ %r{[/,-]} then
@@ -60,6 +61,8 @@ class CronFormat
     end
     
     index, n = 0, 1
+    
+    puts 'val: ' + val.inspect if @debug
 
     if val then
       index = a.index(val)
@@ -80,7 +83,8 @@ class CronFormat
       end
     end
 
-
+    puts 'index: ' + index.inspect if @debug
+    
     month_proc = lambda {|t1,n|
       a = t1.to_a
       a[4] = a[4] + n <= 12 ? a[4] + n  : a[4] + n - 12
@@ -98,12 +102,26 @@ class CronFormat
       month_proc,
       day_proc
     ]
-
+    
+    if @debug then
+      puts '@to_time: ' + @to_time.inspect 
+      puts 'n: ' + n.inspect
+    end
+    
     r = units[index].call @to_time, n
+    
+    puts 'r: ' + r.inspect if @debug
+    
+    @to_time = if n > 1 then
+    
+      # 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
 
-    @to_time = r
-
   end    
   
   def parse()

data.tar.gz.sig

@@ -1 +1,2 @@
-%Z���%M���i��>����:ѣ9g�Q�}W\��[�,��Z�J���G�m"I�:�A�<|%��$����"�q�}܉�)$
+ૄ��Q�0->��߈����L�h!����(,���*�8���w�:���6k7�O����%�ׂ}J��Wh�sXΖ$}��	��h�q k�9Nj�%�o�)o��y�g�'��u&����xϫ��Qu`��yY7d,��
+35����/�����_?��.���o�•�l�dk��W�c1ts!/�����1[S�P@�,&	A��ny�C�FB�dn�;1_�T{^.�QN8[䓱�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,26 +11,26 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzEzMjIzNDEyWhcN
-  MTkwMzEzMjIzNDEyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkCdEJ
-  UjtgmEedQ8w+ubTmHE4BpsUFewYhdAJ8eANKV0Mc6Km1JS7iviiHXmnqPYdWcrTx
-  khljN3zaqNX/vR5y+zIy7vXqy9M/0BPGVnEJHj8/Tn2NvXG/kfFXIcfHqKSxsvX7
-  go9CBM0aB3ZeueDgT6Sm5Nf5nwixgNSeQ6CSq6qrMDq7/5oDUJ5VxeyPsdhy9TJF
-  pjt5V93mDqgDq5SaYoEETtgqTpugtD8bUf3MSehMAG1TqdTpYrGZEewIfqIgXRxN
-  YG+4M8lI0S9a+OPrXNKlFOfvB1wlC+tRvYdgTdX2Qj7Eb0o17CnL4sR3WgcmAIYi
-  vU/XM/O4V/TWDq4NAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFBV/59mIpXOYt1x0MSWeLm6vy/ySMCYGA1UdEQQfMB2BG2dlbW1h
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNDA5MjI1MzA3WhcN
+  MTkwNDA5MjI1MzA3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDqyw5Y
+  GTvVJJWLpkQqhlUx6RNmZLFRgqTQmle7sIyEtiB7qAtxSZxt2SEKEP+NgQUimlgH
+  HwXx40mQ9crGr1d3+6bwkbi306MTZ6bdRsFfPwthMaevxvK86GGx2MbIpUQ/M0Qx
+  RUuV1mwXFweHHARXwK7bHcGxOwpcPs1ehM7dDAv39OJU6YjJeHq69akXUMGqEPqV
+  y9oK4CtgFHNrB+ytDwUh7mQpAdkNCKA3SwiWnrUpPbQeK0V7sjRlCkTXTs5E7o9e
+  hyL8XQDmCTxYK2fhDU3l1iX+gI9RPWGozWOGOLJNFeRm9eGLbmBjbMkeLLVvX8R4
+  gK4ilPzRXmgGzq17AgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFKYNYBOjGqMFEfPgNRRYtEzq+4pEMCYGA1UdEQQfMB2BG2dlbW1h
   c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBABmqh5CsvL7K2KCHCLyX
-  YEuF5nVn+MsAJZj1mm6sd0sA5HkQ2lT+Xx5jwpxYLrOqV0qT5DmhaDQUkM6W7WLa
-  tIFEac2buOY83gIjRo14D1PRz2e8jH12ffYAxtm7bRTerzbxBqZm7xDTjuJnj1n8
-  4eLJfD0Ck0i2f1z206DqwPyymN+uDH/kE5ewB9reHgUeXlFCeo8c2Su8egxJf8Ww
-  sZzkbSOjq5ekNiNAV7ACU+yp1AU2dWlpbCZt/1J6aOFI90nYVV1iKf3gRNgCT777
-  E0pbk0dRdBt0x5gnA8Q7lsQkyZT5li/rMvu6b9ZdRlzg6dA1S40k3ibt6RI6ht4T
-  lIM=
+  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBABMssk3Im1Vin+rHeBKp
+  y3dTWfi4t4oYBkytTb9n68lZtJ16LZgNX42o89w/8WoV9rqoo5rW4A1b1NE1srdZ
+  7Yrs6mVVu1xUfAodPRGdy+P2F+yqzz0hqYBqcBFLdR5oqkP3kvx05w2txGJLZMvv
+  N/ETFF5O4SD1tsPaLS5/kjAk+epirsb/UR8gLq37tyosM79P10HeikBdOMqXmN7U
+  8Wj31raYqIS2rUA0lp+u+e4gKg4r0EBcIqH3pHahMd5le9D3yIwfPLuURhHwBw6R
+  Jde8bC6zoA/f/DUUzBf2TtjXPuoAdtsV3CT3nIo880mXyihT9CL9ulTHMJCBR73I
+  fsk=
   -----END CERTIFICATE-----
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu
@@ -62,5 +62,6 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: cron_format
+summary: Accepts a cron expression and outputs the relative time (e.g. 0 7 1 1 * *
+  => 2019-01-01 07:00:00 +0000
 test_files: []