cron_format 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b1dd3e86e87a32c4e06964090b57ad12d624b4
-  data.tar.gz: cbf9ee1f411e1fdad6fbacbb975fb00eaffa84c3
+  metadata.gz: 7b0a1a7edae8adf3f1df74f5d7b0faced458b328
+  data.tar.gz: cc7cbf448d1bd25646c296667557f9b28c12f037
 SHA512:
-  metadata.gz: 5c45081af1e6c0d760e95c68d343f3aabb5920cec8036f65cb28a9fdab7d58b48267d7dff07f2f08585028b564697f82b29cd987de99ca899c88835029ba8c39
-  data.tar.gz: 5e56e06139f06d875a279fcee2d9d7c4a2ca93305a97a3b6a6ada6534ec3ba5f947604ca5c6eac8a94f615e73855b6055fa134a9afad49b975ec4a55a3d3a27a
+  metadata.gz: 5df4e4d5f2eade9400532c2a2e3b6266bcc941d576fead073fbf40aef0cb0a02e7db935b7eb94af730195b1b3444de1a75876c34a20e7a943cd2e8d2373446a2
+  data.tar.gz: f1504a906b020fcb0b094396f99dfafb06ba0dc0060a190ac9db513a451cd12a686fc427ba0aa3e444deedd3bbf8b0309c736234d4bb349191b9fddb91339709

data/lib/cron_format.rb

@@ -23,6 +23,7 @@ class CronFormat
   end
   
   def next()
+
     nudge() unless @cron_string =~ %r{/}
     parse()
   end
@@ -59,7 +60,8 @@ class CronFormat
       day_proc
     ]
 
-    @to_time = units[index].call @to_time, n
+    r = units[index].call @to_time, n
+    @to_time = r
 
   end    
   
@@ -69,7 +71,7 @@ class CronFormat
     raw_a << '*' if raw_a.length <= 5 # add the year?
 
     units = @to_time.to_a.values_at(1..4) + [nil, @to_time.year]
-      
+
     procs = {
         min: lambda {|x, interval| x += (interval * MINUTE).to_i},
        hour: lambda {|x, interval| x += (interval * HOUR).to_i},
@@ -101,7 +103,7 @@ class CronFormat
     
     # take any repeater out of the unit value
     raw_units, repeaters = [], []
-
+    
     raw_a.each do |x| 
       v1, v2 = x.split('/')
       raw_units << v1
@@ -128,6 +130,7 @@ class CronFormat
 
     if repeaters.any? then
       repeaters.each_with_index do |x,i|
+
         next if i == 4
 
         if x and not raw_a[i][/^\*/] then
@@ -139,9 +142,9 @@ class CronFormat
         end 
       end
     end  
-   
+
     dates = inflate(raw_date)
-    
+
     a = dates.map do |date|
 
       d = date.map{|x| x ? x.clone : nil}
@@ -150,15 +153,15 @@ 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
         
         t = Time.parse(TF % d.reverse)        
-        
+
         if repeaters[4] then
-          t += (7 + repeaters[4].to_i) * DAY while t < @to_time
+          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        
@@ -169,6 +172,7 @@ class CronFormat
       # increment the month, day, hour, and minute for 
       #              expressions which match '* * * *' consecutively
       i = 3
+
       while t < @to_time and i >= 0 and raw_a[i][/\*/]
 
         d[i] = @to_time.to_a[i+1].to_s
@@ -191,15 +195,7 @@ class CronFormat
             t = Time.parse(TF % d.reverse)
           end
         elsif t.day < @to_time.day and raw_a[3] == '*' then
-
-          # increment the month
-          if d[3].to_i <= 11 then
-            d[3].succ!
-          else 
-            d[3] = '1'
-            d[4].succ!
-          end
-          t = Time.parse(TF % d.reverse)
+          t = increment_month d
         elsif  (t.hour < @to_time.hour or (t.hour == @to_time.hour \
           and t.min < @to_time.min and raw_a[1] != '*') ) \
             and raw_a[2] == '*' then
@@ -214,6 +210,8 @@ class CronFormat
           # increment the minute
           t += MINUTE * ((@to_time.min - d[0].to_i) + 1)
           t = procs.values[i].call(t, repeaters[i].to_i) if repeaters[i]
+        elsif raw_a[3] == '*' then
+          t = increment_month d        
         end   
 
       end
@@ -221,7 +219,13 @@ class CronFormat
       # after the units have been incremented we need to 
       #                   increment the weekday again if need be
       if wday then
-        t += DAY until t.wday == wday.to_i
+
+        if raw_date[2].length > 1 then
+
+          t += DAY until t.wday == wday.to_i and raw_date[2].include? t.day.to_s
+        else
+          t += DAY until t.wday == wday.to_i
+        end
       end
 
       # finally, if the date is still less than the current time we can
@@ -231,7 +235,6 @@ class CronFormat
         repeaters.each_with_index do |x,i|
 
           if x then
-
             t = procs.values[i].call(t, x.to_i)
           end
         end
@@ -251,7 +254,22 @@ class CronFormat
     day.to_i <= last_day.day
   end  
 
-  def inflate(a)
+  def increment_month(d)
+
+    if d[3].to_i <= 11 then
+      d[3].succ!
+    else 
+      d[3] = '1'
+      d[4].succ!
+    end
+
+    Time.parse(TF % d.reverse)
+  end  
+
+  def inflate(raw_a)
+
+    a = raw_a.dclone
+
     Array.new(a.max_by {|x| x.length}.length).map do |x|
       a.map{|x| x.length <= 1 ? x.first : x.shift}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   9DFxFCS6sgAw21S+V+ym9ft8kbqgy7zOGdPRRNlwgb/V+UWqH4yaCtk7yJT+n8vm
   LHkRlhnm0ScZYw==
   -----END CERTIFICATE-----
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk