cron_format 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec1b88cd1412621c71ddd48e4c271199c591cc0
-  data.tar.gz: ef8bca9680ccaa41a9057b3f7ad2be11ede7c115
+  metadata.gz: bc5b124e93e76533580f0693d394e7c14c42b63d
+  data.tar.gz: c86bf9db1516e6a0136d171a849d590fbe5654fa
 SHA512:
-  metadata.gz: 6cff4440b17a9f8cd24df5631a10fd5fffc282dd94567102b7e390a40842c742d74b5a3b2830fb665eba9de5670d8b56680e447038ae0d3952f7c6809752b6ea
-  data.tar.gz: a264ffbec7eb404e88fb29822af4d2577ca90b02af85483165d850d4e864c79dd87452d010e66adcd0e6fb64ba32e43e342a5bfea992fec9adbb995b0384d3eb
+  metadata.gz: 9d961fcb2c332f4196bb865bf993008eb2f49ad4af902e5b5b970fafedfe1ee35ce1081b165fa9c913bc825bb794f5117427d95f44c2106f615247ceeceb2ee6
+  data.tar.gz: 4fd8d28ba6ea17a6a625f76f634891f0062011c37fda5aec18e15532866bda9442f579341d39670197ab436bf7f4ef574c99b3e029fee7e2bfa75d6e4a0a0a17

data/lib/cron_format.rb

@@ -115,23 +115,27 @@ class CronFormat
       raw_units << v1
       repeaters << v2
     end
-    
-    r = /(sun|mon|tues|wed|thurs|fri|satur|sun)(day)?|tue|thu|sat/i
-    raw_units[4].gsub!(r) do |x|
-      a = Date::DAYNAMES
-      a.index a.grep(/#{x}/i).first
+
+    if raw_units[4] then
+      r = /(sun|mon|tues|wed|thurs|fri|satur|sun)(day)?|tue|thu|sat/i    
+
+      raw_units[4].gsub!(r) do |x|
+        a = Date::DAYNAMES
+        a.index a.grep(/#{x}/i).first
+      end
     end
     
     @to_expression = (raw_a[0..3] + [raw_units[4]])[0..4].join ' '
-    
     raw_date = raw_units.map.with_index {|x,i| dt[i].call(x) }
-    
+
     # expand the repeater
 
-    ceil = {min: MINUTE, hour: 23, day: 31, month: 12}.values
+    ceil = {min: MINUTE, hour: 23, day: 31, month: 12}.values    
 
     if repeaters.any? then
       repeaters.each_with_index do |x,i|
+        next if i == 4
+
         if x and not raw_a[i][/^\*/] then
           raw_date[i] = raw_date[i].map {|y|            
             (y.to_i...ceil[i]).step(x.to_i).to_a.map(&:to_s)
@@ -142,25 +146,31 @@ class CronFormat
       end
     end  
    
-    
     dates = raw_date.inflate
     
     a = dates.map do |date|
 
       d = date.map{|x| x ? x.clone : nil}
       wday, year = d.pop(2)
-      
       d << year
 
       next unless day_valid? d.reverse.take 3
-      t = Time.parse(TF % d.reverse)
+      t = Time.parse(TF % d.reverse)      
+       
+      # if there is a defined weekday, increment a day at 
+      #                          a time to match that weekday
+      #jr050813 if t < @to_time and wday and wday != t.wday then
+      if wday and wday != t.wday then
         
-      if t < @to_time and wday and wday != t.wday then
         d[2], d[3] = @to_time.to_a.values_at(3,4).map(&:to_s)
+        
         t = Time.parse(TF % d.reverse)
-        t += DAY until t.wday == wday.to_i
+        t += DAY until t.wday == wday.to_i        
+        t += (7 + repeaters[4].to_i) * DAY if t < @to_time and repeaters[4]
       end
-
+      
+      # 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][/\*/]
 
@@ -169,6 +179,8 @@ class CronFormat
         i -= 1
       end
 
+      # 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
@@ -197,7 +209,6 @@ class CronFormat
 
           # increment the day
           t += DAY * ((@to_time.day - d[2].to_i) + 1)
-        #jr070713 elsif t.min < @to_time.min and raw_a[1] == '*' then
         elsif t.min < @to_time.min and raw_a[1] == '*' then
 
           # increment the hour
@@ -210,13 +221,18 @@ class CronFormat
 
       end
 
+      # 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
       end
       
+      # 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
 
         repeaters.each_with_index do |x,i|
+
           if x then
             t = procs.values[i].call(t, x.to_i)
           end

data.tar.gz.sig

@@ -1 +1,2 @@
-n�M����v��K*]5l�}�%�Z]�
+�Aa9Y�X�l���h�U���
W��j�!~���@ST�kh�kUy>4#�+\2A�-z�H�r��Q�`I[�;��X���
+��p������o��(�����P��#G8】�M�Ы�MoԑAF�\�,^����؎�E����@��5�̓�:�ө!���Cog�UT*wz6�1v<y��nd�T2���t��q�7t��}�R���ITNQ=��ӶL��r�/�b��SA��R9�����=L(�B-

metadata

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