sup 0.19.0 → 0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d330a3455ed22952d8c45fce0f6a0d69346c40f2
-  data.tar.gz: 337b95be43bc301f6180b542b2395df025f4f1db
+SHA256:
+  metadata.gz: f073aae1fcb4d1c56fc300ed854e5edd398bddd078e073eeae2aede068122ae3
+  data.tar.gz: 8f5956c3305f5accb16de9ca57dd2ae370696c4e0f0cda18305af98a895338bf
 SHA512:
-  metadata.gz: f538e3054ba742a5fadd296bcb6d29b0295e3ca807a0dfe600d908b3cfa9602697bd4e422ac5bde8facb603fe12784add4709ccc4f5ca9b7b76bf348cec3a6f3
-  data.tar.gz: 1923d32e3cfc13998e52bc7c53b19482f6a4ed9b13d4e79880a1a6a16d926b26af2e6aaa73d1ea6556a6d2cdaf51aae1979afc51eff01697df9801dd787a45a3
+  metadata.gz: 1cb9c3e0de8d3a17936a47f7ba925f380d3b84303d7d132b581b4fd9f6d71887e9d7fe137d2f18ec4fbb898e81f59fac38c2396d911df233e98f2fc401b949cc
+  data.tar.gz: f24c2c5f0f95dc042f330d5d949b740ec0c29363f480d8f8fdcefb972b53ab41eb3f2255848c5437c0e32bbc177ad2e7559c421d0c2fafd861e1a91c037f9603

data/.gitignore

@@ -4,6 +4,7 @@
 *~
 # artifact
 pkg/
+man/
 *.gem
 # i have accidently added this one one too many times
 sup-exception-log.txt
@@ -14,4 +15,6 @@ Gemfile.lock
 
 # generated file for gnupg test
 test/gnupg_test_home/random_seed
-
+test/gnupg_test_home/trustdb.gpg
+test/gnupg_test_home/.gpg-v21-migrated
+test/gnupg_test_home/openpgp-revocs.d

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "doc/wiki"]
+	path = doc/wiki
+	url = https://github.com/sup-heliotrope/sup.wiki.git

data/.travis.yml

@@ -1,12 +1,18 @@
 language: ruby
 
+dist: focal
+
 rvm:
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
+  - 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
+  - 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
+  - bundle exec gem install pkg/sup-*.gem
 
-script: bundle exec rake travis

data/CONTRIBUTORS

@@ -3,29 +3,34 @@ Rich Lane
 Gaute Hope <eg at the gaute.vetsj dot coms>
 Whyme Lyu <callme5long at the gmail dot coms>
 Hamish Downer <dmishd at the gmail dot coms>
+Zeger-Jan van de Weg <mail at the zjvandeweg dot nls>
 Damien Leone <damien.leone at the fensalir dot frs>
 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>
+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>
 Clint Byrum <clint at the ubuntu dot coms>
 Wael M. Nasreddine <wael.nasreddine at the gmail dot coms>
 Marcus Williams <marcus-sup at the bar-coded dot nets>
-Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
 Lionel Ott <white.magic at the gmx dot des>
+Per Andersson <avtobiff at the gmail dot coms>
 Gaudenz Steinlin <gaudenz at the soziologie dot chs>
-Ingmar Vanhassel <ingmar at the exherbo dot orgs>
 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>
-Timon Vonk <timonv at the gmail dot coms>
-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>
@@ -37,8 +42,8 @@ Markus Klinik
 Bo Borgerson <gigabo at the gmail dot coms>
 Atte Kojo <atte.kojo at the reaktor dot fis>
 Michael Hamann <michael at the content-space dot des>
-William Erik Baxter <web at the superscript dot coms>
 Jonathan Lassoff <jof at the thejof dot coms>
+William Erik Baxter <web at the superscript dot coms>
 Grant Hollingworth <grant at the antiflux dot orgs>
 Ico Doornekamp <ico at the pruts dot nls>
 Adeodato Simó <dato at the net.com.org dot ess>
