sup 0.22.1 → 0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 703c8b0175724e4a3a4965081e8a0b12fb01147a
-  data.tar.gz: 86557dfd9de2f477dbf4f8322cd732c221d51c9d
+SHA256:
+  metadata.gz: f073aae1fcb4d1c56fc300ed854e5edd398bddd078e073eeae2aede068122ae3
+  data.tar.gz: 8f5956c3305f5accb16de9ca57dd2ae370696c4e0f0cda18305af98a895338bf
 SHA512:
-  metadata.gz: ba46b62b4cd8059cd1835624270e715da259934f4f497f56471e81bd02876b83518c8b647ed4c1d0f43520f0a42fcdbec500b6a8b1abb4002bfdea7fe5e44ddd
-  data.tar.gz: 0e5f694ae6cd39770120ef26163a68bddb8179baa6cbcaec87acdbee17be1627cc9520c802427dd5f4958c7d367017034cf62360acddedef27f8a95d27b288cf
+  metadata.gz: 1cb9c3e0de8d3a17936a47f7ba925f380d3b84303d7d132b581b4fd9f6d71887e9d7fe137d2f18ec4fbb898e81f59fac38c2396d911df233e98f2fc401b949cc
+  data.tar.gz: f24c2c5f0f95dc042f330d5d949b740ec0c29363f480d8f8fdcefb972b53ab41eb3f2255848c5437c0e32bbc177ad2e7559c421d0c2fafd861e1a91c037f9603

data/.gitignore

@@ -17,6 +17,4 @@ Gemfile.lock
 test/gnupg_test_home/random_seed
 test/gnupg_test_home/trustdb.gpg
 test/gnupg_test_home/.gpg-v21-migrated
-test/gnupg_test_home/private-keys-v1.d
-
-
+test/gnupg_test_home/openpgp-revocs.d

data/.travis.yml

@@ -1,13 +1,18 @@
 language: ruby
 
+dist: focal
+
 rvm:
-  - 2.1.1
-  - 2.0.0
-  - 2.2.0
+  - 2.5
+  - 2.6
+  - 2.7
 
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq uuid-dev uuid libncursesw5-dev libncursesw5 gnupg2 pandoc
+  - sudo apt update -qq
+  - sudo apt install -qq uuid-dev uuid libncursesw5-dev libncursesw5 gnupg2 pandoc
   - git submodule update --init --recursive
 
-script: bundle exec rake travis
+script:
+  - bundle exec rake travis
+  - bundle exec gem install pkg/sup-*.gem
+

data/CONTRIBUTORS

@@ -8,14 +8,16 @@ Damien Leone
 Sascha Silbe <sascha-pgp at the silbe dot orgs>
 Eric Weikl <eric.weikl at the gmx dot nets>
 Paweł Wilk <siefca at the gnu dot orgs>
-Ismo Puustinen <ismo at the iki dot fis>
 Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
+Ismo Puustinen <ismo at the iki dot fis>
+Dan Callaghan <djc at the djc.id dot aus>
 Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
 Michael Stapelberg <michael at the stapelberg dot des>
 Eric Sherman <hyperbolist at the gmail dot coms>
 Tero Tilus <tero at the tilus dot nets>
 Ben Walton <bwalton at the artsci.utoronto dot cas>
 Scott Bonds <scott at the ggr dot coms>
+Iain Parris <ipv2.vcs at the parris dot orgs>
 Mike Stipicevic <stipim at the rpi dot edus>
 Martin Bähr <mbaehr at the societyserver dot orgs>
 Timon Vonk <timonv at the gmail dot coms>
@@ -23,12 +25,12 @@ Clint Byrum
 Wael M. Nasreddine <wael.nasreddine at the gmail dot coms>
 Marcus Williams <marcus-sup at the bar-coded dot nets>
 Lionel Ott <white.magic at the gmx dot des>
-Gaudenz Steinlin <gaudenz at the soziologie dot chs>
 Per Andersson <avtobiff at the gmail dot coms>
+Gaudenz Steinlin <gaudenz at the soziologie dot chs>
 Mark Alexander <marka at the pobox dot coms>
 Ingmar Vanhassel <ingmar at the exherbo dot orgs>
 Edward Z. Yang <ezyang at the mit dot edus>
-julien@macbook <julien.stechele at the gmail dot coms>
+julien at the macbook <julien.stechele at the gmail dot coms>
 Christopher Warrington <chrisw at the rice dot edus>
 W. Trevor King <wking at the drexel dot edus>
 Richard Brown <rbrown at the exherbo dot orgs>
@@ -61,16 +63,21 @@ Jeff Balogh
 Matías Aguirre <matiasaguirre at the gmail dot coms>
 PaulSmecker <paul.smecker at the gmail dot coms>
 Ruthard Baudach <rthrd at the web dot des>
+Vickenty Fesunov <kent at the setattr dot nets>
 Kornilios Kourtis <kkourt at the cslab.ece.ntua dot grs>
+Antoni Kaniowski <a at the generativestuff dot coms>
 Lars Fischer <fischer at the wiwi.uni-siegen dot des>
+Sharif Olorin <sio at the tesser dot orgs>
+Steven Lawrance <stl at the koffein dot nets>
 madhat2r <MaDhAt2r at the dukefoo dot coms>
 Kevin Riggle <kevinr at the free-dissociation dot coms>
 Giorgio Lando <patroclo7 at the gmail dot coms>
 Benoît PIERRE <benoit.pierre at the gmail dot coms>
-Steven Lawrance <stl at the koffein dot nets>
+Seva Zhidkov <zhidkovseva at the gmail dot coms>
 Alvaro Herrera <alvherre at the alvh.no-ip dot orgs>
 Jonah <Jonah at the GoodCoffee dot cas>
 ian <itaylor at the uark dot edus>
+Simon Tatham <anakin at the pobox dot coms>
 Elias Norberg <xyzzy at the kudzu dot ses>
 0xACE <0xACE at the users.noreply.github dot coms>
 MichaelRevell <mikearevell at the gmail dot coms>
@@ -78,9 +85,10 @@ Gregor Hoffleit
 Adam Lloyd <adam at the alloy-d dot nets>
 Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
 Johannes Larsen <mail at the johslarsen dot nets>
-Sharif Olorin <sio at the tesser dot orgs>
 Steven Schmeiser <steven at the schmeiser dot orgs>
 Steven Walter <swalter at the monarch.(none)>
+Michael Dwyer <mdwyer at the michaelmdwyer dot coms>
+Kyle Hunt <Kyle_Hunt at the ymail dot coms>
 William A. Kennington III <william at the wkennington dot coms>
 akojo <atte.kojo at the gmail dot coms>
 Horacio Sanson <horacio at the skillupjapan.co dot jps>

data/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org/'
 
 if !RbConfig::CONFIG['arch'].include?('openbsd')
-  gem 'xapian-ruby', '~> 1.2.15'
+  # update version in ext/mkrf_conf_xapian.rb as well.
+  gem 'xapian-ruby', '~> 1.2'
 end
 
 gemspec

data/History.txt

