vrinek-cronos 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.6.2 2009-08-07
+- parser can now handle divisions (*/x) in a cron string
+
 == 0.6.1 2009-08-07
 - fixed README
 

data/lib/cronos.rb

@@ -1,6 +1,6 @@
 module Cronos
 
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 
   def self.schedule(task)
     TaskInterval.new(task)
@@ -370,14 +370,18 @@ module Cronos
       
       [:min, :hour, :day, :month, :wday].all? do |period|
         p = eval(period.to_s)
-        p == '*' or p.split(',').collect{ |parts|
+        now = eval("time.#{period}")
+        p.gsub! /\*/, now.to_s
+        
+        p.split(',').collect{ |parts|
           if parts[/-/]
-            first, last = parts.split '-'
-            (first..last).to_a
+            eval(parts.gsub(/-/, '..')).to_a.include? now
+          elsif parts[/\//]
+            eval(parts.gsub(/\//, '%')).zero?
           else
-            parts
+            parts.to_s == now.to_s
           end
-        }.flatten.include? eval("time.#{period}").to_s
+        }.flatten.include? true
       end
     end
   end

data/spec/cronos_spec.rb

@@ -452,6 +452,13 @@ describe Cronos::Parser do
       Cronos::Parser.new("20,40 * 5,12 * 2,3,6").now?(time).should == true
     end
     
+    it "should return true if cron_string matches a division" do
+      Cronos::Parser.new("*/20 * * * *").now?(time).should == true
+      Cronos::Parser.new("40 */7 * * *").now?(time).should == true
+      Cronos::Parser.new("*/20 14 */5 * *").now?(time).should == true
+      Cronos::Parser.new("*/20 14 */6,5 * *").now?(time).should == true
+    end
+    
     it "should return false if cron_string does not match some parts" do
       Cronos::Parser.new("* 15 * * *").now?(time).should == false
       Cronos::Parser.new("45 14 * * *").now?(time).should == false
@@ -474,6 +481,12 @@ describe Cronos::Parser do
       Cronos::Parser.new("20,40 14 3,8,12 * *").now?(time).should == false
       Cronos::Parser.new("20,40 14 5,12 * 0,6").now?(time).should == false
     end
+    
+    it "should return false if cron_string matches a division" do
+      Cronos::Parser.new("*/30 * * * *").now?(time).should == false
+      Cronos::Parser.new("40 */5 * * *").now?(time).should == false
+      Cronos::Parser.new("*/20 14 */6 * *").now?(time).should == false
+    end
   end
   
   def time

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vrinek-cronos
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Adam Meehan