--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -37,21 +37,25 @@ class Repository < ActiveRecord::Base
   end
   
   def full_repository_path
-    File.expand_path(File.join(BASE_REPOSITORY_DIR, gitdir))
+    self.class.full_path_from_partial_path(gitdir)
   end
   
-  def create_git_repository
-    git_backend.create(full_repository_path)
+  def self.create_git_repository(path)
+    git_backend.create(full_path_from_partial_path(path))
   end
   
-  def delete_git_repository
-    git_backend.delete!(full_repository_path)
+  def self.delete_git_repository(path)
+    git_backend.delete!(full_path_from_partial_path(path))
   end
   
   def has_commits?
     git_backend.repository_has_commits?(full_repository_path)
   end
   
+  def self.git_backend
+    RAILS_ENV == "test" ? MockGitBackend : GitBackend
+  end
+  
   def git_backend
     RAILS_ENV == "test" ? MockGitBackend : GitBackend
   end
@@ -71,11 +75,13 @@ class Repository < ActiveRecord::Base
   end
   
   def create_new_repos_task
-    Task.create!(:target => self, :command => "create_git_repository")
+    Task.create!(:target_class => self.class.name, 
+      :command => "create_git_repository", :arguments => gitdir)
   end
   
   def create_delete_repos_task
-    Task.create!(:target => self, :command => "delete_git_repository")
+    Task.create!(:target_class => self.class.name, 
+      :command => "delete_git_repository", :arguments => gitdir)
   end
     
   protected
@@ -88,4 +94,8 @@ class Repository < ActiveRecord::Base
     def add_user_as_committer
       committers << user
     end
+    
+    def self.full_path_from_partial_path(path)
+      File.expand_path(File.join(BASE_REPOSITORY_DIR, path))
+    end
 end

