--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -10,7 +10,8 @@ class Repository < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => :project_id, :case_sensitive => false
   
   before_save :set_as_mainline_if_first
-  after_create :add_user_as_committer, :create_git_repository
+  after_create :add_user_as_committer, :create_new_repos_task
+  after_destroy :create_delete_repos_task
   
   def self.new_by_cloning(other)
     new(:parent => other, :project => other.project)
@@ -43,6 +44,10 @@ class Repository < ActiveRecord::Base
     git_backend.create(full_repository_path)
   end
   
+  def delete_git_repository
+    git_backend.delete!(full_repository_path)
+  end
+  
   def has_commits?
     git_backend.repository_has_commits?(full_repository_path)
   end
@@ -64,6 +69,14 @@ class Repository < ActiveRecord::Base
       committers << user
     end
   end
+  
+  def create_new_repos_task
+    Task.create!(:target => self, :command => "create_git_repository")
+  end
+  
+  def create_delete_repos_task
+    Task.create!(:target => self, :command => "delete_git_repository")
+  end
     
   protected
     def set_as_mainline_if_first

--- a/app/models/ssh_key.rb
+++ b/app/models/ssh_key.rb
@@ -6,7 +6,10 @@ class SshKey < ActiveRecord::Base
   validates_presence_of :user_id, :key
   validates_format_of   :key, :with => SSH_KEY_FORMAT
   
