Added keyrings to gitignore, symlinked to shared dir in cap scripts

.gitignore

@@ -5,3 +5,4 @@
 db/*.sqlite3
 log/*.log
 tmp/**/*
+gpg/diaspora*/*

app/controllers/users_controller.rb

@@ -4,5 +4,8 @@ class UsersController < ApplicationController
   def index
     @users = User.sort(:created_at.desc).all
   end
-
+  def show
+    @user= Person.where(:id => params[:id]).first
+    @user_profile = @user.profile
+  end
 end

app/models/user.rb

@@ -40,11 +40,9 @@ class User < Person
       generate_key
     end
     self.key_fingerprint = GPGME.list_keys(nil, true).first.subkeys.first.fingerprint
-    puts self.key_fingerprint
   end
 
   def generate_key
-    puts "Yo, generating a key."
     ctx = GPGME::Ctx.new
     paramstring = "<GnupgKeyParms format=\"internal\">
 Key-Type: DSA

app/views/users/show.html.haml

@@ -1 +1,12 @@
 %h1 user page!
+.span-18.last
+  %h1= "#{@user.real_name}"
+- if @user_profile
+  %p
+    %b url 
+  %p
+    = @user.url
+  %p
+    %b Key Fingerprint
+  %p
+    = @user.key_fingerprint

config/environment.rb

@@ -4,5 +4,5 @@ Haml::Template.options[:format] = :html5
 # Initialize the rails application
 Diaspora::Application.initialize!
 
-ENV['GNUPGHOME'] = File.expand_path("../../db/gpg-#{Rails.env}/", __FILE__)
+ENV['GNUPGHOME'] = File.expand_path("../../gpg-#{Rails.env}/", __FILE__)
 GPGME::check_version({})

lib/tasks/gpg.rake

@@ -0,0 +1,8 @@
+namespace :gpg do
+  desc 'Clear the gpg keyrings'
+  task :clear do
+    ctx = GPGME::Ctx.new
+    keys = ctx.keys
+    keys.each{|k| ctx.delete_key(k, true)}
+  end
+end

spec/spec_helper.rb

@@ -31,7 +31,6 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
   config.after(:suite) do
-    gpgdir = File.expand_path("../../db/gpg-#{Rails.env}", __FILE__)
     ctx = GPGME::Ctx.new
     keys = ctx.keys
     keys.each{|k| ctx.delete_key(k, true)}