sup 0.22.1 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 703c8b0175724e4a3a4965081e8a0b12fb01147a
-  data.tar.gz: 86557dfd9de2f477dbf4f8322cd732c221d51c9d
+SHA256:
+  metadata.gz: 93d027a0f383edb73d1a2900ca991d8d8d8daca922f0088c18f5281ca04daeb4
+  data.tar.gz: 31b25e512227252a498baa651ea9b026ba452274dd5c67c99412dc2ef54f3e7a
 SHA512:
-  metadata.gz: ba46b62b4cd8059cd1835624270e715da259934f4f497f56471e81bd02876b83518c8b647ed4c1d0f43520f0a42fcdbec500b6a8b1abb4002bfdea7fe5e44ddd
-  data.tar.gz: 0e5f694ae6cd39770120ef26163a68bddb8179baa6cbcaec87acdbee17be1627cc9520c802427dd5f4958c7d367017034cf62360acddedef27f8a95d27b288cf
+  metadata.gz: 06211d3a91b76d20396afe9323bdf62d14acf61d13688333ae8f6409b55ff2120037df11e0a5e62e869e476868307a42216ee34e28f3621a05da0f9953a6cda3
+  data.tar.gz: f17bac030201cdabd4c6e3313a4178fb03f65f70992dcd4364cde425d1fd658408973b1758c7d45b13140dddde0e92f34006d6085140bbbb76164081083e9006

data/.github/workflows/checks.yml

@@ -0,0 +1,70 @@
+name: checks
+on:
+  push:
+    branches:
+    - develop
+  pull_request:
+    branches:
+    - develop
+permissions:
+  contents: read
+jobs:
+  rake-ci:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+        - ubuntu-latest
+        - macos-latest
+        ruby-version:
+        - '2.0'
+        - '2.1'
+        # Ruby 2.2 fails installing sup gem with a nonsensical error:
+        #   Could not find 'xapian-ruby' (~> 1.2) among 21 total gem(s)
+        #- '2.2'
+        - '2.3'
+        - '2.4'
+        - '2.5'
+        - '2.6'
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        exclude:
+        # xapian-bindings 1.2.2 fails to build on MacOS:
+        #   clang: warning: include path for libstdc++ headers not found; pass
+        #   '-stdlib=libc++' on the command line to use the libc++ standard
+        #   library instead [-Wstdlibcxx-not-found]
+        #   xapian_wrap.cc:1836:10: fatal error: 'string' file not found
+        # Probably just wrong compiler command or some mess that I can't be
+        # bothered to figure out.
+        - os: macos-latest
+          ruby-version: '2.0'
+        # xapian-bindings 1.4.18 fails to build with Ruby 3.0+ on MacOS:
+        #   error: '__declspec' attributes are not enabled; use '-fdeclspec' or
+        #   '-fms-extensions' to enable support for __declspec attributes
+        # Needs this fix:
+        # https://github.com/xapian/xapian/commit/63a06768a250b0bb4821b835f011e8214d560f8e
+        - os: macos-latest
+          ruby-version: '3.0'
+        - os: macos-latest
+          ruby-version: '3.1'
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Install pandoc
+      run: sudo apt-get install -y pandoc
+      if: runner.os == 'Linux'
+    - name: Install pandoc
+      run: brew install pandoc
+      if: runner.os == 'macOS'
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run Rake ci task
+      run: bundle exec rake ci
+    - name: Test gem installation
+      run: gem install pkg/sup-*.gem

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/.rubocop.yml

@@ -0,0 +1,5 @@
+require:
+  - rubocop-packaging
+
+AllCops:
+  DisabledByDefault: true

data/CONTRIBUTORS

@@ -2,14 +2,16 @@ William Morgan <william at the twitter dot coms>
 Rich Lane <rlane at the club.cc.cmu dot edus>
 Gaute Hope <eg at the gaute.vetsj dot coms>
 Whyme Lyu <callme5long at the gmail dot coms>
+Dan Callaghan <djc at the djc.id dot aus>
 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>
+Iain Parris <ipv2.vcs at the parris 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>
 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>
@@ -23,12 +25,12 @@ 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>
 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 <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>
 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,11 @@ 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>
 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)>
+Utkarsh Gupta <utkarsh at the debian 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>

data/Gemfile

@@ -1,7 +1,12 @@
 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.
+  if /^2\.0\./ =~ RUBY_VERSION
+    gem 'xapian-ruby', ['~> 1.2', '< 1.3.6']
+  else
+    gem 'xapian-ruby', '~> 1.2'
+  end
 end
 
 gemspec

data/History.txt

@@ -1,3 +1,79 @@
+== 1.1 / 2022-05-23
+
+* #588, #577: Sup is now compatible with and tested on Ruby 3.0 and Ruby 3.1.
+* When the Sup gem installs xapian-ruby, it will install to the user gem
+  directory if the system gem directory is not writable. (Iain Parris)
+* #571: To and From addresses of enclosed messages are now displayed normally,
+  instead of as Redwood::Person objects. (Iain Parris)
+* #570: Fixed wording when displaying enclosed messages without Date header.
+  (Iain Parris)
+* #205, #602: UTF-8 header values are now accepted and handled correctly, as
+  per RFC6532.
+* #585: Text/plain attachments with invalid charset are now displayed as
+  US-ASCII (with high bytes replaced) instead of crashing.
+* #424: Spaces are now accepted in RFC2047-encoded header words, even though
+  the RFC forbids them. (Dan Callaghan)
+* Invalid RFC2047-encoded header words are now displayed in their raw form,
+  rather than trying to forcibly transcode them to UTF-8, as per the RFC's
+  recommendation. (Dan Callaghan)
+* Sup now decodes UTF-7 correctly instead of crashing.
+
+== 1.0 / 2020-07-12
+
+No changes. The version number is incremented to 1.0 to reflect the fact that
+Sup is mature and no further backwards-incompatible changes are planned.
+
+== 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/Manifest.txt

