Merge branch 'master' of git://github.com/klacointe/openpgp.git

lib/openpgp/engine/gnupg.rb

@@ -75,6 +75,19 @@ def import()
       # TODO
     end
 
+    def delete_secret_and_public_key(key_id)
+      opts = {:batch => true}
+      OpenPGP::Message.parse(exec([:delete_secret_and_public_key, key_fingerprint(key_id)], opts ).read)
+    end
+
+    def key_fingerprint(key_id, opts = {})
+      message = exec([:fingerprint, *[key_id].flatten], opts ).read
+      if message =~ /Key fingerprint = (.*)\n/
+        return $1.delete(" ")
+      end
+      nil
+    end
+
     ##
     # Returns an array of key IDs/titles of the keys in the public keyring.
     def list_keys()