cron_format 0.1.16 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e97c15668963455e247fe05b9c1cd3b3fd8cb1
-  data.tar.gz: 4ab645c7f6591ac0916792323d3fa004c4d8c3e3
+  metadata.gz: c876978dc3f4b5ceacd3d314d1a8184c123a184c
+  data.tar.gz: 00c674f845160a27ee3696ccda6c11c7557e3cdf
 SHA512:
-  metadata.gz: 5893873e5eaaf14f4a2900a86b9601df4cc07a48167a5b4f9f36021485d6ba51600924c6759818425816cd5cd7f509e60cadb8885587fc34a1a582f9b9a4ddef
-  data.tar.gz: 3f0fa7c7fc530e3ea52e6da64a4f6ea0eff31d10f41c4e594ce27a512c06ea245d90c648130ce14e45708e786c103b330977b2ae1a5f9c9d5fc67d693f2ad0c9
+  metadata.gz: 98586dbd16b8644edd4c24fbb5297c19e0bf9141bb768d4ffc7ff48af5a23829b710f0565db7b6511521a7b9f0ea627d88bdcb7df1bb62416687b5012c5ead9d
+  data.tar.gz: d3187eaff6b8a6e01d3efc044eb005bba7d50c9cb09ae9ab9ca2991f278ce567f5f4927787e8561c163db17fd61aa5174f470fdc290a743fdc8cb0550b4ee2d0

data/lib/cron_format.rb

@@ -61,6 +61,7 @@ class CronFormat
     ]
 
     r = units[index].call @to_time, n
+
     @to_time = r
 
   end    
@@ -69,7 +70,31 @@ class CronFormat
 
     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
+    
+    if mins[/^\d+$/] and hours[/^\d+$/] then
+      @to_time += MINUTE until @to_time.min == mins.to_i and \
+                                                  @to_time.hour == hours.to_i
+      @to_time -= MINUTE
+    else
+      
+      if mins[/^\d+$/] then
+        @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
+    
+    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
@@ -80,7 +105,7 @@ class CronFormat
 
       @to_time = dt2.to_time 
     end
-    
+
     units = @to_time.to_a.values_at(1..4) + [nil, @to_time.year]
 
     procs = {
@@ -122,7 +147,6 @@ class CronFormat
     end
     
     
-
     if raw_a[4] != '*' then
       r = /(sun|mon|tues|wed|thurs|fri|satur|sun)(day)?|tue|thu|sat/i    
 
@@ -240,6 +264,7 @@ class CronFormat
         else
           t += DAY until t.wday == wday.to_i
         end
+
       end
 
       # finally, if the date is still less than the current time we can

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson