clockwork 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/clockwork.rb

@@ -1,6 +1,8 @@
 module Clockwork
 	class FailedToParse < StandardError; end;
 
+	@@events = []
+
 	class Event
 		attr_accessor :job, :last
 
@@ -18,7 +20,7 @@ module Clockwork
 
 		def time?(t)
 			ellapsed_ready = (@last.nil? or (t - @last).to_i >= @period)
-			time_ready = (@at.nil? or (t.hour == @at[0] and t.min == @at[1]))
+			time_ready = (@at.nil? or ((@at[0].nil? or t.hour == @at[0]) and t.min == @at[1]))
 			ellapsed_ready and time_ready
 		end
 
@@ -46,10 +48,16 @@ module Clockwork
 
 		def parse_at(at)
 			return unless at
-			m = at.match(/^(\d\d):(\d\d)$/)
+			m = at.match(/^(\d\d|\*+):(\d\d)$/)
 			raise FailedToParse, at unless m
-			hour, min = m[1].to_i, m[2].to_i
-			raise FailedToParse, at if hour >= 24 or min >= 60
+			if m[1][0] == '*'
+				hour = nil
+			else
+				hour = m[1].to_i
+				raise FailedToParse, at if hour >= 24
+			end
+			min = m[2].to_i
+			raise FailedToParse, at if min >= 60
 			[ hour, min ]
 		end
 	end
@@ -68,10 +76,15 @@ module Clockwork
 	end
 
 	def every(period, job, options={}, &block)
-		event = Event.new(period, job, block || get_handler, options)
-		@@events ||= []
-		@@events << event
-		event
+		if options[:at].respond_to?(:each)
+			each_options = options.clone
+			options[:at].each do |at|
+				each_options[:at] = at
+				register(period, job, block, each_options)
+			end
+		else
+			register(period, job, block, options)
+		end
 	end
 
 	def run
@@ -103,6 +116,13 @@ module Clockwork
 		@@events = []
 		@@handler = nil
 	end
+
+	private
+	def register(period, job, block, options)
+		event = Event.new(period, job, block || get_handler, options)
+		@@events << event
+		event
+	end
 	
 end
 
@@ -120,4 +140,4 @@ unless 1.respond_to?(:seconds)
   	def days; self * 86400; end
   	alias :day :days
   end
-end
+end

data/test/clockwork_test.rb

@@ -56,6 +56,28 @@ class ClockworkTest < Test::Unit::TestCase
 		assert_will_run Time.parse('jan 2 2010 16:20:00')
 	end
 
+	test "twice a day at 16:20 and 18:10" do
+		Clockwork.every(1.day, 'myjob', :at => ['16:20', '18:10'])
+
+		assert_wont_run Time.parse('jan 1 2010 16:19:59')
+		assert_will_run Time.parse('jan 1 2010 16:20:00')
+		assert_wont_run Time.parse('jan 1 2010 16:20:01')
+
+		assert_wont_run Time.parse('jan 1 2010 18:09:59')
+		assert_will_run Time.parse('jan 1 2010 18:10:00')
+		assert_wont_run Time.parse('jan 1 2010 18:10:01')
+	end
+
+	test "once an hour at **:20" do
+		Clockwork.every(1.hour, 'myjob', :at => '**:20')
+
+		assert_wont_run Time.parse('jan 1 2010 15:19:59')
+		assert_will_run Time.parse('jan 1 2010 15:20:00')
+		assert_wont_run Time.parse('jan 1 2010 15:20:01')
+		assert_wont_run Time.parse('jan 2 2010 16:19:59')
+		assert_will_run Time.parse('jan 2 2010 16:20:00')
+	end
+
 	test "aborts when no handler defined" do
 		Clockwork.clear!
 		assert_raise(Clockwork::NoHandlerDefined) do

metadata

@@ -2,7 +2,7 @@
 name: clockwork
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 -07:00
-default_executable: clockwork
+date: 2011-10-14 00:00:00 Z
 dependencies: []
 
 description: A scheduler process to replace cron, using a more flexible Ruby syntax running as a single long-running process.  Inspired by rufus-scheduler and resque-scheduler.
@@ -29,7 +28,6 @@ files:
 - bin/clockwork
 - lib/clockwork.rb
 - test/clockwork_test.rb
-has_rdoc: true
 homepage: http://github.com/adamwiggins/clockwork
 licenses: []
 
@@ -53,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: clockwork
-rubygems_version: 1.5.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A scheduler process to replace cron.