cron_format 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 746860116968e2c98fa0cc2e36b24a346d5b8166
-  data.tar.gz: 0ea73bfb9491cf04193a1f7df903d51768158365
+  metadata.gz: 41aa803c299e3bb85a89d8a8d5bc39d247f4a92c
+  data.tar.gz: ff24f9b8ac94bdf3669ea077b31541d72341183f
 SHA512:
-  metadata.gz: 5a2ca8cc5de6f74a3a64470e5ba73a3596e060b6888268eea96eb98bf1b4adca311c6fc35f22cc59d212e7ccea9954069d956625a724c755381c413382f3415e
-  data.tar.gz: 33726d9f095dfd9b5f7bc303dc10a5287a7955ebb911b5d5a934562ad2add0d48e9eafdab1c2779bd57a32b813165bd2cb96d8bf02e5fff0d887ca9befa91e71
+  metadata.gz: 41983d908c390bb49591feb34f1432cebadb42dd02e995ef3a235fd0df395143dc9a06b2af4d6bdf474dfe35a2a53f9aba15aedb707cf49ab25af2e17c8b9c0f
+  data.tar.gz: c74f02a02c48ec1a44f294b1f4b2bb5f854fe4e9ed6bf8f76005742c115e0ba89f7b8e615dfe291b28ee221bead1fef2eba31a52aaed138a92ea6bd6e1ded1a6

data/lib/cron_format.rb

@@ -9,19 +9,10 @@ require 'time'
 MINUTE = 60
 HOUR = MINUTE * 60
 DAY = HOUR * 24
+WEEK = DAY * 7
 TF = "%s-%s-%s %s:%s"
 
 
-class Array
-
-  def inflate()
-    Array.new(self.max_by {|x| x.length}.length).map do |x|
-      self.map{|x| x.length <= 1 ? x.first : x.shift}
-    end
-  end
-end
-
-
 class CronFormat
 
   attr_reader :to_time, :to_expression
@@ -73,7 +64,7 @@ class CronFormat
   end    
   
   def parse()
-    
+
     raw_a = @cron_string.split
     raw_a << '*' if raw_a.length <= 5 # add the year?
 
@@ -87,6 +78,7 @@ class CronFormat
          date = x.to_a.values_at(1..5)
          interval.times { date[3].succ! }
          Time.parse(TF % date.reverse)},
+       week: lambda {|x, interval| x += (interval * WEEK).to_i}, 
        year: lambda {|x, interval| 
          date = x.to_a.values_at(1..5)
          interval.times { date[4].succ! }
@@ -148,7 +140,7 @@ class CronFormat
       end
     end  
    
-    dates = raw_date.inflate
+    dates = inflate(raw_date)
     
     a = dates.map do |date|
 
@@ -190,11 +182,11 @@ class CronFormat
 
         if t.month < @to_time.month and raw_a[4] == '*' then
           # increment the year
-
           d[4].succ!
           t = Time.parse(TF % d.reverse)
 
           if repeaters[4] then
+
             d[4].succ!
             t = Time.parse(TF % d.reverse)
           end
@@ -231,7 +223,7 @@ class CronFormat
       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
@@ -239,6 +231,7 @@ class CronFormat
         repeaters.each_with_index do |x,i|
 
           if x then
+
             t = procs.values[i].call(t, x.to_i)
           end
         end
@@ -257,5 +250,11 @@ class CronFormat
                       (month.to_i < 12 ? month.succ : 1), 1]) - 1
     day.to_i <= last_day.day
   end  
+
+  def inflate(a)
+    Array.new(a.max_by {|x| x.length}.length).map do |x|
+      a.map{|x| x.length <= 1 ? x.first : x.shift}
+    end
+  end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   9DFxFCS6sgAw21S+V+ym9ft8kbqgy7zOGdPRRNlwgb/V+UWqH4yaCtk7yJT+n8vm
   LHkRlhnm0ScZYw==
   -----END CERTIFICATE-----
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk
@@ -50,17 +50,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: cron_format