cron_format 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876cd6851afd8b26d63589020148f933f934bc02
-  data.tar.gz: fda9fd1375861ff28b0804341c1ab3d47b170201
+  metadata.gz: 414d4064981ad653741b80fce46e863167607379
+  data.tar.gz: 67023e8ba3f5ee0790307bcc1794cada00e85542
 SHA512:
-  metadata.gz: c803f715557f653037ba920479566400b0bd1c3f852ef7e529b18f4c7e988f0e5cc1f1536d1e3f9b826008d7878ad889dcfb04ca2aa459c4bddec203daa98997
-  data.tar.gz: 4c8fb0d49d01936771e95f4b37abb54a15bc7e639ef49506c99f31e74fa006dea64a45d6545ff0cf27c9022522d960ab3c4ff091bed0fe67dfb751c487ec7374
+  metadata.gz: 41b84a6ab78e19bf48da04158fef9f1b1d12a8a699944757d8f64085a7552160cbeeb6e5479f7720dd9a6b73683a15a598c36ec8e62b66005569f5b888149993
+  data.tar.gz: 4b5d0578b5a212952b0267961a24a483e4b32c56ce9a1ed64e1b89fe72e2b7ba0eae347899179ad93910344730f623de9a650495eddd081c3bcc4234373f1461

data/lib/cron_format.rb

@@ -22,7 +22,7 @@ class CronFormat
     parse()
   end
   
-  def next()
+  def next_date()
 
     nudge() unless @cron_string =~ %r{/}
     parse()
@@ -69,7 +69,18 @@ class CronFormat
 
     raw_a = @cron_string.split
     raw_a << '*' if raw_a.length <= 5 # add the year?
+ 
+    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 
+    end
+    
     units = @to_time.to_a.values_at(1..4) + [nil, @to_time.year]
 
     procs = {
@@ -109,6 +120,8 @@ class CronFormat
       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    
@@ -121,7 +134,8 @@ class CronFormat
       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
@@ -153,7 +167,6 @@ class CronFormat
 
       next unless day_valid? d.reverse.take 3
       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
@@ -182,6 +195,7 @@ class CronFormat
 
       # starting from the biggest unit, attempt to increment that 
       #                       unit where it is equal to '*'
+
       if t < @to_time then
 
         if t.month < @to_time.month and raw_a[4] == '*' then
@@ -275,4 +289,4 @@ class CronFormat
     end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,28 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDcwNzE3MDkzOVoXDTE0MDcwNzE3MDkzOVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAJUerT/w15jZ4h80jvs+EXGwThnDNmrGyrPzJdKCa9cCrqUXVl29oAvjPhhM
-  HhHKsjjN7xK+fLjiJt5MuM9jAkrsoZSkdirL4yjatFYWPO3juOWuevVwPxwHSuYl
-  WuhCOBzMLlNBQarNLeGr0FuwT6erQOJT/PSh0EPIAtiTkNHC8n+NoeymuoRB8kHj
-  bfnIiwapd9jl0pJFQicgL36sNSAmIvn5RNJWMjklIRswNrxvjUhhLI2bqiQiFx/3
-  vqFG/dKKjKojJN1517LgASnqWPulbrDvo6Vov4DQCBXabz9KnwotdVhjhhZCZW4g
-  9MEzIubRspCjLFzSZYbP3XFN7AUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUSpXjvXlr54xa/0MFq6KksQJbXQQwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAKtKQIz7+
-  CiONPyn8qY9sQ5RMwl5oZH/cntY3IhB2aaTJqRPHjYH7/k55AjMDhfwePIqMp5nT
-  p7A2+NZ1rIHua0FwjCRBIjeOAZdG79FIt0YkfQqzSrpunHQn7DGj8LxTtliHZ6aH
-  7yrVFROyfYpEFeBzQ+0B+/FGlTD24TYsxzLyKEYnhrJnMD7zrxo1HTVO7fQ+F21s
-  6Kx1JnxzsdC9HYcKz/jbHXZURdrB+JTYI92/m8fsPrd1HqKpYHSKS8jga1rGCi7U
-  9DFxFCS6sgAw21S+V+ym9ft8kbqgy7zOGdPRRNlwgb/V+UWqH4yaCtk7yJT+n8vm
-  LHkRlhnm0ScZYw==
+  MIIDmDCCAoCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjETMBEGCgmSJomT
+  8ixkARkWA2V1XzAeFw0xNTAxMTQyMTI2NDdaFw0xNjAxMTQyMTI2NDdaMEkxEjAQ
+  BgNVBAMMCWdlbW1hc3RlcjEeMBwGCgmSJomT8ixkARkWDmphbWVzcm9iZXJ0c29u
+  MRMwEQYKCZImiZPyLGQBGRYDZXVfMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+  CgKCAQEAr9xvXIQaNXIGdnLqaDHCEjb+8JPxElPK0kO7sz+DHXJgGr2gZ7Fpp9H/
+  7ps4nOysRBuAjZWXM6f2V20MVekpoknLkMqJb0MGkX+fipeioarVUUoDTmFBDFhb
+  zOD8Hwq4JOyOBpyD90xHBMBFve+ZRgwXRayAW3dlQEn3YsGukt91IJzJzG3B9ewq
+  QXyD27cOwuac+9E6wsbhsqLa0UjdHjMnQ2wKvZb28J8iIY5juNbz81CssuVmolH8
+  +B096ge0IkGIiAnyMrf9Uye7kzVixeJMxNHZU8/n/h5UFDyOBkVrZxjdmSHPLm+I
+  i+yg9/LrBBvBlzykrKgRc2U6B7McHQIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBQYtwchW6cgSusk8+Q+iJpSpLU47DAmBgNVHREE
+  HzAdgRtnZW1tYXN0ZXJAamFtZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2Vt
+  bWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAAvEHq
+  yXYlDk/eBMY5TEYYqJ1yC2ojqhPWte6XHiB2HM81FIWeVdttdn6okb30AEbR6q2f
+  5i4eAIJW7xGG3GNnDTvkd3/GzdrjgBhVkAuJwQyn9yow/uoxUOv8oQF/8xurum6V
+  PDf269Dp/SOaLlKW5CwJUPuEXJ5wTYM/HacwyxhrxTT4Lo9h4+sewKsJKZwmLdyJ
+  2qaxwo1jIFkqEkmoAO+0DdHSxt0oOaa69+O0RsBlDbbCXeK8jCApP8OEsTLnzove
+  MmJuAQVfTk9wZd03YN619a64hLGIvud4ASW7UVAW0B4U0PcmbhHvne07e11jt7j5
+  WwVcDIvT38Bo3hAt
   -----END CERTIFICATE-----
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk
@@ -52,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: cron_format