--- a/app/models/ssh_key.rb
+++ b/app/models/ssh_key.rb
@@ -22,22 +22,24 @@ class SshKey < ActiveRecord::Base
     %Q{\n### END KEY #{self.id || "nil"} ###}
   end 
   
-  def add_to_authorized_keys(key_file_class=SshKeyFile)
+  def self.add_to_authorized_keys(keydata, key_file_class=SshKeyFile)
     key_file = key_file_class.new
-    key_file.add_key(self.to_key)
+    key_file.add_key(keydata)
   end
   
-  def delete_from_authorized_keys(key_file_class=SshKeyFile)
+  def self.delete_from_authorized_keys(keydata, key_file_class=SshKeyFile)
     key_file = key_file_class.new
-    key_file.delete_key(self.to_key)
+    key_file.delete_key(keydata)
   end
   
   def create_new_task
-    Task.create!(:target => self, :command => "add_to_authorized_keys")
+    Task.create!(:target_class => self.class.name, 
+      :command => "add_to_authorized_keys", :arguments => self.to_key)
   end
   
   def create_delete_task
-    Task.create!(:target => self, :command => "delete_from_authorized_keys")
+    Task.create!(:target_class => self.class.name, 
+      :command => "delete_from_authorized_keys", :arguments => self.to_key)
   end
   
   protected

--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -5,15 +5,18 @@ class Task < ActiveRecord::Base
     find(:all, :conditions => {:performed => false})
   end
   
-  def self.perform_all_pending!
-    find_all_pending.each do |task|
-      task.perform!
+  def self.perform_all_pending!(log=RAILS_DEFAULT_LOGGER)
+    tasks_to_perform = find_all_pending
+    log.info("Got #{tasks_to_perform.size.inspect} tasks to perform...")
+    tasks_to_perform.each do |task|
+      task.perform!(log)
     end
   end
   
-  def perform!
+  def perform!(log=RAILS_DEFAULT_LOGGER)
     transaction do
-      target.send(command)
+      log.info("Performing Task #{self.id.inspect}: #{target_class}::#{command}(#{arguments[0..64].inspect}..)")
+      target_class.constantize.send(command, arguments)
       self.performed = true
       self.performed_at = Time.now
       save!

--- a/db/migrate/016_create_tasks.rb
+++ b/db/migrate/016_create_tasks.rb
@@ -1,15 +1,13 @@
 class CreateTasks < ActiveRecord::Migration
   def self.up
     create_table :tasks do |t|
-      t.integer     :target_id
-      t.string      :target_type
+      t.string      :target_class
       t.string      :command
+      t.text      :arguments
       t.boolean     :performed, :default => false
       t.datetime    :performed_at
       t.timestamps
     end
-    add_index :tasks, :target_id
-    add_index :tasks, :target_type
     add_index :tasks, :performed
   end
 

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -81,17 +81,15 @@ ActiveRecord::Schema.define(:version => 16) do
   end
 
   create_table "tasks", :force => true do |t|
-    t.integer  "target_id"
-    t.string   "target_type"
+    t.string   "target_class"
     t.string   "command"
+    t.text     "arguments"
     t.boolean  "performed",    :default => false
     t.datetime "performed_at"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "tasks", ["target_id"], :name => "index_tasks_on_target_id"
-  add_index "tasks", ["target_type"], :name => "index_tasks_on_target_type"
   add_index "tasks", ["performed"], :name => "index_tasks_on_performed"
 
   create_table "users", :force => true do |t|

--- /dev/null
+++ b/script/task_performer
@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= "production"
+require File.dirname(__FILE__) + "/../config/environment"
+require "fileutils"
+
+LOCK_FILE_PATH = File.join(RAILS_ROOT, "tmp", "task_lockfile")
+
+class TaskLockError < StandardError; end
+
+def with_lock(&block)
+  begin
+    if File.exist?(LOCK_FILE_PATH)
+      raise TaskLockError
+    end
+    FileUtils.touch(LOCK_FILE_PATH)
+    yield
+    FileUtils.rm(LOCK_FILE_PATH)
+  rescue TaskLockError
+    $stderr.puts "Task lockfile exists"
+    exit(1)
+  end
+end
+
+with_lock do
+  log = Logger.new(File.join(RAILS_ROOT, "log", "tasks.log"))
+  log.formatter = Logger::Formatter.new
+  log.formatter.datetime_format = "%Y-%m-%d %H:%M:%S"
+  Task.perform_all_pending!(log)
+end
\ No newline at end of file

--- a/spec/fixtures/tasks.yml
+++ b/spec/fixtures/tasks.yml
@@ -1,14 +1,17 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 create_repo:
   id: 1
-  target_id: 1
-  target_type: Repository
+  target_class: Repository
   command: create_git_repository
+  arguments: foo/bar.git
   performed: 0
     
 add_key:
   id: 2
-  target_id: 1
-  target_type: SshKey
+  target_class: SshKey
   command: add_to_authorized_keys
+  arguments: |-
+    ### START KEY 2 ###
+    command="gitorious johan",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa bXljYWtkZHlpemltd21vY2NqdGJnaHN2bXFjdG9zbXplaGlpZnZ0a3VyZWFc2dkanB4aXNxamxieGVib3l6Z3hmb2ZxZW15Y2FrZGR5aXppbXdtb2NjanRiZ2hzdm1xY3Rvc216ZWhpaWZ2dGt1cmVhc3NnZGpweGlzcWpsYnhlYm95emd4Zm9mcWU= foo@example.com
+    ### END KEY 2 ###
   performed: 0

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -81,13 +81,13 @@ describe Repository do
   end
   
   it "inits the git repository" do
-    @repository.git_backend.should_receive(:create).with(@repository.full_repository_path).and_return(true)
-    @repository.create_git_repository
+    Repository.git_backend.should_receive(:create).with(@repository.full_repository_path).and_return(true)
+    Repository.create_git_repository(@repository.gitdir)
   end
   
   it "deletes a repository" do
-    @repository.git_backend.should_receive(:delete!).with(@repository.full_repository_path).and_return(true)
-    @repository.delete_git_repository
+    Repository.git_backend.should_receive(:delete!).with(@repository.full_repository_path).and_return(true)
+    Repository.delete_git_repository(@repository.gitdir)
   end
   
   it "knows if has commits" do
@@ -130,8 +130,9 @@ describe Repository do
     proc{
       @repository.save!
     }.should change(Task, :count)
-    task = Task.find(:first, :conditions => ["target_id = ?", @repository.id], :order => "id desc")
+    task = Task.find(:first, :conditions => ["target_class = 'Repository'"], :order => "id desc")
     task.command.should == "create_git_repository"
+    task.arguments.should match(/#{@repository.gitdir}$/)
   end
   
   it "creates a Task on destroy" do
@@ -139,7 +140,8 @@ describe Repository do
     proc{
       @repository.destroy
     }.should change(Task, :count)
-    task = Task.find(:first, :conditions => ["target_id = ?", @repository.id], :order => "id desc")
+    task = Task.find(:first, :conditions => ["target_class = 'Repository'"], :order => "id desc")
     task.command.should == "delete_git_repository"
+    task.arguments.should match(/#{@repository.gitdir}$/)
   end
 end

--- a/spec/models/ssh_key_spec.rb
+++ b/spec/models/ssh_key_spec.rb
@@ -63,7 +63,7 @@ describe SshKey do
     ssh_key = new_key
     ssh_key_file_mock.should_receive(:new).and_return(ssh_key_file_mock)
     ssh_key_file_mock.should_receive(:add_key).with(ssh_key.to_key).and_return(true)
-    ssh_key.add_to_authorized_keys(ssh_key_file_mock)
+    SshKey.add_to_authorized_keys(ssh_key.to_key, ssh_key_file_mock)
   end
   
   it "removes itself to the authorized keys file" do
@@ -71,7 +71,7 @@ describe SshKey do
     ssh_key = new_key
     ssh_key_file_mock.should_receive(:new).and_return(ssh_key_file_mock)
     ssh_key_file_mock.should_receive(:delete_key).with(ssh_key.to_key).and_return(true)
-    ssh_key.delete_from_authorized_keys(ssh_key_file_mock)
+    SshKey.delete_from_authorized_keys(ssh_key.to_key, ssh_key_file_mock)
   end
   
   it "creates a Task on create and update" do
@@ -79,17 +79,20 @@ describe SshKey do
     proc{
       ssh_key.save!
     }.should change(Task, :count)
-    task = Task.find(:first, :conditions => ["target_id = ?", ssh_key.id], :order => "id desc")
+    task = Task.find(:first, :conditions => ["target_class = 'SshKey'"], :order => "id desc")
     task.command.should == "add_to_authorized_keys"
+    task.arguments.should == ssh_key.to_key
   end
   
   it "creates a Task on destroy" do
     ssh_key = new_key
     ssh_key.save!
+    keydata = ssh_key.to_key.dup
     proc{
       ssh_key.destroy
     }.should change(Task, :count)
-    task = Task.find(:first, :conditions => ["target_id = ?", ssh_key.id], :order => "id desc")
+    task = Task.find(:first, :conditions => ["target_class = 'SshKey'"], :order => "id desc")
     task.command.should == "delete_from_authorized_keys"
+    task.arguments.should == keydata
   end
 end

--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -10,7 +10,8 @@ describe Task do
   end
   
   it "performs a task" do
-    @task.target.should_receive(@task.command).and_return(true)
+    @task.target_class.constantize.should_receive(@task.command) \
+      .with(@task.arguments).and_return(true)
     @task.perform!
     @task.reload
     @task.performed?.should == true

--- a/tmp/.gitignore
+++ b/tmp/.gitignore
@@ -1,4 +1,5 @@
 cache/*
 pids/*
 sessions/*
-sockets/*
\ No newline at end of file
+sockets/*
+*lockfile