clockwork 0.1.1 → 0.2.0

data/README.md

@@ -1,88 +1,128 @@
-Clockwork - a scheduler process to replace cron
-===============================================
+Clockwork - a clock process to replace cron
+===========================================
 
 Cron is non-ideal for running scheduled application tasks, especially in an app
 deployed to multiple machines.  [More details.](http://adam.heroku.com/past/2010/4/13/rethinking_cron/)
 
-Clockwork is a lightweight, long-running Ruby process which sits alongside your
-web processes (Mongrel/Thin) and your worker processes (DJ/Resque/Minion/Stalker)
-to schedule recurring work at particular times or dates.  For example,
-refreshing feeds on an hourly basis, or send reminder emails on a nightly
-basis, or generating invoices once a month on the 1st.
+Clockwork is a cron replacement.  It runs as a lightweight, long-running Ruby
+process which sits alongside your web processes (Mongrel/Thin) and your worker
+processes (DJ/Resque/Minion/Stalker) to schedule recurring work at particular
+times or dates.  For example, refreshing feeds on an hourly basis, or send
+reminder emails on a nightly basis, or generating invoices once a month on the
+1st.
 
-Example
--------
+Quickstart
+----------
 
-Create schedule.rb:
+Create clock.rb:
 
     require 'clockwork'
     include Clockwork
 
-    every('10s') { puts 'every 10 seconds' }
-    every( '3m') { puts 'every 3 minutes' }
-    every( '1h') { puts 'once an hour' }
+    handler do |job|
+      puts "Running #{job}"
+    end
 
-    every('1d', :at => '00:00') { puts 'every night at midnight' }
+    every(10.seconds, 'frequent.job')
+    every(3.minutes, 'less.frequent.job')
+    every(1.hour, 'hourly.job')
 
-Run it with the clockwork binary:
-
-    $ clockwork schedule.rb
+    every(1.day, 'midnight.job', :at => '00:00')
 
-Or run directly with Ruby:
+Run it with the clockwork binary:
 
-    $ ruby -r schedule -e Clockwork.run
+    $ clockwork clock.rb
+    [2010-05-25 18:16:46 -0700] Starting clock for 4 events: [ frequent.job less.frequent.job hourly.job midnight.job ]
+    [2010-05-25 18:16:46 -0700] -> frequent.job
 
 Use with queueing
 -----------------
 
-Clockwork only makes sense as a place to schedule work to be done, not to do
-the work.  It avoids locking by running as a single process, but this makes it
-impossible to parallelize.  For doing the work, you should be using a job
-queueing system, such as
+The clock process only makes sense as a place to schedule work to be done, not
+to do the work.  It avoids locking by running as a single process, but this
+makes it impossible to parallelize.  For doing the work, you should be using a
+job queueing system, such as
 [Delayed Job](http://www.therailsway.com/2009/7/22/do-it-later-with-delayed-job),
 [Beanstalk/Stalker](http://adam.heroku.com/past/2010/4/24/beanstalk_a_simple_and_fast_queueing_backend/),
 [RabbitMQ/Minion](http://adamblog.heroku.com/past/2009/9/28/background_jobs_with_rabbitmq_and_minion/), or
-[Resque](http://github.com/blog/542-introducing-resque).  This design allows
-a simple scheduler process with no locks, but also offers near infinite
-horizontal scalability.
+[Resque](http://github.com/blog/542-introducing-resque).  This design allows a
+simple clock process with no locks, but also offers near infinite horizontal
+scalability.
 
 For example, if you're using Beanstalk/Staker:
 
-    require 'clockwork'
-    include Clockwork
-
     require 'stalker'
-    include Stalker
 
-    every('1h') { enqueue('feeds.refresh') }
-    every('1d', :at => '01:30') { enqueue('reminders.send') }
+    handler { |job| Stalker.enqueue(job) }
+
+    every(1.hour, 'feeds.refresh')
+    every(1.day, 'reminders.send', :at => '01:30')
 
 Using a queueing system which doesn't require that your full application be
-loaded is preferable, because the scheduler process can keep a tiny memory
+loaded is preferable, because the clock process can keep a tiny memory
 footprint.  If you're using DJ or Resque, however, you can go ahead and load
-your full application enviroment.  For example, with DJ/Rails:
+your full application enviroment, and use per-event blocks to call DJ or Resque
+enqueue methods.  For example, with DJ/Rails:
 
     require 'config/boot'
     require 'config/environment'
 
-    require 'clockwork'
-    include Clockwork
+    every(1.hour, 'feeds.refresh') { Feed.send_later(:refresh) }
+    every(1.day, 'reminders.send', :at => '01:30') { Reminder.send_later(:send_reminders) }
+
+Anatomy of a clock file
+-----------------------
+
+clock.rb is standard Ruby.  Since we include the Clockwork module (the
+clockwork binary does this automatically, or you can do it explicitly), this
+exposes a small DSL ("handler" and "every") to define the handler for events,
+and then the events themselves.
 
-    every('1h') { Feed.send_later(:refresh) }
-    every('1d', :at => '01:30') { Reminder.send_later(:send_reminders) }
+The handler typically looks like this:
+
+    handler { |job| enqueue_your_job(job) }
+
+This block will be invoked every time an event is triggered, with the job name
+passed in.  In most cases, you should be able to pass the job name directly
+through to your queueing system.
+
+The second part of the file are the events, which roughly resembles a crontab:
+
+    every(5.minutes, 'thing.do')
+    every(1.hour, 'otherthing.do')
+
+In the first line of this example, an event will be triggered once every five
+minutes, passing the job name 'thing.do' into the handler.  The handler shown
+above would thus call enqueue_your_job('thing.do').
+
+You can also pass a custom block to the handler, for job queueing systems that
+rely on classes rather than job names (i.e. DJ and Resque).  In this case, you
+need not define a general event handler, and instead provide one with each
+event:
+
+    every(5.minutes, 'thing.do') { Thing.send_later(:do) }
+
+If you provide a custom handler for the block, the job name is used only for
+logging.
+
+You can also use blocks to do more complex checks:
+
+    every(1.day, 'check.leap.year') do
+      Stalker.enqueue('leap.year.party') if Time.now.year % 4 == 0
+    end
 
 In production
 -------------
 
-Only one scheduler process should ever be running across your whole application
+Only one clock process should ever be running across your whole application
 deployment.  For example, if your app is running on three VPS machines (two app
 servers and one database), your app machines might have the following process
 topography:
 
-* Machine 1: 3 web (thin start), 3 workers (rake jobs:work), 1 scheduler (clockwork schedule.rb)
-* Machine 2: 3 web (thin start), 3 workers (rake jobs:work)
+* App server 1: 3 web (thin start), 3 workers (rake jobs:work), 1 clock (clockwork clock.rb)
+* App server 2: 3 web (thin start), 3 workers (rake jobs:work)
 
-You should use Monit, God, Upstart, or Inittab to keep your scheduler process
+You should use Monit, God, Upstart, or Inittab to keep your clock process
 running the same way you keep your web and workers running.
 
 Meta
@@ -92,6 +132,8 @@ Created by Adam Wiggins
 
 Inspired by [rufus-scheduler](http://rufus.rubyforge.org/rufus-scheduler/) and [http://github.com/bvandenbos/resque-scheduler](resque-scehduler)
 
+Design assistance from Peter van Hardenberg and Matthew Soldo
+
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 http://github.com/adamwiggins/clockwork

data/Rakefile

@@ -14,3 +14,9 @@ Jeweler::Tasks.new do |s|
 end
 
 Jeweler::GemcutterTasks.new
+
+task 'test' do
+	sh "turn"
+end
+
+task :build => :test

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/clockwork

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+STDERR.sync = STDOUT.sync = true
+
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'clockwork'
 include Clockwork

data/lib/clockwork.rb

@@ -1,22 +1,33 @@
 module Clockwork
 	class Event
-		def initialize(span, options={}, &block)
-			@secs = parse_span(span)
+		attr_accessor :job, :last
+
+		def initialize(period, job, block, options={})
+			@period = period
+			@job = job
 			@at = parse_at(options[:at])
 			@last = nil
 			@block = block
 		end
 
+		def to_s
+			@job
+		end
+
 		def time?(t)
-			ellapsed_ready = (@last.nil? or (t - @last).to_i >= @secs)
+			ellapsed_ready = (@last.nil? or (t - @last).to_i >= @period)
 			time_ready = (@at.nil? or (t.hour == @at[0] and t.min == @at[1]))
 			ellapsed_ready and time_ready
 		end
 
 		def run(t)
-			@block.call
 			@last = t
+			@block.call(@job)
 		rescue => e
+			log_error(e)
+		end
+
+		def log_error(e)
 			STDERR.puts exception_message(e)
 		end
 
@@ -31,24 +42,6 @@ module Clockwork
 			msg.join("\n")
 		end
 
-		class FailedToParse < RuntimeError; end
-
-		def parse_span(span)
-			m = span.match(/^(\d+)([smhd])$/)
-			raise FailedToParse, span unless m
-			ordinal, magnitude = m[1].to_i, m[2]
-			ordinal * magnitude_multiplier[magnitude]
-		end
-
-		def magnitude_multiplier
-			{
-				's' => 1,
-				'm' => 60,
-				'h' => 60*60,
-				'd' => 24*60*60
-			}
-		end
-
 		def parse_at(at)
 			return unless at
 			m = at.match(/^(\d\d):(\d\d)$/)
@@ -61,26 +54,43 @@ module Clockwork
 
 	extend self
 
-	def every(span, options={}, &block)
-		event = Event.new(span, options, &block)
+	def handler(&block)
+		@@handler = block
+	end
+
+	class NoHandlerDefined < RuntimeError; end
+
+	def get_handler
+		raise NoHandlerDefined unless (defined?(@@handler) and @@handler)
+		@@handler
+	end
+
+	def every(period, job, options={}, &block)
+		event = Event.new(period, job, block || get_handler, options)
 		@@events ||= []
 		@@events << event
 		event
 	end
 
 	def run
+		log "Starting clock for #{@@events.size} events: [ " + @@events.map { |e| e.to_s }.join(' ') + " ]"
 		loop do
 			tick
 			sleep 1
 		end
 	end
 
+	def log(msg)
+		puts "[#{Time.now}] #{msg}"
+	end
+
 	def tick(t=Time.now)
 		to_run = @@events.select do |event|
 			event.time?(t)
 		end
 
 		to_run.each do |event|
+			log "-> #{event}"
 			event.run(t)
 		end
 
@@ -89,5 +99,20 @@ module Clockwork
 
 	def clear!
 		@@events = []
+		@@handler = nil
 	end
 end
+
+class Numeric
+	def seconds; self; end
+	alias :second :seconds
+
+	def minutes; self * 60; end
+	alias :minute :minutes
+
+	def hours; self * 3600; end
+	alias :hour :hours
+
+	def days; self * 86400; end
+	alias :day :days
+end

data/test/clockwork_test.rb

@@ -1,9 +1,16 @@
 require File.dirname(__FILE__) + '/../lib/clockwork'
 require 'contest'
+require 'mocha'
+
+module Clockwork
+	def log(msg)
+	end
+end
 
 class ClockworkTest < Test::Unit::TestCase
 	setup do
 		Clockwork.clear!
+		Clockwork.handler { }
 	end
 
 	def assert_will_run(t)
@@ -15,7 +22,7 @@ class ClockworkTest < Test::Unit::TestCase
 	end
 
 	test "once a minute" do
-		Clockwork.every('1m') { }
+		Clockwork.every(1.minute, 'myjob')
 
 		assert_will_run(t=Time.now)
 		assert_wont_run(t+30)
@@ -23,7 +30,7 @@ class ClockworkTest < Test::Unit::TestCase
 	end
 
 	test "every three minutes" do
-		Clockwork.every('3m') { }
+		Clockwork.every(3.minutes, 'myjob')
 
 		assert_will_run(t=Time.now)
 		assert_wont_run(t+2*60)
@@ -31,7 +38,7 @@ class ClockworkTest < Test::Unit::TestCase
 	end
 
 	test "once an hour" do
-		Clockwork.every('1h') { }
+		Clockwork.every(1.hour, 'myjob')
 
 		assert_will_run(t=Time.now)
 		assert_wont_run(t+30*60)
@@ -39,7 +46,7 @@ class ClockworkTest < Test::Unit::TestCase
 	end
 
 	test "once a day at 16:20" do
-		Clockwork.every('1d', :at => '16:20') { }
+		Clockwork.every(1.day, 'myjob', :at => '16:20')
 
 		assert_wont_run Time.parse('jan 1 2010 16:19:59')
 		assert_will_run Time.parse('jan 1 2010 16:20:00')
@@ -47,4 +54,41 @@ class ClockworkTest < Test::Unit::TestCase
 		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
+			Clockwork.every(1.minute, 'myjob')
+		end
+	end
+
+	test "general handler" do
+		$set_me = 0
+		Clockwork.handler { $set_me = 1 }
+		Clockwork.every(1.minute, 'myjob')
+		Clockwork.tick(Time.now)
+		assert_equal 1, $set_me
+	end
+
+	test "event-specific handler" do
+		$set_me = 0
+		Clockwork.every(1.minute, 'myjob') { $set_me = 2 }
+		Clockwork.tick(Time.now)
+		assert_equal 2, $set_me
+	end
+
+	test "exceptions are trapped and logged" do
+		Clockwork.handler { raise 'boom' }
+		event = Clockwork.every(1.minute, 'myjob')
+		event.expects(:log_error)
+		assert_nothing_raised { Clockwork.tick(Time.now) }
+	end
+
+	test "exceptions still set the last timestamp to avoid spastic error loops" do
+		Clockwork.handler { raise 'boom' }
+		event = Clockwork.every(1.minute, 'myjob')
+		event.stubs(:log_error)
+		Clockwork.tick(t = Time.now)
+		assert_equal t, event.last
+	end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-05-26 00:00:00 -07:00
 default_executable: clockwork
 dependencies: []