@@ -1,3 +1,54 @@
+== 0.23 / 2020-07-10
+
+* #505: Shell metacharacters in attachment filenames are no longer escaped when
+  saving the attachment to disk using 's'. Fixes attachments being saved with
+  unnecessary \ escapes in their filename. (Felix Van der Jeugt)
+* When saving attachments, Sup now creates all parent directories of the
+  destination path. (Matthieu Rakotojaona)
+* The '@' key now reloads all messages in thread view. (Seva Zhidkov)
+* #517: The 'g' key now correctly opens each selected URL if multiple URLs are
+  under the cursor, instead of opening the last URL multiple times.
+  (Matthieu Rakotojaona)
+* The 'g' key now works when the cursor is over a URL inside a signature block.
+  (Michael Dwyer)
+* The 'reply-to' hook is now passed a 'message' variable, the message being
+  replied to, so that the hook can choose the reply mode based on properties of
+  the message like the list address. (Simon Tatham)
+* The contacts list now shows also email addresses supplied by the
+  'extra-contract-addresses' hook. (Matthieu Rakotojaona)
+* #510: The micalg= parameter is now set correctly when sending
+  multipart/signed messages. Fixes issues with other mail clients which fail to
+  handle a missing micalg= parameter on signed messages. (Dan Callaghan)
+* Attachments with text/plain MIME type are now correctly decoded according to
+  their charset= parameter. (Dan Callaghan)
+* Strings returned by the 'mime-decode' hook are now kept in their original
+  encoding and displayed as is, instead of being wrongly transcoded.
+  (Dan Callaghan)
+* Rendering speed of thread list views is improved. (Vickenty Fesunov)
+* Fixed display width calculation for emoji. Previously, sender names and
+  thread subjects using emoji would be incorrectly truncated, if the terminal
+  emulator displays emoji as double-width. (Dan Callaghan)
+* List address is parsed from the non-standard Mailing-List header used by
+  Groups.io. (Dan Callaghan)
+* Fixed misinterpretation of quoted text where the quote uses both an
+  "---- Original Message ----" marker and > delimiters, for example from
+  Zimbra users. (Steven Lawrance)
+* Added a new option 'indent_spaces' in config.yaml, to control the number of
+  spaces for indenting each child message when displaying the thread view.
+  The default remains 2. (Antoni Kaniowski)
+* Attachment sizes are now displayed using standard unit abbreviations like
+  "MiB". (Sharif Olorin)
+* Sup now gives a hint if a search query results in an empty search after
+  tokenization (for example, if the user tries to search for only punctuation).
+  (Per Andersson)
+* The --list-hooks option now takes an additional option --hooks-matching, to
+  filter the listed hooks. (Matthieu Rakotojaona)
+* Fixed ArgumentError in logging methods on Ruby 2.7. (Dan Callaghan)
+* Fixed FrozenError in verified_ok? method on Ruby 2.7. (Iain Parris)
+* Fixed Fixnum deprecation warnings on Ruby 2.4+. (Dan Callaghan)
+* Several dependency version updates. The optimist gem replaces trollop. The
+  unicode-display_width gem is a new dependency.
+
 == 0.22.1 / 2015-06-18
 
 * Fix bug (#429)  in gem build / install.

data/README.md

@@ -1,7 +1,8 @@
 # Sup
 
-A console-based email client with the best features of GMail, mutt and
-Emacs.
+Sup is a console-based email client for people with a lot of email.
+
+<img src="https://sup-heliotrope.github.io/images/old_screenshot_1.png" />
 
 ## Installation
 
@@ -30,20 +31,40 @@ Current limitations:
 
 ## Problems
 
-Please report bugs to the [Github issue tracker](https://github.com/sup-heliotrope/sup/issues).
+Please report bugs to the [GitHub issue tracker](https://github.com/sup-heliotrope/sup/issues).
 
 ## Links
 
-* [Homepage](http://supmua.org/)
+* [Homepage](https://sup-heliotrope.github.io/)
 * [Code repository](https://github.com/sup-heliotrope/sup)
 * [Wiki](https://github.com/sup-heliotrope/sup/wiki)
 * IRC: [#sup @ freenode.net](http://webchat.freenode.net/?channels=#sup)
 * Mailing list: supmua@googlegroups.com (subscribe: supmua+subscribe@googlegroups.com, archive: https://groups.google.com/d/forum/supmua )
 
+## Maintenance status
+
+Sup is a mature, production-quality mail client. The maintainers are also
+long-term users, and mainly focus on preserving the current feature set. Pull
+requests are very welcome, especially to fix bugs or improve compatibility,
+however pull requests for major new features are unlikely to be merged.
+
+## Alternatives
+
+If Sup is missing a feature you are interested in, it might be possible to
+accomplish using Sup's [powerful hooks mechanism][hooks]. Otherwise, here are
+some alternatives to consider:
+
+* [Notmuch](https://notmuchmail.org/) was inspired by Sup. There are a wide
+  variety of [Notmuch clients](https://notmuchmail.org/frontends/) available.
+  The most similar to Sup's look-and-feel is
+  [Alot](https://github.com/pazz/alot) &mdash; also a curses-based frontend.
+  Alot even ships with a built-in
+  [Sup theme](https://github.com/pazz/alot/blob/master/extra/themes/sup)!
+
 ## License
 
 ```
-Copyright (c) 2013       Sup developers.
+Copyright (c) 2013--     Sup developers.
 Copyright (c) 2006--2009 William Morgan.
 
 This program is free software; you can redistribute it and/or

data/bin/sup

@@ -7,6 +7,7 @@ require 'ncursesw'
 
 require 'sup/util/ncurses'
 require 'sup/util/locale_fiddler'
+require 'sup/util/axe'
 
 no_gpgme = false
 begin
@@ -16,7 +17,7 @@ rescue LoadError
 end
 
 require 'fileutils'
-require 'trollop'
+require 'optimist'
 require "sup"
 
 if ENV['SUP_PROFILE']
@@ -28,7 +29,7 @@ if no_gpgme
   info "No 'gpgme' gem detected. Install it for email encryption, decryption and signatures."
 end
 
-$opts = Trollop::options do
+$opts = Optimist::options do
   version "sup v#{Redwood::VERSION}"
   banner <<EOS
 Sup is a curses-based email client.
@@ -38,7 +39,8 @@ Usage:
 
 Options are:
 EOS
-  opt :list_hooks, "List all hooks and descriptions, and quit."
+  opt :list_hooks, "List all hooks and descriptions, and quit. Use --hooks-matching to filter."
+  opt :hooks_matching, "If given, list all hooks and descriptions matching the given pattern. Needs the --list-hooks option", short: "m", default: ""
   opt :no_threads, "Turn off threading. Helps with debugging. (Necessarily disables background polling for new messages.)"
   opt :no_initial_poll, "Don't poll for new messages when starting."
   opt :search, "Search for this query upon startup", :type => String
@@ -46,7 +48,7 @@ EOS
   opt :subject, "When composing, use this subject", :type => String, :short => "j"
 end
 
-Trollop::die :subject, "requires --compose" if $opts[:subject] && !$opts[:compose]
+Optimist::die :subject, "requires --compose" if $opts[:subject] && !$opts[:compose]
 
 Redwood::HookManager.register "startup", <<EOS
 Executes at startup
@@ -64,7 +66,7 @@ EOS
 
 if $opts[:list_hooks]
   Redwood.start
-  Redwood::HookManager.print_hooks
+  Redwood::HookManager.print_hooks $opts[:hooks_matching]
   exit
 end
 

data/bin/sup-add

@@ -3,11 +3,11 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'highline/import'
-require 'trollop'
+require 'optimist'
 require "sup"
+require 'sup/util/axe'
 
-$opts = Trollop::options do
+$opts = Optimist::options do
   version "sup-add (sup #{Redwood::VERSION})"
   banner <<EOS
 Adds a source to the Sup source list.
@@ -35,7 +35,7 @@ EOS
   opt :force_account, "Reuse previously defined account user@hostname.", :type => String
 end
 
-Trollop::die "require one or more sources" if ARGV.empty?
+Optimist::die "require one or more sources" if ARGV.empty?
 
 ## for sources that require login information, prompt the user for
 ## that. also provide a list of previously-defined login info to
@@ -53,11 +53,11 @@ def get_login_info uri, sources
     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."
+        @cli.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|
+      @cli.say "Would you like to use the same account as for a previous source for #{uri}?"
+      @cli.choose do |menu|
         accounts.each do |host, olduser, oldpw|
           menu.choice("Use the account info for #{olduser}@#{host}") { username, password = olduser, oldpw }
         end
@@ -68,15 +68,15 @@ def get_login_info uri, sources
   end
 
   unless username && password
-    username = ask("Username for #{uri.host}: ");
-    password = ask("Password for #{uri.host}: ") { |q| q.echo = false }
+    username = @cli.ask("Username for #{uri.host}: ");
+    password = @cli.ask("Password for #{uri.host}: ") { |q| q.echo = false }
     puts # why?
   end
 
   [username, password]
 end
 
-$terminal.wrap_at = :auto
+@cli.wrap_at = :auto
 Redwood::start
 index = Redwood::Index.init
 index.load
@@ -90,7 +90,7 @@ begin
     labels = $opts[:labels] ? $opts[:labels].split(/\s*,\s*/).uniq : []
 
     if !$opts[:force_new] && Redwood::SourceManager.source_for(uri)
-      say "Already know about #{uri}; skipping."
+      @cli.say "Already know about #{uri}; skipping."
       next
     end
 
@@ -103,11 +103,11 @@ begin
       when "mbox"
         Redwood::MBox.new uri, !$opts[:unusual], $opts[:archive], nil, labels
       when nil
-        Trollop::die "Sources must be specified with an URI"
+        Optimist::die "Sources must be specified with an URI"
       else
-        Trollop::die "Unknown source type #{parsed_uri.scheme.inspect}"
+        Optimist::die "Unknown source type #{parsed_uri.scheme.inspect}"
       end
-    say "Adding #{source}..."
+    @cli.say "Adding #{source}..."
     Redwood::SourceManager.add_source source
   end
 ensure

data/bin/sup-config

@@ -2,11 +2,11 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'highline/import'
-require 'trollop'
+require 'optimist'
 require "sup"
+require 'sup/util/axe'
 
-$opts = Trollop::options do
+$opts = Optimist::options do
   version "sup-config (sup #{Redwood::VERSION})"
   banner <<EOS
 Interactive configuration tool for Sup. Won't destroy existing
@@ -19,20 +19,6 @@ No options.
 EOS
 end
 
-def axe q, default=nil
-  question = if default && !default.empty?
-               "#{q} (enter for \"#{default}\"): "
-             else
-               "#{q}: "
-             end
-  ans = ask question
-  ans.empty? ? default : ans.to_s
-end
-
-def axe_yes q, default="n"
-  axe(q, default) =~ /^y|yes$/i
-end
-
 def build_cmd cmd
   (ENV["RUBY_INVOCATION"] ? ENV["RUBY_INVOCATION"] + " " : "") + File.join(File.dirname($0), cmd)
 end
@@ -42,8 +28,8 @@ def add_source
 
   type = nil
 
-  say "Ok, adding a new source."
-  choose do |menu|
+  @cli.say "Ok, adding a new source."
+  @cli.choose do |menu|
     menu.prompt = "What type of mail source is it? "
     menu.choice("mbox file") { type = :mbox }
     menu.choice("maildir directory") { type = :maildir }
@@ -51,7 +37,7 @@ def add_source
   end
 
   while true do
-    say "Ok, now for the details."
+    @cli.say "Ok, now for the details."
 
     default_labels, components = case type
     when :mbox
@@ -75,11 +61,11 @@ def add_source
     uri = begin
       Redwood::Util::Uri.build components
     rescue URI::Error => e
-      say "Whoopsie! I couldn't build a URI from that: #{e.message}"
+      @cli.say "Whoopsie! I couldn't build a URI from that: #{e.message}"
       if axe_yes("Try again?") then next else return end
     end
 
-    say "I'm going to add this source: #{uri}"
+    @cli.say "I'm going to add this source: #{uri}"
     unless axe("Does that look right?", "y") =~ /^y|yes$/i
       if axe_yes("Try again?") then next else return end
     end
@@ -108,21 +94,21 @@ def add_source
 
     system cmd
     if $?.success?
-      say "Great! Added!"
+      @cli.say "Great! Added!"
       break
     else
-      say "Rats, that failed. You may have to do it manually."
+      @cli.say "Rats, that failed. You may have to do it manually."
       if axe_yes("Try again?") then next else return end
     end
   end
 end
 
-$terminal.wrap_at = :auto
+@cli.wrap_at = :auto
 Redwood::start
 index = Redwood::Index.init
 Redwood::SourceManager.load_sources
 
-say <<EOS
+@cli.say <<EOS
 Howdy neighbor! This here's sup-config, ready to help you jack in to
 the next generation of digital cyberspace: the text-based email
 program. Get ready to be the envy of everyone in your internets
@@ -138,11 +124,11 @@ account = $config[:accounts][:default]
 name = axe "What's your name?", account[:name]
 email = axe "What's your (primary) email address?", account[:email]
 
-say "Ok, your from header will look like this:"
-say "  From: #{name} <#{email}>"
+@cli.say "Ok, your from header will look like this:"
+@cli.say "  From: #{name} <#{email}>"
 
-say "\nDo you have any alternate email addresses that also receive email?"
-say "If so, enter them now, separated by spaces."
+@cli.say "\nDo you have any alternate email addresses that also receive email?"
+@cli.say "If so, enter them now, separated by spaces."
 alts = axe("Alternate email addresses", account[:alternates].join(" ")).split(/\s+/)
 
 sigfn = axe "What file contains your signature?", account[:signature]
@@ -159,36 +145,36 @@ $config[:time_mode] = time_mode
 
 done = false
 until done
-  say "\nNow, we'll tell Sup where to find all your email."
+  @cli.say "\nNow, we'll tell Sup where to find all your email."
   Redwood::SourceManager.load_sources
-  say "Current sources:"
+  @cli.say "Current sources:"
   if Redwood::SourceManager.sources.empty?
-    say "  No sources!"
+    @cli.say "  No sources!"
   else
     Redwood::SourceManager.sources.each { |s| puts "* #{s}" }
   end
 
-  say "\n"
-  choose do |menu|
+  @cli.say "\n"
+  @cli.choose do |menu|
     menu.prompt = "Your wish? "
     menu.choice("Add a new source.") { add_source }
     menu.choice("Done adding sources!") { done = true }
   end
 end
 
-say "\nSup needs to know where to store your sent messages."
-say "Only sources capable of storing mail will be listed.\n\n"
+@cli.say "\nSup needs to know where to store your sent messages."
+@cli.say "Only sources capable of storing mail will be listed.\n\n"
 
 Redwood::SourceManager.load_sources
 if Redwood::SourceManager.sources.empty?
-  say "\nUsing the default sup://sent, since you haven't configured other sources yet."
+  @cli.say "\nUsing the default sup://sent, since you haven't configured other sources yet."
   $config[:sent_source] = 'sup://sent'
 else
   # this handles the event that source.yaml already contains the SentLoader
   # source.
   have_sup_sent = false
 
-  choose do |menu|
+  @cli.choose do |menu|
     menu.prompt = "Store my sent mail in? "
 
     menu.choice('Default (an mbox in ~/.sup, aka sup://sent)') { $config[:sent_source] = 'sup://sent'} unless have_sup_sent
@@ -202,9 +188,9 @@ end
 
 Redwood::save_yaml_obj $config, Redwood::CONFIG_FN, false, true
 
-say "Ok, I've saved you up a nice lil' #{Redwood::CONFIG_FN}."
+@cli.say "Ok, I've saved you up a nice lil' #{Redwood::CONFIG_FN}."
 
-say <<EOS
+@cli.say <<EOS
 
 The final step is to import all your messages into the Sup index.
 Depending on how many messages are in the sources, this could take
@@ -218,10 +204,10 @@ if axe_yes "Run sup-sync to import all messages now?"
     puts "Ok, trying to run \"#{cmd}\"..."
     system cmd
     if $?.success?
-      say "Great! It worked!"
+      @cli.say "Great! It worked!"
       break
     else
-      say "Rats, that failed. You may have to do it manually."
+      @cli.say "Rats, that failed. You may have to do it manually."
       if axe_yes("Try again?") then next else break end
     end
   end
@@ -229,7 +215,7 @@ end
 
 index.load
 
-say <<EOS
+@cli.say <<EOS
 
 Okee doke, you've got yourself an index of #{index.size} messages. Looks
 like you're ready to jack in to cyberspace there, cowboy.