@@ -48,6 +53,7 @@ Jason Petsod
 Robin Burchell <viroteck at the viroteck dot nets>
 Steve Goldman <sgoldman at the tower-research dot coms>
 Peter Harkins <ph at the malaprop dot orgs>
+rjg-vB <rthrd at the web dot des>
 Decklin Foster <decklin at the red-bean dot coms>
 Cameron Matheson <cam+sup at the cammunism dot orgs>
 Carl Worth <cworth at the cworth dot orgs>
@@ -56,29 +62,37 @@ Andrew Pimlott
 Jeff Balogh <its.jeff.balogh at the gmail dot coms>
 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>
-Giorgio Lando <patroclo7 at the gmail 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>
+Seva Zhidkov <zhidkovseva at the gmail dot coms>
 Alvaro Herrera <alvherre at the alvh.no-ip dot orgs>
-Steven Lawrance <stl at the koffein dot nets>
 Jonah <Jonah at the GoodCoffee dot cas>
 ian <itaylor at the uark dot edus>
-Adam Lloyd <adam at the alloy-d dot nets>
+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>
 Gregor Hoffleit <gregor at the sam.mediasupervision dot des>
+Adam Lloyd <adam at the alloy-d dot nets>
 Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
-Per Andersson <avtobiff at the gmail dot coms>
-0xACE <0xACE at the users.noreply.github dot coms>
+Johannes Larsen <mail at the johslarsen dot nets>
 Steven Schmeiser <steven at the schmeiser dot orgs>
 Steven Walter <swalter at the monarch.(none)>
-Jon M. Dugan <jdugan at the es dot nets>
-akojo <atte.kojo at the gmail dot coms>
-Matthias Vallentin <vallentin at the icir dot orgs>
+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>
+Matthias Vallentin <vallentin at the icir dot orgs>
+Jon M. Dugan <jdugan at the es dot nets>
 Stefan Lundström <lundst at the snabb.(none)>
-Johannes Larsen <johs.a.larsen at the gmail dot coms>
 Kirill Smelkov <kirr at the landau.phys.spbu dot rus>

data/Gemfile

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

data/History.txt

@@ -1,3 +1,95 @@
+== 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.
+
+== 0.22.0 / 2015-06-16
+
+* Use mime-types 2
+* Fix ruby style (Zeger-Jan van de Weg)
+* Johannes Larsen: fix long-standing bug with draft-id mixups causing
+  drafts to disappear.
+* Various bugs and minor improvements.
+
+== 0.21.0 / 2015-02-12
+
+* Key binding to fetch GPG key from keyserver (Matthieu Rakotojaona)
+* Replace occurences of File.exists? with File.exist? (Zeger-Jan van de
+  Weg)
+* You can now unsubscribe from mailinglists using an url, if you have a
+  goto-hook setup (Timon Vonk).
+* Forward attribution can be customized using the forward-attribution
+  hook (Ruthard Baudach)
+* Do a few more checks for buffer not nil in the hope to fix a few
+  random crashes
+* Add bash completion (Per Andersson)
+* Replace dl/import with Fiddle (Timon Vonk)
+* Drop support for ruby 1.9.3
+* Add tests for contact manager and persons (Zeger-Jan van de Weg)
+
+== 0.20.0 / 2014-10-06
+
+* add man-pages (generated from wiki) (Per Andersson)!
+* HTML messages or messages that are decoded with the mime-decode hook
+  are now indexed if the mime-decode hook is set up (Scott Bonds).
+* OpenBSD support (Scott Bonds)!
+* goto-hook for keybinding to open URLs.
+* support special charaters in source URIs (Scott Bonds).
+* output message id and locations on all load_from_source failures
+* fix long-standing getlocal bug
+* make new test GPG keys (old ones expired), valid for one year, script
+  now available in devel/ for making new ones.
+
 == 0.19.0 / 2014-07-05
 
 * new check-attachment hook

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/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rake/testtask'
 require "bundler/gem_tasks"
 
