From a5db2cd2314698901cc9a2bd238d4056b4de313e Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 8 Jul 2010 20:54:11 -0400
Subject: [PATCH] Added keyrings to gitignore, symlinked to shared dir in cap
 scripts

---
 .gitignore                          |   1 +
 app/controllers/users_controller.rb |   5 ++++-
 app/models/user.rb                  |   2 --
 app/views/users/show.html.haml      |  11 +++++++++++
 config/environment.rb               |   2 +-
 db/gpg-development/pubring.gpg      | Bin 1492 -> 0 bytes
 db/gpg-development/pubring.gpg~     | Bin 1492 -> 0 bytes
 db/gpg-development/random_seed      | Bin 600 -> 0 bytes
 db/gpg-development/secring.gpg      | Bin 1758 -> 0 bytes
 db/gpg-development/trustdb.gpg      | Bin 1360 -> 0 bytes
 db/gpg-test/pubring.gpg             | Bin 606 -> 0 bytes
 db/gpg-test/pubring.gpg~            | Bin 606 -> 0 bytes
 db/gpg-test/random_seed             | Bin 600 -> 0 bytes
 db/gpg-test/secring.gpg             | Bin 736 -> 0 bytes
 db/gpg-test/trustdb.gpg             | Bin 1920 -> 0 bytes
 lib/tasks/gpg.rake                  |   8 ++++++++
 spec/spec_helper.rb                 |   1 -
 17 files changed, 25 insertions(+), 5 deletions(-)
 delete mode 100644 db/gpg-development/pubring.gpg
 delete mode 100644 db/gpg-development/pubring.gpg~
 delete mode 100644 db/gpg-development/random_seed
 delete mode 100644 db/gpg-development/secring.gpg
 delete mode 100644 db/gpg-development/trustdb.gpg
 delete mode 100644 db/gpg-test/pubring.gpg
 delete mode 100644 db/gpg-test/pubring.gpg~
 delete mode 100644 db/gpg-test/random_seed
 delete mode 100644 db/gpg-test/secring.gpg
 delete mode 100644 db/gpg-test/trustdb.gpg
 create mode 100644 lib/tasks/gpg.rake

diff --git a/.gitignore b/.gitignore
index 872e37d3a..6b3124602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 db/*.sqlite3
 log/*.log
 tmp/**/*
