From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1210228agb; Tue, 29 Dec 2009 20:06:23 -0800 (PST) Received: by 10.224.72.4 with SMTP id k4mr8472340qaj.92.1262145982599; Tue, 29 Dec 2009 20:06:22 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 13si19819761qyk.29.2009.12.29.20.06.22; Tue, 29 Dec 2009 20:06:22 -0800 (PST) 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 Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 0534019782F8; Tue, 29 Dec 2009 23:06:16 -0500 (EST) Received: from kuovi.tilus.net (kuovi.tilus.net [80.68.89.168]) by rubyforge.org (Postfix) with ESMTP id 8382418582C7 for ; Tue, 29 Dec 2009 23:06:08 -0500 (EST) Received: by kuovi.tilus.net (Postfix, from userid 1000) id E8C4E6011; Wed, 30 Dec 2009 06:06:07 +0200 (EET) From: Tero Tilus To: Sup developers Date: Wed, 30 Dec 2009 06:06:07 +0200 Message-Id: <1262145664-sup-4855@tilus.net> User-Agent: Sup/git Subject: [sup-devel] [PATCH] reuse old account info with --foce-account user@hostname 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: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org Signed-off-by: Tero Tilus --- bin/sup-add | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bin/sup-add b/bin/sup-add index e27a0eb..c53378d 100755 --- a/bin/sup-add +++ b/bin/sup-add @@ -39,6 +39,7 @@ EOS opt :unusual, "Do not automatically poll these sources for new messages." opt :labels, "A comma-separated set of labels to apply to all messages from this source", :type => String opt :force_new, "Create a new account for this source, even if one already exists." + opt :force_account, "Reuse previously defined account user@hostname.", :type => String end Trollop::die "require one or more sources" if ARGV.empty? @@ -56,13 +57,20 @@ def get_login_info uri, sources username, password = nil, nil unless accounts.empty? || $opts[:force_new] - say "Would you like to use the same account as for a previous source for #{uri}?" - choose do |menu| - accounts.each do |host, olduser, oldpw| - menu.choice("Use the account info for #{olduser}@#{host}") { username, password = olduser, oldpw } + if $opts[:force_account] + host, username, password = accounts.find { |h, u, p| $opts[:force_account] == "#{u}@#{h}" } + unless username && password + say "No previous account #{$opts[:force_account].inspect} found." + end + else + say "Would you like to use the same account as for a previous source for #{uri}?" + choose do |menu| + accounts.each do |host, olduser, oldpw| + menu.choice("Use the account info for #{olduser}@#{host}") { username, password = olduser, oldpw } + end + menu.choice("Use a new account") { } + menu.prompt = "Account selection? " end - menu.choice("Use a new account") { } - menu.prompt = "Account selection? " end end -- Tero Tilus ## 050 3635 235 ## http://tero.tilus.net/ _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel