commit cde2da2ef0fb8d96ea0110d271fd548c3e83c859
parent 084119859df7099c42bb4ff1fbdd9968bc4015da
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Thu, 31 Dec 2009 14:45:57 -0500
Merge branch 'master' into next
Diffstat:
5 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -1,8 +1,15 @@
#!/usr/bin/env ruby
require 'rubygems'
-require 'ncurses'
-require 'curses'
+
+no_ncursesw = false
+begin
+ require 'ncursesw'
+rescue LoadError
+ require 'ncurses'
+ no_ncursesw = true
+end
+
require 'fileutils'
require 'trollop'
require "sup"
@@ -21,6 +28,10 @@ EOS
exit(-1)
end
+if no_ncursesw
+ debug "No 'ncursesw' gem detected. Install it for wide character support."
+end
+
$opts = Trollop::options do
version "sup v#{Redwood::VERSION}"
banner <<EOS
diff --git 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
diff --git a/bin/sup-tweak-labels b/bin/sup-tweak-labels
@@ -58,7 +58,6 @@ add_labels = opts[:add].to_set_of_symbols ","
remove_labels = opts[:remove].to_set_of_symbols ","
Trollop::die "nothing to do: no labels to add or remove" if add_labels.empty? && remove_labels.empty?
-Trollop::die "no sources specified" if ARGV.empty?
Redwood::start
index = Redwood::Index.init
diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
@@ -1,6 +1,11 @@
require 'etc'
require 'thread'
-require 'ncurses'
+
+begin
+ require 'ncursesw'
+rescue LoadError
+ require 'ncurses'
+end
if defined? Ncurses
module Ncurses
diff --git a/lib/sup/index.rb b/lib/sup/index.rb
@@ -6,7 +6,7 @@ begin
require 'chronic'
$have_chronic = true
rescue LoadError => e
- debug "optional 'chronic' library not found; date-time query restrictions disabled"
+ debug "No 'chronic' gem detected. Install it for date/time query restrictions."
$have_chronic = false
end