adzap-cronos 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.3.1 2009-02-03
+- added ranges to #days
+
 == 0.3.0 2009-01-27
 - better range handling for #on and #of including support for end excluded ranges
 - aliased #of with #in

data/Rakefile

@@ -3,9 +3,10 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
+require 'lib/cronos'
 
 GEM = "cronos"
-GEM_VERSION = "0.2.2"
+GEM_VERSION = Cronos::VERSION
 AUTHOR = "Adam Meehan"
 EMAIL = "adam.meehan@gmail.com"
 HOMEPAGE = "http://github.com/adzap/cronos"

data/lib/cronos.rb

@@ -1,5 +1,7 @@
 module Cronos
 
+  VERSION = '0.3.1'
+
   class Interval
     attr_accessor :min, :hour, :day, :month, :dow
 
@@ -55,12 +57,12 @@ module Cronos
     #   on(13)
     #   on('13th')
     #   on(13..17)
+    #   on(13...18)
     #   on_the('13th')
     #
     def on(*args)
       if args.first.is_a?(Range)
-        list = Array(args.first)
-        @day = "#{list.first}-#{list.last}"
+        @day = format_range(args.first)
       else
         list = args.collect {|day| day.to_s.to_i }
         @day = list.join(',')
@@ -73,13 +75,19 @@ module Cronos
     #   days(:monday)
     #   days('Monday')
     #   days(:mon)
+    #   days(1..3)
+    #   days(1...4)
     #   on_day(:monday)
     #   days(:mon, :tues)
     #   on_days(:mon, :tues)
     #
     def days(*args)
-      list = args.map {|day| DAYS.index(day.to_s.downcase[0..2].to_sym) }
-      @dow = list.join(',')
+      if args.first.is_a?(Range)
+        @dow = format_range(args.first)
+      else
+        list = args.map {|day| DAYS.index(day.to_s.downcase[0..2].to_sym) }
+        @dow = list.join(',')
+      end
       self
     end
     alias on_days days
@@ -97,8 +105,7 @@ module Cronos
     #
     def of(*args)
       if args.first.is_a?(Range)
-        list = Array(args.first)
-        @month = "#{list.first}-#{list.last}"
+        @month = format_range(args.first)
       else
         list = args.map {|month| MONTHS.index(month.to_s.downcase[0..2].to_sym) + 1 unless month.is_a?(Fixnum) }
         @month = list.join(',')
@@ -197,6 +204,11 @@ module Cronos
       return hour, min, meridian
     end
 
+    def format_range(range)
+      list = Array(range).sort
+      "#{list.first}-#{list.last}"
+    end
+
     class RepeatInterval
 
       def initialize(multiple, interval)

data/spec/cronos_spec.rb

@@ -128,6 +128,14 @@ describe Cronos::Interval do
     it "should output interval with day numbers from array of string day names" do
       interval.days('Monday', 'Wednesday', 'Friday').to_s.should == '* * * * 1,3,5'
     end
+
+    it "should output interval from integer inclusive range as dashed dow range " do
+      interval.days(1..3).to_s.should == '* * * * 1-3'
+    end
+
+    it "should output interval from integer exclusive range as dashed dow range " do
+      interval.days(1...4).to_s.should == '* * * * 1-3'
+    end
   end
 
   describe "hourly method" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adzap-cronos
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +9,7 @@ autorequire: cronos
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: []