@@ -9,4 +8,45 @@ Rake::TestTask.new(:test) do |test|
 end
 task :default => :test
 
+task :build => [:man]
 task :travis => [:test, :build]
+
+def test_pandoc
+  return system("pandoc -v > /dev/null 2>&1")
+end
+
+task :man do
+  puts "building manpages from wiki.."
+  unless test_pandoc
+    puts "no pandoc installed, needed for manpage generation."
+    return
+  end
+
+  # test if wiki is cloned
+  unless Dir.exist? 'doc/wiki/man'
+    puts "wiki git repository is not cloned in doc/wiki, try: git submodule update --init."
+    return
+  end
+
+  unless Dir.exist? 'man'
+    Dir.mkdir 'man'
+  end
+
+  Dir.glob("doc/wiki/man/*.md").each do |md|
+    m = /^.*\/(?<manpage>[^\/]*)\.md$/.match(md)[:manpage]
+    puts "generating manpage for: #{m}.."
+    r = system "pandoc -s -f markdown -t man #{md} -o man/#{m}"
+
+    unless r
+      puts "failed to generate manpage: #{m}."
+      return
+    end
+  end
+end
+
+task :clean do
+  ['man', 'pkg'].each do |d|
+    puts "cleaning #{d}.."
+    FileUtils.rm_r d if Dir.exist? d
+  end
+end

data/ReleaseNotes

@@ -1,3 +1,20 @@
+Release 0.21.0:
+
+Several small features as well as polishing (including fetching a GPG key with
+a shortcut and unsubscribing from mailinglist using an url). Several old
+deprecated parts of sup have been modernized. Support for Ruby 1.9.3 has been
+dropped. Have a look in History.txt for the details.
+
+Release 0.20.0:
+
+We've got man pages (Mr. Andersson)! We've got OpenBSD support (Scott Bonds)!
+It is now possible to get your HTML emails indexed by setting up a mime-decode
+hook before you index (Scott Bonds)! Scott Bonds also fixed up special character handing in source URIs. It is now possible to set up a goto hook
+for opening the URL below the cursor.
+
+Also a few long standing bugs have been fixed, and new GPG keys have been made
+for the tests.
+
 Release 0.19.0:
 
 New hook: check-attachment and a new option to shows dates in 24h format.

data/bin/sup

@@ -3,10 +3,11 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 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
 
@@ -102,27 +104,14 @@ global_keymap = Keymap.new do |k|
   end
 end
 
-## the following magic enables wide characters when used with a ruby
-## ncurses.so that's been compiled against libncursesw. (note the w.) why
-## this works, i have no idea. much like pretty much every aspect of
-## dealing with curses.  cargo cult programming at its best.
-require 'dl/import'
 require 'rbconfig'
-module LibC
-  extend DL.const_defined?(:Importer) ? DL::Importer : DL::Importable
-  setlocale_lib = case RbConfig::CONFIG['arch']
-    when /darwin/; "libc.dylib"
-    when /cygwin/; "cygwin1.dll"
-    when /freebsd/; "libc.so.7"
-    else; "libc.so.6"
-  end
 
-  debug "dynamically loading setlocale() from #{setlocale_lib}"
+unless RbConfig::CONFIG['arch'] =~ /openbsd/
+  debug "dynamically loading setlocale()"
   begin
-    dlload setlocale_lib
-    extern "void setlocale(int, const char *)"
+    class LibC; extend LocaleFiddler; end
     debug "setting locale..."
-    LibC.setlocale(6, "")  # LC_ALL == 6
+    LibC.setlocale(6, "")
   rescue RuntimeError => e
     warn "cannot dlload setlocale(); ncurses wide character support probably broken."
     warn "dlload error was #{e.class}: #{e.message}"