+gpg/diaspora*/*
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1da4454c5..99f155736 100644
--- a/app/controllers/users_controller.rb
+++ b/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
diff --git a/app/models/user.rb b/app/models/user.rb
index f3c695f3d..6bb136a2f 100644
--- a/app/models/user.rb
+++ b/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
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 01cfb9999..f922e19b8 100644
--- a/app/views/users/show.html.haml
+++ b/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
diff --git a/config/environment.rb b/config/environment.rb
index 695be6a22..d8d7f075a 100644
--- a/config/environment.rb
+++ b/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({})
diff --git a/db/gpg-development/pubring.gpg b/db/gpg-development/pubring.gpg
deleted file mode 100644
index cb573f9bd3d3ebb7b8fc03b680caca1ffe18adc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1492
zcma)*`8(4M0KmUH8)NR}jmh;UdMV|~T$Nkp$T@{!l2_YYG2~IR9Eoy!X;b6~xf9V6
zMUI-IxpN=skej*Q^gKOJzrF9D@cBHSPue*2teO*301VtMk5rSsd=c1D$(7+;>J8sk
zB&%w&WzLr!H(dR?IYOW_w&=Lm5ZE$1H#G`$Bhpc9a@lJ;F<=cH+$R!soC;*oIz}?)
z1PhDE2xV7GT$49P=35?U*P<%wzLWuNiek1hBUzn~WqQyw>u&Zjtlxji7a(Na%GPe^
zRZeY!zzgRtJJ~^qEsLgI$woAOn@!KUjYBLv7@)oX{88ilNc-R{cTl-cSF8wqyJmPm
z9s&5E34ucfkb;(1TG3}8^d-kS8%l_r51rFomt8PZot36)%H`r?Vk<GHNv^IG$-|y_
ze}bR9q?Q|=?5{`0`}r$fAzs#ra)k>0;FpGh_e_ArWZ+0H#6AcZE`k7aaU-E<Fa!ja
z0D<?11KeEv1DCEQ#zrKn+fD&=-9<_XhFlnndWVd(QTUvW!Yxh$8St%lK13A`(URWk
z)+JHr(rIB{Q3?hi&+hzG%?}3Jh8=VRGmSId#T<>pDh@SeimA)plbXXd$h@GWVi@0f
z<6%tIO_p`ugi;4}zByd5e1pCG(HBp8Go<ezNKXZzyr5kQ5xLNC_n;x#THu<?Oh81i
z1kN}y6xn@1V!f>PUY-w)+)fx1?LLh5q~PpORVd_*>5(*0+S<sl0UlmA?;m9X75#zD
z^$VNlce-5+z&OR0!!9$>)xj+=KibTfQq%U>GJxUU6sUWO6eOTzujr!F=RN_O8iw!D
zrGp;+z;n(PfC9bPXd`s|9|EjY!RzBTDGA&2?RG;#H*2<G=D?t`d7{G{wPbnlBGDlx
zsm-jd%kF?>=FQnJ^8|4wV;O62pgk7sQk9RO^j?T(h(x{^PB@rc96MF=SYc?lWvaty
zm3t9F3|<FK=7F_!hN?&HOZWMTAF=4vCe$bK$YTngF@UV^<TC<Q`?R)}3Z(uNuU&sx
zJ~E*U1@72_f=HX}IQO{vSv^((WTvN^#>dwkXKS;uZZ<%&*hx>*U!|BTdp^w^_XxwA
zmD=)E#|bYLY1t7@H%teHdaRxhLS@6E2^%C{o4%|k>~DoVr0O9ZYhRYtKaw@vZ0b=*
zyjVS*$Atxrc%rkKO%$hpb>l~&h80wwepOV30`;7A9uw+Ve<kv5z-^o8@?abec|jbi
z`KGMzT&G$fbM{7Gw6KKa1~(}yU!E}6aQ{0Y-fc~>kIhE-eD;<NNC~Yt=O=t?_LV+I
z?s*BPQ15A8b<}uBg<1TgqUM+nhPUB%D|Pu5?hnhboo)ePmiTn{V)*06Vnjbz{D-0k
ze3cT0z65vo|Fwd1_J6Ig0uvdy;t%zD76Z_ApnfLBt_-0<$h1=b(9%h(`w7+n!>%5)
z6rEuauBEVzcf}etiy~1yd$H7jcz(vh4+SEmgQ3o{yd1TH&Qs~D&vVqTdf9Kas%%f6
zmT6i_II;7}LcQ^U>xMB#$0em!(DI}>E%|kl{wfmvDaFTJFwObMx!cQex@MOgOCY$V
zMB9Z@^j~YA!n8-3SgV|h#sm8`L<K(zcVpW~-y#>({VM}Ltmri820G7Tb~H*~nv3ZI
zP$Xo{Z<%XUW%TV4!`I3glh=G;Ex|;3Nc|%wV=EoYGiI)d*vOH+qaR=1^u#Yv1D=?h
z?sXAIwV3A6Q4a^>G8&Hc)-_3ZcmFL<?Rj}nFiA>&2wNLHac10)mD3MmHBKHgZC6S@
z<`z<HMQ*Nhb84m9I&@&;g6xD8J*KeF2_wI+xTpQ+iofhiQGl$9Se#*|Yf|>8GP6U^
j`K(uvw`C!a#l(1;ql`SFOj23}0-TQG#Y3*^@7etqUjCOu

diff --git a/db/gpg-development/pubring.gpg~ b/db/gpg-development/pubring.gpg~
deleted file mode 100644
index 44ac03229f1795bb72c923cdae0b720d7c8c435e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1492
zcma)*`8(4M0KmUH!<c({W6Sj>dMV|~T$Nkp$T@|LNnUNv80t~89Eoy!X;b6~xf9V6
zMUHYc!{k2FA@|Ko&(rht+xz|rpU?C8q>e(*syQ(Q!N9$;2sP=;7lCb+9GUe?y<uC5
z-m01`ne(N`4VS-d3=!#!O*-xk1h&Y^Nr?pAjBpemU-aBc2v|V{vqdA1Q-Mrc`%wCf
zP(h(LmomW;*XXq_^F0@|V^JCTK+1qNK`~pJlB~+ZGTmvKwYS&|>kpsv1c{lqv$X4b
zl~Woa@Pe7kPIeGd^So(Sk`Yb7X2YX)?NA3E4A4G&`J{1vsBK`HC#cM)D@K&QRXx}*
z&jt9Ph=CjfNPhEct*EmP*-0_Zh8WTFp);DRvU6st)6!H;xg30SOa=NhnLwaO9`?Zd
z6aC~RwOsMu{(9bcKYyhwq{}*y1gP*XzcdWIX96rP14nRk?Sp{fqFi8Z9t0ExhJe5r
z5O{wWz{4%jf9YyMOn8F2?F2yAou?F|y$fQH?-3C;3SZKYxcPA)9lrVAhorJjvZS}T
zc42B=IxWo0OTYl+`Q4wY1;9Y-po4B;hH-|QxTEon@<WXo;_7nurDkyTGA}79XvPn|
zI2coPqr*CPOsSnZ+Y}~Lw#Hig<clZ2<>)&I(Nh2@A83a{Ld@0QJ7|cq7QE&%6%Zbb
z!5JrnBDxP?R!eK{=lamR+lV7#-G@;g6r3Hh5{bAuIg|=YT^SlQz{6{2{Uc4FV!PPf
zzp#0Kr`tgTj8iN*>>>kI72FK-qfLD+F>Q+}1sHCPfx4&2L4r#5iY_{Aw=vknAbgK5
z4fJRi&pAsF3iM*5j8JiZ2zI0hT_3ecj^CPXv*QTgs@{T`0|UzD2@W&V;>CfBB!}q4
zR<qVFy91UPx2C_&5+#_7MXbGn_DHZxWgZu$_d*;)G~(r8{K2H6n2F*i3Y?whiFTu9
zo_Po<coj6B3)a@*R1Mpg?DLg4V$rEhtV`sTN9R9h0GU6$&j?oT)7o6fm-<tpX7yFs
z(3mn5xN8dvB5$x_-D2ye^*Zt)Q$5`@e*W%QTbs32vwpJ0c3P_bGR0Kc<5|Y2`whHV
zi7kIstjI#4mL2hQ{bXRM`|=54WEL!nxJKr)VP`&NeJ|)CS8;T#eLJlFk*wxnQI9&}
z#p~$2E*;SDr#j17BnkRAR{<n)P(k(CH$_z_P`AFyYeF6At3bR9xMLGl7L3CoE=WK%
z-<Gn^b*cq2r*E>OL@<(TJmkzgdE!j{gCE2=*A+!Ji^b*h#Y;9IIkfzopUCa$*ZS*n
zFN)U-^q%EbMUIA)o5ejYY>NJ9cn5B`RGU}s_NWxw=^Aju5})Q)1b@;{#MQ?g_p$IH
ze+9<Sm+0p9zgBS0`mYt1V50q3{Gp!DqXD`O)X$`dzz{BgOe*zp7EW3{h_?n9c6I25
zsC0`kErl&S0c+GGhCuf0#sXA>cz?zs00qLOgQ3o{eCulYou|^4Uu3Ia^|aq?QQ4Y2
zEz`IVe`5Q!g?ht7!kRH!$0fN&$nvBFE$L07{xSmfIoZctDAoDMxjT!ox@MOgiy^p$
z1lze1)L$!~Z)guQu~ymT4F~pXhzWfX>BhE_zemie`&R^fT+*r64RoGHZ)=piG8fkc
zpa{r{-y-+0%J91*hHsS9$FKRonuAI7kh;fA#%3Cpcf?$iYb{&$u6|ru<5Ryt4R}IM
zn&(9v)nam;j(ju_n_hpcx3&@E)%~|Twdd7Ap+qTp4z?z0?98ZNM|K~mqhb7*X`52g
zG1rhHEAOUSSEm-LtwTFDHpos`(R~8@f;ja1ihJ6BuK3HY6a~mEkHHyc5E8S7m6`2&
j&SyP?yetcVOeWgH9BJepX_DL`7~pgiFA;KGf6wl}THcpE

diff --git a/db/gpg-development/random_seed b/db/gpg-development/random_seed
deleted file mode 100644
index 4d35367abc09a9233e6b633ca64ce6068e4b4aac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 600
zcmV-e0;m0aQ?U7wxtB56w?yj`dNWPYY~5?~W-JiR3~?BkqqKonTpR$y`}Gx8#th4*
znUPc06_P9&t0W(<Aj|U?@3Oruzjfhme~emr>9HS9*<IMcp1D%&*I8`K_290x5`I-X
zHFQKHujQ>B3+7O@OyGKqtZiGjY>`;j>CzS&rgL8npb;$r<;~P=pas%4sNLy!H1Tn=
zdE*PBV9%5`^0_WmDe2y3ivE2Uqm(zw77sK^jHcaazK1wUi3!FII)1Ts6sIo*)z(48
z(Esu>68a36s3>Y=oE%{#edUvC;8^<CRW8ldIBV^x@m8qZQZ8n%Y~m$IFFRTQ3lhel
zt&7UoGM+!~E1@6OAN+sG2)+oZKgX>~St+S<t{6z_Si46-Yc#N>gK_a7Jz~)@MLyH%
zx;r^$LN@u|UQ$QQBio%-4|r4-bVH5jxZj9^s`<WM2FjeUQfLwV?Sjxz?zy%Fw;Zbn
zazDp!Sy`~!@361tacQ;1ZN%yz>`6jS^xA}&)S&h80(Jyo8%!x`kU02LMf_&qvpxfs
zH%uz~vW5k<I^sXDE22aTI3l;v0pF<}x*^CsJ&Lhdr4f(%jsegswUH1XmLU9<8hS2G
zn6sFoZI%DGowpG9j~~s4s0b3Co|VVRGp!qL^Tj-Wc+3!(_0YVy>iKh9RK!YfWcO(0
zv5t&olDjOaEZ4`CP$Qs`q!`Xdbw^NNk;1@j8Vip|JFVn=--<)gdLzi7#b2tDePR}0
m=!IwdUTkMyP!!{IX~{v@Lj<e8_=TfGlKabJnfuNHgCqTJ!Y{r6

diff --git a/db/gpg-development/secring.gpg b/db/gpg-development/secring.gpg
deleted file mode 100644
index 4d44acc6b37b333d4d3d55d336aed2cb29e27197..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1758
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

diff --git a/db/gpg-development/trustdb.gpg b/db/gpg-development/trustdb.gpg
deleted file mode 100644
index 3e1b582af8375e739f2e9380ce9676609832fb4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1360
zcmZQfFGy!*W@Ke#U|{euOZ*3<umMIcY@%4ihJ-o=EDlE#8WR3Mb2B#Xs6ViU3IoH4
z4Hr4=;Q<pJ?BT-0a8rF^e%Sd{nlX!eX5Wg<o!rwh*_;jHe0i8J7#MgNN~32eGAg_k
ze(pLweWky6qlr;SHdGx#83PZ4?pG%vUe6l$sfw0NUs*+OWtOmHLDeZD6!J1`Sb0F~
Y#nJa`emC6lT0ZfI=a=bnZkXl)0A+6~1poj5

diff --git a/db/gpg-test/pubring.gpg b/db/gpg-test/pubring.gpg
deleted file mode 100644
index 506acc069cb2cebe77abb677fadc8b40052a5903..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmbR7h{eY&MM98?;oQU{OeePQx?sn{6rAz=kcV`K$MGET<+c2g6Yf;b>Fx6@TTzmA
zm#g<G+rv#^EfdN+wPK{Rx4+Nf(pl(H6`vZ-uwboc(}A{yGJS13Cj5+C`J3Zdr}S+m
zhOG&TdMw}BMdchCZZ@`_5L#!R=V&P@)w-y4iq8YPFpG<7&x^`GAD7A9etM(f#MT;*
z#qyT&<@*ccErQ;f?eG4{_)n8_`%gZ0^(nO*Q`#;{@QAhfY@CyE_<#JS>bf@)H_dB&
z51!IXI}{nia`^SKeGit|>N4F>GHXydQ+xgFdc(Y9C$<<R<tHf==Vq2<C}?DqloVL$
z>z9|8>!nsC<`(3n>Lusr>T4?402LWJB<AOU_;wvhEW*G*QDS8R1rL+7G8;E12Rkzp
zn<xhpCl@!17!xxilN=+Hcmo3$r@+SNJ0q@{8>(C_W0+^>DpLJh*Jj1TbuS;W+jbW&
zvy2pEn5UQ4^z+Z{+UZt@QjJ6oXj>W=p1He$iGg`XFF5=Km>B+epM2MTwKG+7!H31m
z*LpZiOF#1<Q%*?aw=36S$7K~-ixi!E^6N~*I)b-!Mqj+W|90tOo4fZmNzG~wZIizB
zxtW2PmGPg(C)1$gwmICEUXpr;``0i!rcBhkx$4P9hK<2SGfXz8m4q_)O*UrnobD69
zF?o53QpK}^qz4fz!h|=-NoB0unbP6O0!j;<FmLl9`)+<5!-Afl(Fx+2@t-SZI(8Nv
j?6dMedfOZ*+SDw1B9||v{mByT&WZCfFP!J-0{IRAGi~;G

diff --git a/db/gpg-test/pubring.gpg~ b/db/gpg-test/pubring.gpg~
deleted file mode 100644
index 60008a7ba4af5b5e4d2bb26fa0ecc71b5cd6e3ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmbR7h{eY&MM98?;oQU{OeePQx?sn{6rAz=kcV`K$MGET<+c2g6Yf;b>Fx6@TTzmA
zm#g<G+rv#^EfdN+wPK{Rx4+Nf(pl(H6`vZ-uwboc(}A{yGJS13Cj5+C`J3Zdr}S+m
zhOG&TdMw}BMdchCZZ@`_5L#!R=V&P@)w-y4iq8YPFpG<7&x^`GAD7A9etM(f#MT;*
z#qyT&<@*ccErQ;f?eG4{_)n8_`%gZ0^(nO*Q`#;{@QAhfY@CyE_<#JS>bf@)H_dB&
z51!IXI}{nia`^SKeGit|>N4F>GHXydQ+xgFdc(Y9C$<<R<tHf==Vq2<C}?DqloVL$
z>z9|8>!nsC<`(3n>Lusr>T4?402LWJB<AOU_;wvhEW*G*QDS8R1rL+7G8;E12Rkzp
zn<xhpCl@!17!xxilN=+Hcmo3$r@+SNJ0q@{8>(C_W0+^>DpLJh*Jj1TbuS;W+jbW&
zvy2pEn5UQ4^z+Z{+UZt@QjJ6oXj>W=p1He$iGg89FF5=Km>B+epM2MTwKG+7!H31m
z*LpZiOF#1<Q%*?aw=36S$7K~-ixi!E^6N~*I)b-!Mqj+W|90tOo4fZmNzG~wZIizB
zxtW2PmGPg(C)1$gwmICEUXpr;``0i!rcBhkx$4P9hK<2SGfXz8m4q_)O*UrnobD69
zF?o53QpK}^qz4fz!h|=-NoB0unbP6O0!j;<FmLl9`)+<5!-Afl(Fx+2@t-SZI(8Nv
j?6dMedfOZ*+SDw1B9||v{mByT&WZCfFP!J-0{IRAFwORI

diff --git a/db/gpg-test/random_seed b/db/gpg-test/random_seed
deleted file mode 100644
index 335e732366bd896a2e9ec5bd056b881a782beaaa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 600
zcmV-e0;m04o@fU{C;^+shfTmfzaKLY^0u@sVq%JC13iY+xSgwEh>wX?p|UPj)8C~C
zi4{+Qx$(w{$yhW*LjN2#5X#MakFyH^i-3!eOUSJ{<YjF1qF#gd0Hi!=$&*aJm4WA_
zBhzF*0vm%neCr8(?3J}%vi$D#sS*C?th{;bLJ;D-iKTI+r|J!Q?Zj<ujKI!no7hzw
zw&2G@d2<Ms@kC>9e;xHN@ZA6MTU|S6<SvK(aplwYNKispLhs>yxJIq(S-ahXE21Wu
z`pA1RvE#B&L7b!}byS1jZ}8PEF)OLsXX6qT@reA<n6TY=8Q<w+6K(=Vf63QNkzQ^K
zwvF^y6)JcYZh&%5kiFIB*ueOe8RZ>SSp7#B(v~#&ZyZ%^@UnpJMSettkPxEIrBD&A
z7T4Sz-y$odvZECI)`&xx;W>}7OtzjtMTwhPPi8VrEunVb7~A-abQBPC)dYb05Mynb
zSt;<@mb5f2Ly2WvNX_K<pYU(m`mYNV6VtJ|`;}lPz@$Htl>S=+;Z#Fw2&NM+&3r~m
z)g|E8%~TCIMvSa`N{;jUZNo&ZlWT2bRb>4^4s7v}>I4x)v;<nDttnsoR7CQ6GgthL
zRGJ9((oM!V!{=Dl)`3?Huh<F}DX)HqXV{yY@8opHSdP#>y0hGp#P+7%Jt#}}($U4b
zL-By|Itki37z&U|T#T+>Qxr6yvh1u|#VV0O(g)Bj=MCT?(})-*+MqevsTb29L-uFy
m0Q9kYz2#V23$M$go5O&EI<paR>aqYFB2on*J~z!Rp2x3O<TM2U

diff --git a/db/gpg-test/secring.gpg b/db/gpg-test/secring.gpg
deleted file mode 100644
index eaca4a8ebbba1484b8c953cc27864472537e71c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 736
zcmbQrsL0}DmLeg@#Bgrn5vCK{cU`dKVG7Q8e#k?*!{d04`0`r*$O(5U=k)e@maQns
zy35sjmF?lCu$Bqsomw%{+1uaeaOo`csESXGW>~P+v*|$FLYcm{9TR>=uKdk$tW)|n
z6T{X7MLm}9?4oiG4L2KGPYA6u&vUetlxkhnI>qOKU6{p1wdY0UpO4GrZa=-zaAIqX
z$6|R)`SSgR@fJaE&GvWyWc;Vex&0>}yZV&cjVWyxC3wWzd^XO>IQ&0;Q+3@NiJRs%
zz6Vd~r5%clVLAMI*}ezMY;~D#D48{=oT<HjcD-TVu@nE8nVH_tD|oV^LLnr9v*UBZ
zwHr6~y>$AZ9<+6Nf1knZh3j8Vd};V`#+uWS0Secb)ZgEgxy<{M>Y_U>`6YUX-)}KW
z%1=@#&dn^zP|(OIDJihh*Do(G*GsKP%q_@C)l1IL)z?(80V*<dNX*Xx@$EX2ScHLL
zs>I3!3SA~?Wj1b34t8cHHc<{HPA+a1F(zh4COJkX@dgGiPJxZjcSc+@H&nS=#xT#$
zRiyg2uFZ;v>s~%$x9u)mW*I5SFi$V7>F1x@wbQK*r5cGG(6%%#Jacyg69dDX^Wf+c
zU}E^=eezxV)y`DS1s@hKU+dv8E&a@cOgSNu->zJT9hX&TEmCyu$*(gJ>j>V`8GZ5g
z{@bOCZSLONBsHr!v`zZf=Vk_GR>prCpG<>}+vadvdP(XX?q9>`m@-lC=Bg(b88!wR
z%`n-VRuanGH`$oQbGlFb#^mKCN)^uvk{(2?2ov5QCzY{sX9`M4KVmOhYM+&HOpl{@
ztxwO}-<Ra?i_G5^#;Ka2blER6WCi=Ixz|Omuz3{eM49bmzWmR6#{y&d4o?<PV&sGc
z91n8%%#UN3r&RLa^vi}4X6dp|zCRYk&Qt$dsLn7yt>H$<o=X95md{{Qx$*15i87g_
IXQ1!_0JxJlPyhe`

diff --git a/db/gpg-test/trustdb.gpg b/db/gpg-test/trustdb.gpg
deleted file mode 100644
index 0afcfe94269aeb6bd8ac94b36ae1031a3f41b085..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1920
zcmZQfFGy!*W@Ke#U|{euOL+&RumMIcY@%4iMx;6|ECGQgM0U6+pcw?^;x$hRp$D%z
zgfa%Is#9S=m?wv12^J>UUNtNdXhKwVAJA;F%+o=06cU##^N{qTGwEiY9;(eK_G+NY
zA@fkwAxogKsjZHOp*}ZJ-p||YS<+6OxobRPb>ABKu7X-BkFcDVA$oF4-ul%HyDZ->
zOKr}&bE`!y94TMGRPr!{*zBwdR6Xu`K#^w~zr4lstl}dcP+3KoDh3AP%}aPO|6{<5
z3ky74u63s`XRE#U`noUF9A$FMtNq3KzImtJ^&2L_++Oj<YZcEnUV@sVN{)H$4U+?=
zD6UvFqqbWs;_d|Hl@qQng_@&Ij(LyQ|N1!B^~%dH6+s4zp7_focNHywnxjdMdG>Ew
zyuJ#RSDorma{X;A$bFq@=2NIS+T@tGcE*+ziGUrpO6Dt+8*23azkM0^4Qh@qvUzTL
z*Eyw+h&gAldr#bF_bBX$w9{dPJdDM|aQCs!<=L;o469}K<ZOJtGvb=Lp$Z#BS|6qg
hlwKyT{XN58>CU^a)kQ&NUzc$^=>N=vszWGa000lGyBz=k

diff --git a/lib/tasks/gpg.rake b/lib/tasks/gpg.rake
new file mode 100644
index 000000000..9d7e82223
--- /dev/null
+++ b/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
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index eac2acf4b..a414acb20 100644
--- a/spec/spec_helper.rb
+++ b/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)}