-  before_save :lint_key!
+  before_save   :lint_key!
+  after_create  :create_new_task
+  # we only allow people to create/destroy keys after_update  :create_update_task 
+  after_destroy :create_delete_task
   
   def wrapped_key(cols=72)
     key.gsub(/(.{1,#{cols}})/, "\\1\n").strip
@@ -17,7 +20,25 @@ class SshKey < ActiveRecord::Base
     %Q{command="gitorious #{user.login}",no-port-forwarding,} + 
     %Q{no-X11-forwarding,no-agent-forwarding,no-pty #{key}} + 
     %Q{\n### END KEY #{self.id || "nil"} ###}
-  end  
+  end 
+  
+  def add_to_authorized_keys(key_file_class=SshKeyFile)
+    key_file = key_file_class.new
+    key_file.add_key(self.to_key)
+  end
+  
+  def delete_from_authorized_keys(key_file_class=SshKeyFile)
+    key_file = key_file_class.new
+    key_file.delete_key(self.to_key)
+  end
+  
+  def create_new_task
+    Task.create!(:target => self, :command => "add_to_authorized_keys")
+  end
+  
+  def create_delete_task
+    Task.create!(:target => self, :command => "delete_from_authorized_keys")
+  end
   
   protected
     def lint_key!

--- /dev/null
+++ b/app/models/task.rb
@@ -0,0 +1,17 @@
+class Task < ActiveRecord::Base
+  belongs_to :target, :polymorphic => true
+  
+  def self.find_all_to_perform
+    find(:all, :conditions => {:performed => false})
+  end
+  
+  def perform!
+    transaction do
+      target.send(command)
+      self.performed = true
+      self.performed_at = Time.now
+      save!
+    end
+  end
+  
+end

--- /dev/null
+++ b/db/migrate/016_create_tasks.rb
@@ -0,0 +1,19 @@
+class CreateTasks < ActiveRecord::Migration
+  def self.up
+    create_table :tasks do |t|
+      t.integer     :target_id
+      t.string      :target_type
+      t.string      :command
+      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
+
+  def self.down
+    drop_table :tasks
+  end
+end

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 15) do
+ActiveRecord::Schema.define(:version => 16) do
 
   create_table "committerships", :force => true do |t|
     t.integer  "user_id"
@@ -80,6 +80,20 @@ ActiveRecord::Schema.define(:version => 15) do
     t.string "name"
   end
 
+  create_table "tasks", :force => true do |t|
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.string   "command"
+    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|
     t.string   "login"
     t.string   "email"

--- a/lib/git_backend.rb
+++ b/lib/git_backend.rb
@@ -12,6 +12,10 @@ class GitBackend
       end
     end
     
+    def delete!(repos_path)
+      FileUtils.rm_rf(repos_path)
+    end
+    
     def repository_has_commits?(repos_path)
       Dir[File.join(repos_path, "refs/heads/*")].size > 0
     end

--- a/lib/mock_git_backend.rb
+++ b/lib/mock_git_backend.rb
@@ -4,6 +4,10 @@ class MockGitBackend
       true
     end
     
+    def delete!(repos_path)
+      true
+    end
+    
     def repository_has_commits?(repos_path)
       false
     end

--- /dev/null
+++ b/spec/fixtures/tasks.yml
@@ -0,0 +1,14 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+create_repo:
+  id: 1
+  target_id: 1
+  target_type: Repository
+  command: create_git_repository
+  performed: 0
+    
+add_key:
+  id: 2
+  target_id: 1
+  target_type: SshKey
+  command: add_to_authorized_keys
+  performed: 0

--- a/spec/models/git_backend_spec.rb
+++ b/spec/models/git_backend_spec.rb
@@ -19,6 +19,12 @@ describe GitBackend do
     GitBackend.create(path)
   end
   
+  it "deletes a git repository" do
+    path = @repository.full_repository_path 
+    FileUtils.should_receive(:rm_rf).with(path).and_return(true)
+    GitBackend.delete!(path)
+  end
+  
   it "knows if a repos has commits" do
     path = @repository.full_repository_path 
     dir_mock = mock("Dir mock")

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -85,9 +85,9 @@ describe Repository do
     @repository.create_git_repository
   end
   
-  it "creates an repository after save" do
-    @repository.should_receive(:create_git_repository).and_return(true)
-    @repository.save
+  it "deletes a repository" do
+    @repository.git_backend.should_receive(:delete!).with(@repository.full_repository_path).and_return(true)
+    @repository.delete_git_repository
   end
   
   it "knows if has commits" do
@@ -125,4 +125,21 @@ describe Repository do
     @repository.add_committer(users(:moe))
     users(:moe).can_write_to?(@repository).should == true
   end
+  
+  it "creates a Task on create and update" do
+    proc{
+      @repository.save!
+    }.should change(Task, :count)
+    task = Task.find(:first, :conditions => ["target_id = ?", @repository.id], :order => "id desc")
+    task.command.should == "create_git_repository"
+  end
+  
+  it "creates a Task on destroy" do
+    @repository.save!
+    proc{
+      @repository.destroy
+    }.should change(Task, :count)
+    task = Task.find(:first, :conditions => ["target_id = ?", @repository.id], :order => "id desc")
+    task.command.should == "delete_git_repository"
+  end
 end

--- a/spec/models/ssh_key_spec.rb
+++ b/spec/models/ssh_key_spec.rb
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe SshKey do
   
-  def create_key(opts={})
+  def new_key(opts={})
     SshKey.new({
       :user_id => 1,
       :key => "ssh-rsa bXljYWtkZHlpemltd21vY2NqdGJnaHN2bXFjdG9zbXplaGlpZnZ0a3VyZWFzc2dkanB4aXNxamxieGVib3l6Z3hmb2ZxZW15Y2FrZGR5aXppbXdtb2NjanRiZ2hzdm1xY3Rvc216ZWhpaWZ2dGt1cmVhc3NnZGpweGlzcWpsYnhlYm95emd4Zm9mcWU= foo@example.com",
@@ -10,7 +10,7 @@ describe SshKey do
   end
 
   it "should have a valid ssh key" do
-    key = create_key
+    key = new_key
     key.key = ""
     key.should_not be_valid
     key.key = "foo bar@baz"
@@ -28,7 +28,7 @@ describe SshKey do
   end
   
   it "should have a user to be valid" do
-    key = create_key
+    key = new_key
     key.user_id = nil
     key.should_not be_valid
     
@@ -38,18 +38,18 @@ describe SshKey do
   end
   
   it "strips newlines before save" do
-    ssh = create_key(:key => "ssh-rsa bXljYWtkZHlpemltd21vY2NqdGJnaHN2bXFjdG\n9zbXplaGlpZnZ0a3VyZWFzc2dkanB4aXNxamxieGVib3l6Z3hmb2ZxZW15Y2FrZGR5aXppbXdtb2NjanRiZ2hzdm1xY3Rvc216ZWhpaWZ2dGt1cm\nVhc3NnZGpweGlzcWpsYnhlYm95emd4Zm9mcWU= foo@example.com")
+    ssh = new_key(:key => "ssh-rsa bXljYWtkZHlpemltd21vY2NqdGJnaHN2bXFjdG\n9zbXplaGlpZnZ0a3VyZWFzc2dkanB4aXNxamxieGVib3l6Z3hmb2ZxZW15Y2FrZGR5aXppbXdtb2NjanRiZ2hzdm1xY3Rvc216ZWhpaWZ2dGt1cm\nVhc3NnZGpweGlzcWpsYnhlYm95emd4Zm9mcWU= foo@example.com")
     ssh.save
     ssh.key.should_not include("\n")
   end
     
   it "wraps the key at 72 for display" do
-    ssh = create_key
+    ssh = new_key
     ssh.wrapped_key.should include("\n")
   end
   
   it "returns a proper ssh key with to_key" do
-    ssh_key = create_key
+    ssh_key = new_key
     ssh_key.save!
     exp_key = %Q{### START KEY #{ssh_key.id} ###\n} + 
       %Q{command="gitorious #{users(:johan).login}",no-port-forwarding,} + 
@@ -57,4 +57,39 @@ describe SshKey do
       %Q{\n### END KEY #{ssh_key.id} ###}
     ssh_key.to_key.should == exp_key
   end
+  
+  it "adds itself to the authorized keys file" do
+    ssh_key_file_mock = mock("SshKeyFile mock")
+    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)
+  end
+  
+  it "removes itself to the authorized keys file" do
+    ssh_key_file_mock = mock("SshKeyFile mock")
+    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)
+  end
+  
+  it "creates a Task on create and update" do
+    ssh_key = new_key
+    proc{
+      ssh_key.save!
+    }.should change(Task, :count)
+    task = Task.find(:first, :conditions => ["target_id = ?", ssh_key.id], :order => "id desc")
+    task.command.should == "add_to_authorized_keys"
+  end
+  
+  it "creates a Task on destroy" do
+    ssh_key = new_key
+    ssh_key.save!
+    proc{
+      ssh_key.destroy
+    }.should change(Task, :count)
+    task = Task.find(:first, :conditions => ["target_id = ?", ssh_key.id], :order => "id desc")
+    task.command.should == "delete_from_authorized_keys"
+  end
 end

--- /dev/null
+++ b/spec/models/task_spec.rb
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Task do
+  before(:each) do
+    @task = tasks(:create_repo)
+  end
+
+  it "has_valid_associations" do
+    @task.should have_valid_associations
+  end
+  
+  it "performs a task" do
+    @task.target.should_receive(@task.command).and_return(true)
+    @task.perform!
+    @task.reload
+    @task.performed?.should == true
+    @task.performed_at.should_not == nil
+  end
+  
+  it "finds tasks that needs performin'" do
+    @task.update_attributes(:performed => true)
+    Task.find_all_to_perform.should == [tasks(:add_key)]
+  end
+end