@@ -0,0 +1,149 @@
+.github/workflows/checks.yml
+.gitignore
+.gitmodules
+.rubocop.yml
+CONTRIBUTORS
+Gemfile
+HACKING
+History.txt
+LICENSE
+Manifest.txt
+README.md
+Rakefile
+ReleaseNotes
+bin/sup
+bin/sup-add
+bin/sup-config
+bin/sup-dump
+bin/sup-import-dump
+bin/sup-recover-sources
+bin/sup-sync
+bin/sup-sync-back-maildir
+bin/sup-tweak-labels
+contrib/colorpicker.rb
+contrib/completion/_sup.bash
+contrib/completion/_sup.zsh
+devel/console.sh
+devel/count-loc.sh
+devel/load-index.rb
+devel/profile.rb
+devel/start-console.rb
+doc/FAQ.txt
+doc/Hooks.txt
+doc/Philosophy.txt
+doc/wiki
+ext/mkrf_conf_xapian.rb
+lib/sup.rb
+lib/sup/account.rb
+lib/sup/buffer.rb
+lib/sup/colormap.rb
+lib/sup/contact.rb
+lib/sup/crypto.rb
+lib/sup/draft.rb
+lib/sup/hook.rb
+lib/sup/horizontal_selector.rb
+lib/sup/idle.rb
+lib/sup/index.rb
+lib/sup/interactive_lock.rb
+lib/sup/keymap.rb
+lib/sup/label.rb
+lib/sup/logger.rb
+lib/sup/logger/singleton.rb
+lib/sup/maildir.rb
+lib/sup/mbox.rb
+lib/sup/message.rb
+lib/sup/message_chunks.rb
+lib/sup/mode.rb
+lib/sup/modes/buffer_list_mode.rb
+lib/sup/modes/completion_mode.rb
+lib/sup/modes/compose_mode.rb
+lib/sup/modes/console_mode.rb
+lib/sup/modes/contact_list_mode.rb
+lib/sup/modes/edit_message_async_mode.rb
+lib/sup/modes/edit_message_mode.rb
+lib/sup/modes/file_browser_mode.rb
+lib/sup/modes/forward_mode.rb
+lib/sup/modes/help_mode.rb
+lib/sup/modes/inbox_mode.rb
+lib/sup/modes/label_list_mode.rb
+lib/sup/modes/label_search_results_mode.rb
+lib/sup/modes/line_cursor_mode.rb
+lib/sup/modes/log_mode.rb
+lib/sup/modes/person_search_results_mode.rb
+lib/sup/modes/poll_mode.rb
+lib/sup/modes/reply_mode.rb
+lib/sup/modes/resume_mode.rb
+lib/sup/modes/scroll_mode.rb
+lib/sup/modes/search_list_mode.rb
+lib/sup/modes/search_results_mode.rb
+lib/sup/modes/text_mode.rb
+lib/sup/modes/thread_index_mode.rb
+lib/sup/modes/thread_view_mode.rb
+lib/sup/person.rb
+lib/sup/poll.rb
+lib/sup/rfc2047.rb
+lib/sup/search.rb
+lib/sup/sent.rb
+lib/sup/service/label_service.rb
+lib/sup/source.rb
+lib/sup/tagger.rb
+lib/sup/textfield.rb
+lib/sup/thread.rb
+lib/sup/time.rb
+lib/sup/undo.rb
+lib/sup/update.rb
+lib/sup/util.rb
+lib/sup/util/axe.rb
+lib/sup/util/locale_fiddler.rb
+lib/sup/util/ncurses.rb
+lib/sup/util/path.rb
+lib/sup/util/query.rb
+lib/sup/util/uri.rb
+lib/sup/version.rb
+sup.gemspec
+test/dummy_source.rb
+test/fixtures/bad-content-transfer-encoding-1.eml
+test/fixtures/binary-content-transfer-encoding-2.eml
+test/fixtures/blank-header-fields.eml
+test/fixtures/contacts.txt
+test/fixtures/embedded-message.eml
+test/fixtures/mailing-list-header.eml
+test/fixtures/malicious-attachment-names.eml
+test/fixtures/missing-from-to.eml
+test/fixtures/missing-line.eml
+test/fixtures/multi-part-2.eml
+test/fixtures/multi-part.eml
+test/fixtures/no-body.eml
+test/fixtures/non-ascii-header-in-nested-message.eml
+test/fixtures/non-ascii-header.eml
+test/fixtures/rfc2047-header-encoding.eml
+test/fixtures/simple-message.eml
+test/fixtures/text-attachments-with-charset.eml
+test/fixtures/utf8-header.eml
+test/fixtures/zimbra-quote-with-bottom-post.eml
+test/gnupg_test_home/.gpg-v21-migrated
+test/gnupg_test_home/gpg.conf
+test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
+test/gnupg_test_home/pubring.gpg
+test/gnupg_test_home/receiver_pubring.gpg
+test/gnupg_test_home/receiver_secring.gpg
+test/gnupg_test_home/regen_keys.sh
+test/gnupg_test_home/secring.gpg
+test/gnupg_test_home/sup-test-2@foo.bar.asc
+test/integration/test_maildir.rb
+test/integration/test_mbox.rb
+test/integration/test_sup-add.rb
+test/test_crypto.rb
+test/test_header_parsing.rb
+test/test_helper.rb
+test/test_message.rb
+test/test_messages_dir.rb
+test/test_yaml_regressions.rb
+test/unit/service/test_label_service.rb
+test/unit/test_contact.rb
+test/unit/test_horizontal_selector.rb
+test/unit/test_locale_fiddler.rb
+test/unit/test_person.rb
+test/unit/util/test_query.rb
+test/unit/util/test_string.rb
+test/unit/util/test_uri.rb

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,46 @@ 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 front end.
+  Alot even ships with a
+  [built-in](https://github.com/pazz/alot/blob/master/extra/themes/sup)
+  [Sup theme](https://github.com/pazz/alot/wiki/Gallery#user-content-theme-sup)!
+
+* [mu](https://www.djcbsoftware.nl/code/mu/) /
+  [mu4e](https://www.djcbsoftware.nl/code/mu/mu4e.html). Like Sup, a search-based
+  email back end, and also implemented using Xapian. The emacs-based front end
+  [is quite different](https://www.djcbsoftware.nl/code/mu/mu4e/Other-mail-clients.html).
+
 ## 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,6 +1,10 @@
 require 'rake/testtask'
 require "bundler/gem_tasks"
 
+# Manifest.txt file in same folder as this Rakefile
+manifest_filename = "#{File.dirname(__FILE__)}/Manifest.txt"
+git_ls_files_command = "git ls-files | LC_ALL=C sort"
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.test_files = FileList.new('test/**/test_*.rb')
@@ -9,7 +13,7 @@ end
 task :default => :test
 
 task :build => [:man]
-task :travis => [:test, :build]
+task :ci => [:test, :rubocop_packaging, :check_manifest, :build]
 
 def test_pandoc
   return system("pandoc -v > /dev/null 2>&1")
@@ -50,3 +54,38 @@ task :clean do
     FileUtils.rm_r d if Dir.exist? d
   end
 end
+
+task :manifest do
+  manifest = `#{git_ls_files_command}`
+  if $?.success? then
+    puts "Writing `git ls-files` output to #{manifest_filename}"
+    File.write(manifest_filename, manifest, mode: 'w')
+  else
+    abort "Failed to generate Manifest.txt (with `git ls-files`)"
+  end
+end
+
+task :check_manifest do
+  manifest = `#{git_ls_files_command}`
+  manifest_file_contents = File.read(manifest_filename)
+  if manifest == manifest_file_contents
+    puts "Manifest.txt OK"
+  else
+    puts "Manifest from `git ls-files`:\n#{manifest}"
+    STDERR.puts "Manifest.txt outdated. Please commit an updated Manifest.txt"
+    STDERR.puts "To generate Manifest.txt, run: rake manifest"
+    abort "Manifest.txt does not match `git ls-files`"
+  end
+end
+
+task :rubocop_packaging do
+  if /^2\.[012]\./ =~ RUBY_VERSION
+    puts "skipping rubocop-packaging checks on unsupported Ruby #{RUBY_VERSION}"
+    next
+  end
+  if system("rubocop --only Packaging")
+    puts "rubocop-packaging checks OK"
+  else
+    abort "rubocop-packaging checks failed"
+  end
+end

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,24 +90,20 @@ 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
 
-    parsed_uri = URI(URI.escape(uri))
-
     source =
-      case parsed_uri.scheme
-      when "maildir"
+      case uri
+      when /^maildir:/
         Redwood::Maildir.new uri, !$opts[:unusual], $opts[:archive], $opts[:sync_back], nil, labels
-      when "mbox"
+      when /^mbox:/
         Redwood::MBox.new uri, !$opts[:unusual], $opts[:archive], nil, labels
       when nil
-        Trollop::die "Sources must be specified with an URI"
-      else
-        Trollop::die "Unknown source type #{parsed_uri.scheme.inspect}"
+        Optimist::die "Sources must be specified with a maildir:// or mbox:// URI"
       end
-    say "Adding #{source}..."
+    @cli.say "Adding #{source}..."
     Redwood::SourceManager.add_source source
   end
 ensure