chronic_cron 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3b5058b12c2cb781f5788a5aef3de5f34b405d26
+  data.tar.gz: 6e71c3ca5e7dd59b04ab7644706c3769b7c95911
+SHA512:
+  metadata.gz: 0ee877393bb0fdb6937ceeed1eae95cd1d1c320c25987ef0bea48a5fd05767b6737f77c47835970fda8e069b41b6165ab5b2bb5645cde8a66230785c2e90a90a
+  data.tar.gz: 787220c0fa7e8634dc7b5230ad2a2f57a1da83b10938b23a458b0d1cb77cf73af98a760920202cb5d140a28e2e5a5e82cc2d535820dff2dca9cfb5cba1f9a9f2

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+�]��E9*�u�Z����[&��-���1ɡ��BV3�.�ّ�^�׶6ܾK�Id� �p���_���������ӛ����TU�6����1ԗ�ZpJL�*#t��ǾX�b���"h����֣
�V3��xŪ��{∸L�v���x�����iq�|�������Uٛ�'��x�Y#P��RYy�����1_@�������cy����;���mױm�C{�;Xp}>AM�2�f!��Lӡ������?�C�

data/lib/chronic_cron.rb

@@ -5,6 +5,10 @@
 require 'date'
 require 'time'
 
+MINUTE = 60
+HOUR = MINUTE * 60
+DAY = HOUR * 24
+
 class Array
 
   def inflate()
@@ -23,17 +27,17 @@ class ChronicCron
     day.to_i <= last_day.day
   end  
   
-  def self.parse(object)
+  def self.parse(object, now=Time.now)
     
     raw_a = object.is_a?(String) ? object.split : object
     raw_a << '*' if raw_a.length <= 5 # add the year?
 
-    units = Time.now.to_a.values_at(1..4) + [nil, Time.now.year]
+    units = now.to_a.values_at(1..4) + [nil, now.year]
       
     procs = {
-      min: lambda{|x, interval| x += (interval * 60).to_i},
-      hour: lambda{|x, interval| x += (interval * 60 * 60).to_i},
-      day: lambda{|x, interval| x += (interval * 60 * 60 * 24).to_i}, 
+      min: lambda{|x, interval| x += (interval * MINUTE).to_i},
+      hour: lambda{|x, interval| x += (interval * HOUR).to_i},
+      day: lambda{|x, interval| x += (interval * DAY).to_i}, 
       month: lambda{|x, interval| 
          date = x.to_a.values_at(1..5)
          interval.times { date[3].succ! }
@@ -68,10 +72,10 @@ class ChronicCron
     end
 
     raw_date = raw_units.map.with_index {|x,i| dt[i].call(x) }
-
+    
     # expand the repeater
 
-    ceil = {min: 60, 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|
@@ -86,7 +90,7 @@ class ChronicCron
     end  
    
     dates = raw_date.inflate
-
+    
     a = dates.map do |date|
       d = date.map{|x| x ? x.clone : nil}
       wday, year = d.pop(2)
@@ -95,22 +99,22 @@ class ChronicCron
       next unless day_valid? d.reverse.take 3
       t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
         
-      if t < Time.now and wday and wday != t.wday then
-        d[2], d[3] = Time.now.to_a.values_at(3,4).map(&:to_s)
+      if t < now and wday and wday != t.wday then
+        d[2], d[3] = now.to_a.values_at(3,4).map(&:to_s)
         t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-        t += (60 * 60 * 24) until t.wday == wday.to_i
+        t += DAY until t.wday == wday.to_i
       end
 
       i = 3
-      while t < Time.now and i >= 0 and raw_a[i][/\*/]
-        d[i] = Time.now.to_a[i+1].to_s
+      while t < now and i >= 0 and raw_a[i][/\*/]
+        d[i] = now.to_a[i+1].to_s
         t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
         i -= 1
       end
 
-      if t < Time.now then
+      if t < now then
 
-        if t.month < Time.now.month and raw_a[4] == '*' then
+        if t.month < now.month and raw_a[4] == '*' then
           # increment the year
           d[4].succ!
           t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
@@ -119,7 +123,7 @@ class ChronicCron
             d[4].succ!
             t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
           end
-        elsif t.day < Time.now.day and raw_a[3] == '*' then
+        elsif t.day < now.day and raw_a[3] == '*' then
           # increment the month
           if d[3].to_i <= 11 then
             d[3].succ!
@@ -128,25 +132,25 @@ class ChronicCron
             d[4].succ!
           end
           t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
-        elsif  t.hour < Time.now.hour and raw_a[2] == '*' then
+        elsif  t.hour < now.hour and raw_a[2] == '*' then
           # increment the day
-          t += 60 * 60 * 24 * ((Time.now.day - d[2].to_i) + 1)
-        elsif t.min < Time.now.min and raw_a[1] == '*' then
+          t += DAY * ((now.day - d[2].to_i) + 1)
+        elsif t.min < now.min and raw_a[1] == '*' then
           # increment the hour
-          t += 60 * 60 * ((Time.now.hour - d[1].to_i) + 1)
+          t += HOUR * ((now.hour - d[1].to_i) + 1)
         elsif raw_a[0] == '*' then
           # increment the minute
-          t += 60 * ((Time.now.min - d[0].to_i) + 1)
+          t += MINUTE * ((now.min - d[0].to_i) + 1)
           t = procs.values[i].call(t, repeaters[i].to_i) if repeaters[i]
         end   
 
       end
 
       if wday then
-        t += (60 * 60 * 24) until t.wday == wday.to_i
+        t += DAY until t.wday == wday.to_i
       end
       
-      if t <= Time.now and repeaters.any? then
+      if t <= now and repeaters.any? then
 
         repeaters.each_with_index do |x,i|
           if x then

metadata

@@ -1,14 +1,13 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chronic_cron
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - James Robertson
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
@@ -30,46 +29,36 @@ cert_chain:
   aYYwh4InyS/QZr4LG0nh0TuYVP5vwm1cCSlLlo4dlv7bl7Q4y815j70z8O4oUrT8
   5oSIzmlVDEDmwAibYqdf+aHqmum1mkYW
   -----END CERTIFICATE-----
-
-date: 2013-02-06 00:00:00 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/chronic_cron.rb
 homepage: 
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+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: 1.8.23
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: chronic_cron
 test_files: []
-