From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.204.20.129 with SMTP id f1cs50491bkb; Sun, 10 Oct 2010 09:29:25 -0700 (PDT) Received: by 10.42.130.67 with SMTP id u3mr1199406ics.238.1286728164169; Sun, 10 Oct 2010 09:29:24 -0700 (PDT) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 35si15224195ibi.69.2010.10.10.09.29.23; Sun, 10 Oct 2010 09:29:24 -0700 (PDT) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org; dkim=neutral (body hash did not verify) header.i=@gmail.com Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 42DE019783C0; Sun, 10 Oct 2010 12:29:23 -0400 (EDT) Received: from mail-qy0-f178.google.com (mail-qy0-f178.google.com [209.85.216.178]) by rubyforge.org (Postfix) with ESMTP id F01CD185838D for ; Sun, 10 Oct 2010 12:25:19 -0400 (EDT) Received: by qyk4 with SMTP id 4so94892qyk.2 for ; Sun, 10 Oct 2010 09:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:cc:content-type; bh=kT7X7YCCL9UWe5jFo/XkHwOe8LaG1Yxu3jHaaCJbQMU=; b=wp/v0JKosHxrLdDIYi1gi9qmVMvDEGl+zBNIpScJi8Q3EvGMPxi44moxFV12AcEjOj D/+NyEOP2siNz5ylpS4Sg5FrijVXew7ccmqAYo65090CdNFC0C7WbwQIK+HQyYE/T70P Q078J9PHDEvpJ5pY7hYZQMOYaiBkCqwXCBWdk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=tvGB2rfYMKVKw5sWkjKHoLfH+t319ovXTXvAZJkKO0r4QCC7oPBa9fG+JKXfsh1VQb 1XHbiiN3WwwllVSZX5aolcGo/I45o9hsmf/r+NiqE/k1fqXJRsI9IL0kIDt/oohxydGR HP8nYfgvlPqHYaUVEzbvauOmvAHAOtYuz8apc= MIME-Version: 1.0 Received: by 10.224.185.65 with SMTP id cn1mr3686737qab.125.1286727918831; Sun, 10 Oct 2010 09:25:18 -0700 (PDT) Received: by 10.229.231.141 with HTTP; Sun, 10 Oct 2010 09:25:18 -0700 (PDT) Date: Sun, 10 Oct 2010 17:25:18 +0100 Message-ID: From: Hamish D To: sup-devel@rubyforge.org Content-Type: multipart/mixed; boundary=20cf302acff686498c049245b024 Cc: micah@riseup.net Subject: [sup-devel] [PATCH] Adding a gpgkey option X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --20cf302acff686498c049245b024 Content-Type: text/plain; charset=UTF-8 >From the commit message: Added a gpgkey option to the account settings This allows the user to specify the gpg key used. In addition, if gpgkey is not set, and there is only one email address defined, then sup will not pass any id to gpg, so gpg will use its default key. Only if gpgkey is not set and there are multiple email addresses will sup use the old behaviour of defining the key to use by passing gpg the from email address. This has been requested before: http://rubyforge.org/pipermail/sup-devel/2009-November/000029.html I've given it some basic testing (using the gpg-args hook to view the arguments) and it appears to work as I intend it to in all 3 cases I mention in the comment. I'm not a massively experienced ruby hacker, so any feedback or improvements appreciated. Hamish --20cf302acff686498c049245b024 Content-Type: text/x-patch; charset=US-ASCII; name="0001-Added-a-gpgkey-option-to-the-account-settings.patch" Content-Disposition: attachment; filename="0001-Added-a-gpgkey-option-to-the-account-settings.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gf44k76f0 RnJvbSA2YjNkNzEwMTc1NmU3MDNhNTJlYzdlMmE4NjA2YjZlZTU4Mzg5NWM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIYW1pc2ggRG93bmVyIDxkbWlzaGRAZ21haWwuY29tPgpEYXRl OiBTdW4sIDEwIE9jdCAyMDEwIDE3OjE4OjQxICswMTAwClN1YmplY3Q6IFtQQVRDSF0gQWRkZWQg YSBncGdrZXkgb3B0aW9uIHRvIHRoZSBhY2NvdW50IHNldHRpbmdzCgpUaGlzIGFsbG93cyB0aGUg dXNlciB0byBzcGVjaWZ5IHRoZSBncGcga2V5IHVzZWQuIEluIGFkZGl0aW9uLCBpZgpncGdrZXkg aXMgbm90IHNldCwgYW5kIHRoZXJlIGlzIG9ubHkgb25lIGVtYWlsIGFkZHJlc3MgZGVmaW5lZCwg dGhlbgpzdXAgd2lsbCBub3QgcGFzcyBhbnkgaWQgdG8gZ3BnLCBzbyBncGcgd2lsbCB1c2UgaXRz IGRlZmF1bHQga2V5LgpPbmx5IGlmIGdwZ2tleSBpcyBub3Qgc2V0IGFuZCB0aGVyZSBhcmUgbXVs dGlwbGUgZW1haWwgYWRkcmVzc2VzCndpbGwgc3VwIHVzZSB0aGUgb2xkIGJlaGF2aW91ciBvZiBk ZWZpbmluZyB0aGUga2V5IHRvIHVzZSBieQpwYXNzaW5nIGdwZyB0aGUgZnJvbSBlbWFpbCBhZGRy ZXNzLgotLS0KIGxpYi9zdXAucmIgICAgICAgICB8ICAgIDMgKystCiBsaWIvc3VwL2FjY291bnQu cmIgfCAgICA1ICsrKy0tCiBsaWIvc3VwL2NyeXB0by5yYiAgfCAgIDIzICsrKysrKysrKysrKysr KysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvbGliL3N1cC5yYiBiL2xpYi9zdXAucmIKaW5kZXggYWJkM2JjZS4u MGUwNTFiZSAxMDA2NDQKLS0tIGEvbGliL3N1cC5yYgorKysgYi9saWIvc3VwLnJiCkBAIC0yNjEs NyArMjYxLDggQEAgRU9TCiAgICAgICAgICAgICA6ZW1haWwgPT4gZW1haWwsCiAgICAgICAgICAg ICA6YWx0ZXJuYXRlcyA9PiBbXSwKICAgICAgICAgICAgIDpzZW5kbWFpbCA9PiAiL3Vzci9zYmlu L3NlbmRtYWlsIC1vZW0gLXRpIiwKLSAgICAgICAgICAgIDpzaWduYXR1cmUgPT4gRmlsZS5qb2lu KEVOVlsiSE9NRSJdLCAiLnNpZ25hdHVyZSIpCisgICAgICAgICAgICA6c2lnbmF0dXJlID0+IEZp bGUuam9pbihFTlZbIkhPTUUiXSwgIi5zaWduYXR1cmUiKSwKKyAgICAgICAgICAgIDpncGdrZXkg PT4gIiIKICAgICAgICAgICB9CiAgICAgICAgIH0sCiAgICAgICAgIDplZGl0b3IgPT4gRU5WWyJF RElUT1IiXSB8fCAiL3Vzci9iaW4vdmltIC1mIC1jICdzZXRsb2NhbCBzcGVsbCBzcGVsbGxhbmc9 ZW5fdXMnIC1jICdzZXQgZmlsZXR5cGU9bWFpbCciLApkaWZmIC0tZ2l0IGEvbGliL3N1cC9hY2Nv dW50LnJiIGIvbGliL3N1cC9hY2NvdW50LnJiCmluZGV4IGY5MzJmNGMuLjE3MThkOTQgMTAwNjQ0 Ci0tLSBhL2xpYi9zdXAvYWNjb3VudC5yYgorKysgYi9saWIvc3VwL2FjY291bnQucmIKQEAgLTEs NyArMSw3IEBACiBtb2R1bGUgUmVkd29vZAogCiBjbGFzcyBBY2NvdW50IDwgUGVyc29uCi0gIGF0 dHJfYWNjZXNzb3IgOnNlbmRtYWlsLCA6c2lnbmF0dXJlCisgIGF0dHJfYWNjZXNzb3IgOnNlbmRt YWlsLCA6c2lnbmF0dXJlLCA6Z3Bna2V5CiAKICAgZGVmIGluaXRpYWxpemUgaAogICAgIHJhaXNl IEFyZ3VtZW50RXJyb3IsICJubyBuYW1lIGZvciBhY2NvdW50IiB1bmxlc3MgaFs6bmFtZV0KQEAg LTksNiArOSw3IEBAIGNsYXNzIEFjY291bnQgPCBQZXJzb24KICAgICBzdXBlciBoWzpuYW1lXSwg aFs6ZW1haWxdCiAgICAgQHNlbmRtYWlsID0gaFs6c2VuZG1haWxdCiAgICAgQHNpZ25hdHVyZSA9 IGhbOnNpZ25hdHVyZV0KKyAgICBAZ3Bna2V5ID0gaFs6Z3Bna2V5XQogICBlbmQKIAogICAjIERl ZmF1bHQgc2VuZG1haWwgY29tbWFuZCBmb3IgYm91bmNpbmcgbWFpbCwKQEAgLTQ2LDcgKzQ3LDcg QEAgY2xhc3MgQWNjb3VudE1hbmFnZXIKICAgZGVmIGFkZF9hY2NvdW50IGhhc2gsIGRlZmF1bHQ9 ZmFsc2UKICAgICByYWlzZSBBcmd1bWVudEVycm9yLCAibm8gZW1haWwgc3BlY2lmaWVkIGZvciBh Y2NvdW50IiB1bmxlc3MgaGFzaFs6ZW1haWxdCiAgICAgdW5sZXNzIGRlZmF1bHQKLSAgICAgIFs6 bmFtZSwgOnNlbmRtYWlsLCA6c2lnbmF0dXJlXS5lYWNoIHsgfGt8IGhhc2hba10gfHw9IEBkZWZh dWx0X2FjY291bnQuc2VuZChrKSB9CisgICAgICBbOm5hbWUsIDpzZW5kbWFpbCwgOnNpZ25hdHVy ZSwgOmdwZ2tleV0uZWFjaCB7IHxrfCBoYXNoW2tdIHx8PSBAZGVmYXVsdF9hY2NvdW50LnNlbmQo aykgfQogICAgIGVuZAogICAgIGhhc2hbOmFsdGVybmF0ZXNdIHx8PSBbXQogCmRpZmYgLS1naXQg YS9saWIvc3VwL2NyeXB0by5yYiBiL2xpYi9zdXAvY3J5cHRvLnJiCmluZGV4IDJiZDUzNTAuLjE5 OTgzZDIgMTAwNjQ0Ci0tLSBhL2xpYi9zdXAvY3J5cHRvLnJiCisrKyBiL2xpYi9zdXAvY3J5cHRv LnJiCkBAIC00NSw3ICs0NSw4IEBAIEVPUwogCiAgICAgc2lnX2ZuID0gVGVtcGZpbGUubmV3ICJy ZWR3b29kLnNpZ25hdHVyZSI7IHNpZ19mbi5jbG9zZQogCi0gICAgbWVzc2FnZSA9IHJ1bl9ncGcg Ii0tb3V0cHV0ICN7c2lnX2ZuLnBhdGh9IC0teWVzIC0tYXJtb3IgLS1kZXRhY2gtc2lnbiAtLXRl eHRtb2RlIC0tZGlnZXN0LWFsZ28gc2hhMjU2IC0tbG9jYWwtdXNlciAnI3tmcm9tfScgI3twYXls b2FkX2ZuLnBhdGh9IiwgOmludGVyYWN0aXZlID0+IHRydWUKKyAgICBzaWduX3VzZXJfb3B0cyA9 IGdlbl9zaWduX3VzZXJfb3B0cyBmcm9tCisgICAgbWVzc2FnZSA9IHJ1bl9ncGcgIi0tb3V0cHV0 ICN7c2lnX2ZuLnBhdGh9IC0teWVzIC0tYXJtb3IgLS1kZXRhY2gtc2lnbiAtLXRleHRtb2RlIC0t ZGlnZXN0LWFsZ28gc2hhMjU2ICN7c2lnbl91c2VyX29wdHN9ICN7cGF5bG9hZF9mbi5wYXRofSIs IDppbnRlcmFjdGl2ZSA9PiB0cnVlCiAgICAgdW5sZXNzICQ/LnN1Y2Nlc3M/CiAgICAgICBpbmZv ICJFcnJvciB3aGlsZSBydW5uaW5nIGdwZzogI3ttZXNzYWdlfSIKICAgICAgIHJhaXNlIEVycm9y LCAiR1BHIGNvbW1hbmQgZmFpbGVkLiBTZWUgbG9nIGZvciBkZXRhaWxzLiIKQEAgLTY4LDcgKzY5 LDggQEAgRU9TCiAgICAgZW5jcnlwdGVkX2ZuID0gVGVtcGZpbGUubmV3ICJyZWR3b29kLmVuY3J5 cHRlZCI7IGVuY3J5cHRlZF9mbi5jbG9zZQogCiAgICAgcmVjaXBpZW50X29wdHMgPSAodG8gKyBb IGZyb20gXSApLm1hcCB7IHxyfCAiLS1yZWNpcGllbnQgJzwje3J9PiciIH0uam9pbigiICIpCi0g ICAgc2lnbl9vcHRzID0gc2lnbiA/ICItLXNpZ24gLS1sb2NhbC11c2VyICcje2Zyb219JyIgOiAi IgorICAgIHNpZ25fb3B0cyA9ICIiCisgICAgc2lnbl9vcHRzID0gIi0tc2lnbiAtLWRpZ2VzdC1h bGdvIHNoYTI1NiAiICsgZ2VuX3NpZ25fdXNlcl9vcHRzKGZyb20pIGlmIHNpZ24KICAgICBtZXNz YWdlID0gcnVuX2dwZyAiLS1vdXRwdXQgI3tlbmNyeXB0ZWRfZm4ucGF0aH0gLS15ZXMgLS1hcm1v ciAtLWVuY3J5cHQgLS10ZXh0bW9kZSAje3NpZ25fb3B0c30gI3tyZWNpcGllbnRfb3B0c30gI3tw YXlsb2FkX2ZuLnBhdGh9IiwgOmludGVyYWN0aXZlID0+IHRydWUKICAgICB1bmxlc3MgJD8uc3Vj Y2Vzcz8KICAgICAgIGluZm8gIkVycm9yIHdoaWxlIHJ1bm5pbmcgZ3BnOiAje21lc3NhZ2V9IgpA QCAtMjA4LDYgKzIxMCwyMyBAQCBwcml2YXRlCiAgICAgcGF5bG9hZC50b19zLmdzdWIoLyhefFte XHJdKVxuLywgIlxcMVxyXG4iKS5nc3ViKC9eTUlNRS1WZXJzaW9uOiAuKlxyXG4vLCAiIikKICAg ZW5kCiAKKyAgIyBsb2dpYyBpczoKKyAgIyBpZiAgICBncGdrZXkgc2V0IGZvciB0aGlzIGFjY291 bnQsIHRoZW4gdXNlIHRoYXQKKyAgIyBlbHNpZiBvbmx5IG9uZSBhY2NvdW50LCAgICAgICAgICAg IHRoZW4gbGVhdmUgYmxhbmsgc28gZ3BnIGRlZmF1bHQgd2lsbCBiZSB1c2VyCisgICMgZWxzZSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNldCAtLWxvY2FsLXVzZXIgZnJvbV9l bWFpbF9hZGRyZXNzCisgIGRlZiBnZW5fc2lnbl91c2VyX29wdHMgZnJvbQorICAgIGFjY291bnQg PSBBY2NvdW50TWFuYWdlci5hY2NvdW50X2ZvciBmcm9tCisgICAgaWYgIWFjY291bnQuZ3Bna2V5 Lm5pbD8KKyAgICAgIG9wdHMgPSAiLS1sb2NhbC11c2VyICcje2FjY291bnQuZ3Bna2V5fSciCisg ICAgZWxzaWYgQWNjb3VudE1hbmFnZXIudXNlcl9lbWFpbHMubGVuZ3RoID09IDEKKyAgICAgICMg b25seSBvbmUgYWNjb3VudAorICAgICAgb3B0cyA9ICIiCisgICAgZWxzZQorICAgICAgb3B0cyA9 ICItLWxvY2FsLXVzZXIgJyN7ZnJvbX0nIiAKKyAgICBlbmQKKyAgICBvcHRzCisgIGVuZAorCiAg IGRlZiBydW5fZ3BnIGFyZ3MsIG9wdHM9e30KICAgICBhcmdzID0gSG9va01hbmFnZXIucnVuKCJn cGctYXJncyIsIHsgOmFyZ3MgPT4gYXJncyB9KSB8fCBhcmdzCiAgICAgY21kID0gIkxDX01FU1NB R0VTPUMgI3tAY21kfSAje2FyZ3N9IgotLSAKMS43LjEKCg== --20cf302acff686498c049245b024 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel --20cf302acff686498c049245b024--