adzap-cronos 0.2.2 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.3.0 2009-01-27
+- better range handling for #on and #of including support for end excluded ranges
+- aliased #of with #in
+- make #every more flexible to allow use with for days and months eg. every(:thursday, 'Friday') or every(:jan, :feb)
+- adde midnight and midday methods
+
 == 0.2.2 2009-01-17
 - fix to ensure string values in hash from to_hash method
 

data/README.rdoc

@@ -62,6 +62,12 @@ is a strange combination anyway, the result is the union of both and not the int
 
   sudo gem install adzap-cronos -s http://gems.github.com
   
+
 == Credits
 
 Adam Meehan (http://duckpunching.com, adam.meehan@gmail.com)
+
+
+== License
+
+Copyright (c) 2008 Adam Meehan, released under the MIT license

data/lib/cronos.rb

@@ -33,8 +33,22 @@ module Cronos
     #   every(6).hours
     #   every(2).months
     #
-    def every(multiple)
-      RepeatInterval.new(multiple, self)
+    # or use as an alias for #on or #days
+    #   every(:monday)
+    #   every('February', :march)
+    #
+    def every(*multiple)
+      return RepeatInterval.new(multiple.first, self) if multiple.first.is_a?(Fixnum)
+
+      abbrs = multiple.map {|i| i.to_s.downcase[0..2].to_sym }
+
+      if abbrs.all? {|abbr| MONTHS.include?(abbr) }
+        of(*abbrs)
+      elsif abbrs.all? {|abbr| DAYS.include?(abbr) }
+        days(*abbrs)
+      else
+        raise "Unknown interval type passed to #every"
+      end
     end
 
     # Days of month:
@@ -45,12 +59,12 @@ module Cronos
     #
     def on(*args)
       if args.first.is_a?(Range)
-        range = args.first
-        @day = "#{range.first.to_i}-#{range.last.to_i}"
+        list = Array(args.first)
+        @day = "#{list.first}-#{list.last}"
       else
         list = args.collect {|day| day.to_s.to_i }
         @day = list.join(',')
-      end 
+      end
       self
     end
     alias on_the on
@@ -74,16 +88,25 @@ module Cronos
     # Months:
     #   of(:january)
     #   of('January')
-    #   of(:jan
+    #   of(:jan)
     #   of(:jan, :feb, :mar)
+    #   of(1..3)
+    #   of(1...4)
     #   of_months(1, 2, 3)
+    #   in(:january)
     #
     def of(*args)
-      list = args.map {|month| MONTHS.index(month.to_s.downcase[0..2].to_sym) + 1 unless month.is_a?(Fixnum) }
-      @month = list.join(',') 
+      if args.first.is_a?(Range)
+        list = Array(args.first)
+        @month = "#{list.first}-#{list.last}"
+      else
+        list = args.map {|month| MONTHS.index(month.to_s.downcase[0..2].to_sym) + 1 unless month.is_a?(Fixnum) }
+        @month = list.join(',')
+      end
       self
     end
     alias of_months of
+    alias in of
 
     def hourly
       @min  = 0
@@ -99,6 +122,20 @@ module Cronos
     end
     alias once_a_day daily
 
+    def midnight
+      @min  = 0
+      @hour = 0
+      self
+    end
+    alias at_midnight midnight
+
+    def midday
+      @min  = 0
+      @hour = 12
+      self
+    end
+    alias at_midday midday
+
     def weekly
       @min   ||= 0
       @hour  ||= 0
@@ -205,7 +242,7 @@ module Cronos
       def to_a
         @intervals
       end
-    end 
+    end
 
   end
 

data/spec/cronos_spec.rb

@@ -53,9 +53,13 @@ describe Cronos::Interval do
       interval.on('15th').to_s.should == '* * 15 * *'
     end
 
-    it "should output interval from integer range as dashed day of month range " do
+    it "should output interval from inclusive range as dashed day of month range " do
       interval.on(15..17).to_s.should == '* * 15-17 * *'
     end
+    
+    it "should output interval from exclusive range as dashed day of month range " do
+      interval.on(15...18).to_s.should == '* * 15-17 * *'
+    end
 
     it "should output interval from integer array as day number list" do
       interval.on(15, 16, 17).to_s.should == '* * 15,16,17 * *'
@@ -90,6 +94,14 @@ describe Cronos::Interval do
     it "should output interval with comma seperated month numbers from array of string month names" do
       interval.of('January', 'February', 'March').to_s.should == '* * * 1,2,3 *'
     end
+
+    it "should output interval from integer inclusive range as dashed month range " do
+      interval.of(1..3).to_s.should == '* * * 1-3 *'
+    end
+
+    it "should output interval from integer exclusive range as dashed month range " do
+      interval.of(1...4).to_s.should == '* * * 1-3 *'
+    end
   end
 
   describe "days method" do
@@ -149,6 +161,18 @@ describe Cronos::Interval do
     end
   end
 
+  describe "midnight method" do
+    it "should output interval to run at 00:00" do
+      interval.midnight.to_s.should == '0 0 * * *'
+    end
+  end
+
+  describe "midday method" do
+    it "should output interval to run at 12:00" do
+      interval.midday.to_s.should == '0 12 * * *'
+    end
+  end
+
   describe "weekly method" do
     it "should output interval to run on Sunday at 00:00 by default" do
       interval.weekly.to_s.should == '0 0 * * 0'
@@ -229,6 +253,26 @@ describe Cronos::Interval do
     end
   end
   
+  describe "every(day_name)" do
+    it "should output interval for day symbol as day of week" do
+      interval.every(:sunday).to_s.should == '* * * * 0'
+    end
+
+    it "should output interval for list of days as days of week" do
+      interval.every(:thursay, 'Friday').to_s.should == '* * * * 4,5'
+    end
+  end
+
+  describe "every(month_name)" do
+    it "should output interval for month symbol as month" do
+      interval.every(:january).to_s.should == '* * * 1 *'
+    end
+
+    it "should output interval for list of months as months" do
+      interval.every(:february, 'March').to_s.should == '* * * 2,3 *'
+    end
+  end
+
   describe "combinations" do
     it "weekly.at(3.30) should output '30 3 * * 0'" do
       interval.weekly.at(3.30).to_s.should == '30 3 * * 0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adzap-cronos
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Adam Meehan