sup 1.1 → 1.2

data/contrib/nix/ruby2.6-gemset.nix

@@ -0,0 +1,319 @@
+{
+  ast = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
+      type = "gem";
+    };
+    version = "2.4.2";
+  };
+  chronic = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  coderay = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  gpgme = {
+    dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "010wr6nnifi952bx4v5c49q25yx1g8lhib5wiv2sg7bip3yvlyy8";
+      type = "gem";
+    };
+    version = "2.0.23";
+  };
+  highline = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
+      type = "gem";
+    };
+    version = "2.0.3";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
+      type = "gem";
+    };
+    version = "2.6.2";
+  };
+  locale = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
+  lockfile = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
+  method_source = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
+      type = "gem";
+    };
+    version = "3.4.1";
+  };
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
+      type = "gem";
+    };
+    version = "3.2022.0105";
+  };
+  mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
+      type = "gem";
+    };
+    version = "2.8.5";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
+      type = "gem";
+    };
+    version = "5.16.2";
+  };
+  ncursesw = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qlfhp9b445g0qp9kkdiylfjlpfzrv6nqvry4ar6y0yacn0zr5y8";
+      type = "gem";
+    };
+    version = "1.4.11";
+  };
+  optimist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  parallel = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
+      type = "gem";
+    };
+    version = "1.22.1";
+  };
+  parser = {
+    dependencies = ["ast"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
+      type = "gem";
+    };
+    version = "3.1.2.0";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr";
+      type = "gem";
+    };
+    version = "0.14.1";
+  };
+  rainbow = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
+      type = "gem";
+    };
+    version = "3.1.1";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      type = "gem";
+    };
+    version = "13.0.6";
+  };
+  regexp_parser = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0";
+      type = "gem";
+    };
+    version = "2.5.0";
+  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      type = "gem";
+    };
+    version = "3.2.5";
+  };
+  rmail = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m5npkmv764m725wzjzasgf3k8q5anf3vfr6k2cac1xj6jc8lcqi";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  rr = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n9g78ba4c2zzmz8cdb97c38h1xm0clircag00vbcxwqs4dq0ymp";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  rubocop = {
+    dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k371m1l177ca8w70hfbjb1w0hasfb46pxp4w6yw92kk71akll2";
+      type = "gem";
+    };
+    version = "1.32.0";
+  };
+  rubocop-ast = {
+    dependencies = ["parser"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h8q3gwqs8afshjd2l52ywf48md9rskr3q2y4fydgm536vvahjgm";
+      type = "gem";
+    };
+    version = "1.19.1";
+  };
+  rubocop-packaging = {
+    dependencies = ["rubocop"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bzjd1077v96pyp62jg7s8ndxqbdhfnrdpdnmgi7h88xw22fp5xf";
+      type = "gem";
+    };
+    version = "0.5.1";
+  };
+  ruby-progressbar = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
+      type = "gem";
+    };
+    version = "1.11.0";
+  };
+  unicode = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
+      type = "gem";
+    };
+    version = "0.4.4.4";
+  };
+  unicode-display_width = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  xapian-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z8arjkd0nlj6zv9in2sihmbwpbd17a10lsv7nwii7z0jjscyxpp";
+      type = "gem";
+    };
+    version = "1.4.18";
+  };
+}

data/contrib/nix/ruby2.6-shell.nix

@@ -0,0 +1,30 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "3ef1d2a9602c18f8742e1fb63d5ae9867092e3d6";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby2.6-gems-for-sup";
+    ruby = pkgs.ruby_2_6;
+    gemfile = ./Gemfile;
+    lockfile = ./ruby2.6-Gemfile.lock;
+    gemset = ./ruby2.6-gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for a new error in clang 16 (MacOS):
+      # https://github.com/blackwinter/unicode/pull/11
+      unicode = attrs: {
+        buildFlags = [
+          "--with-cflags=-Wno-incompatible-function-pointer-types"
+        ];
+      };
+      # Workaround: remove rake from nativeBuildInputs, otherwise it causes
+      # xapian-bindings to build against the default Ruby version
+      # instead of our chosen version.
+      xapian-ruby = attrs: pkgs.defaultGemConfig.xapian-ruby attrs // {
+        dependencies = [ "rake" ];
+        nativeBuildInputs = [ pkgs.pkg-config ];
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby2.7-shell.nix

@@ -0,0 +1,23 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "402cc3633cc60dfc50378197305c984518b30773";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby2.7-gems-for-sup";
+    ruby = pkgs.ruby_2_7;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for a new error in clang 16 (MacOS):
+      # https://github.com/blackwinter/unicode/pull/11
+      unicode = attrs: {
+        buildFlags = [
+          "--with-cflags=-Wno-incompatible-function-pointer-types"
+        ];
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.0-shell.nix

@@ -0,0 +1,23 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "402cc3633cc60dfc50378197305c984518b30773";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.0-gems-for-sup";
+    ruby = pkgs.ruby_3_0;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for a new error in clang 16 (MacOS):
+      # https://github.com/blackwinter/unicode/pull/11
+      unicode = attrs: {
+        buildFlags = [
+          "--with-cflags=-Wno-incompatible-function-pointer-types"
+        ];
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.1-shell.nix

@@ -0,0 +1,23 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "0e2ba0d131331e318eba20fcb03db0372dc2a926";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.1-gems-for-sup";
+    ruby = pkgs.ruby_3_1;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for a new error in clang 16 (MacOS):
+      # https://github.com/blackwinter/unicode/pull/11
+      unicode = attrs: {
+        buildFlags = [
+          "--with-cflags=-Wno-incompatible-function-pointer-types"
+        ];
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.2-shell.nix

@@ -0,0 +1,23 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "0e2ba0d131331e318eba20fcb03db0372dc2a926";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.2-gems-for-sup";
+    ruby = pkgs.ruby_3_2;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for a new error in clang 16 (MacOS):
+      # https://github.com/blackwinter/unicode/pull/11
+      unicode = attrs: {
+        buildFlags = [
+          "--with-cflags=-Wno-incompatible-function-pointer-types"
+        ];
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.3-shell.nix

@@ -0,0 +1,23 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "0e2ba0d131331e318eba20fcb03db0372dc2a926";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.3-gems-for-sup";
+    ruby = pkgs.ruby_3_3;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for a new error in clang 16 (MacOS):
+      # https://github.com/blackwinter/unicode/pull/11
+      unicode = attrs: {
+        buildFlags = [
+          "--with-cflags=-Wno-incompatible-function-pointer-types"
+        ];
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/test-all-rubies.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+cd "$(dirname "$0")/../.."
+for rubyversion in 2.4 2.5 2.6 2.7 3.0 3.1 3.2 ; do
+    nix-shell contrib/nix/ruby$rubyversion-shell.nix --run 'rake ci'
+done

data/doc/Hooks.txt

@@ -69,7 +69,7 @@ startup:
     set 'bgtask_pid' @bgtask_pid
     Process.detach(@bgtask_pid) # so we don't have to wait on it when we go to kill it
   else
-    exec "background-task args 2&>1 >> /tmp/logfile"
+    exec "background-task args 2>&1 >> /tmp/logfile"
   end
 
 after-poll:

data/ext/mkrf_conf_xapian.rb

@@ -14,7 +14,7 @@ destination = File.writable?(Gem.dir) ? Gem.dir : Gem.user_dir
 inst = Gem::DependencyInstaller.new(:install_dir => destination)
 begin
 
-  if !RbConfig::CONFIG['arch'].include?('openbsd')
+  if not ENV.include? "SUP_SKIP_XAPIAN_GEM_INSTALL"
     # update version in Gemfile as well
     name    = "xapian-ruby"
     version =
@@ -37,7 +37,7 @@ begin
 
     end
   else
-    STDERR.puts "xapian: openbsd: you have to install xapian-core and xapian-bindings manually, have a look at: https://github.com/sup-heliotrope/sup/wiki/Installation%3A-OpenBSD"
+    STDERR.puts "xapian: you have to install xapian-core and xapian-bindings manually"
   end
 
 rescue StandardError => e

data/lib/sup/crypto.rb

@@ -369,7 +369,7 @@ EOS
   def retrieve fingerprint
     require 'net/http'
     uri = URI($config[:keyserver_url] || KEYSERVER_URL)
-    unless uri.scheme == "http" and not uri.host.nil?
+    unless uri.scheme == "http" and not uri.host.nil? and not uri.host.empty?
       return "Invalid url: #{uri}"
     end
 

data/lib/sup/index.rb

@@ -99,14 +99,14 @@ EOS
   end
 
   def load failsafe=false
-    SourceManager.load_sources
+    SourceManager.load_sources File.join(@dir, "sources.yaml")
     load_index failsafe
   end
 
   def save
     debug "saving index and sources..."
     FileUtils.mkdir_p @dir unless File.exist? @dir
-    SourceManager.save_sources
+    SourceManager.save_sources File.join(@dir, "sources.yaml")
     save_index
   end
 

data/lib/sup/maildir.rb

@@ -23,7 +23,7 @@ class Maildir < Source
     end
 
     raise ArgumentError, "not a maildir URI" unless uri.scheme == "maildir"
-    raise ArgumentError, "maildir URI cannot have a host: #{uri.host}" if uri.host
+    raise ArgumentError, "maildir URI cannot have a host: #{uri.host}" unless uri.host.nil? || uri.host.empty?
     raise ArgumentError, "maildir URI must have a path component" unless uri.path
 
     @sync_back = sync_back

data/lib/sup/mbox.rb

@@ -30,7 +30,7 @@ class MBox < Source
       end
 
       raise ArgumentError, "not an mbox uri" unless uri.scheme == "mbox"
-      raise ArgumentError, "mbox URI ('#{uri}') cannot have a host: #{uri.host}" if uri.host
+      raise ArgumentError, "mbox URI ('#{uri}') cannot have a host: #{uri.host}" unless uri.host.nil? || uri.host.empty?
       raise ArgumentError, "mbox URI must have a path component" unless uri.path
       @f = nil
     else

data/lib/sup/message.rb

@@ -271,7 +271,7 @@ class Message
         message_to_chunks rmsg
       rescue SourceError, SocketError, RMail::EncodingUnsupportedError => e
         warn_with_location "problem reading message #{id}"
-        debug "could not load message: #{location.inspect}, exception: #{e.inspect}"
+        debug "could not load message, exception: #{e.inspect}"
 
         [Chunk::Text.new(error_message.split("\n"))]
 
@@ -760,7 +760,7 @@ private
 
   def warn_with_location msg
     warn msg
-    warn "Message is in #{location.source.uri} at #{location.info}"
+    warn "Message is in #{@locations}"
   end
 end
 

data/lib/sup/modes/console_mode.rb

@@ -11,7 +11,7 @@ class Console
   end
 
   def query(query)
-    Enumerator.new(Index.instance, :each_message, Index.parse_query(query))
+    Index.instance.enum_for :each_message, Index.parse_query(query)
   end
 
   def add_labels(query, *labels)

data/lib/sup/thread.rb

@@ -86,22 +86,22 @@ class Thread
     end
   end
 
-  def first; each { |m, *o| return m if m }; nil; end
-  def has_message?; any? { |m, *o| m.is_a? Message }; end
-  def dirty?; any? { |m, *o| m && m.dirty? }; end
-  def date; map { |m, *o| m.date if m }.compact.max; end
+  def first; each { |m, *| return m if m }; nil; end
+  def has_message?; any? { |m, *| m.is_a? Message }; end
+  def dirty?; any? { |m, *| m && m.dirty? }; end
+  def date; map { |m, *| m.date if m }.compact.max; end
   def snippet
-    with_snippets = select { |m, *o| m && m.snippet && !m.snippet.empty? }
-    first_unread, * = with_snippets.select { |m, *o| m.has_label?(:unread) }.sort_by { |m, *o| m.date }.first
+    with_snippets = select { |m, *| m && m.snippet && !m.snippet.empty? }
+    first_unread, * = with_snippets.select { |m, *| m.has_label?(:unread) }.sort_by { |m, *| m.date }.first
     return first_unread.snippet if first_unread
-    last_read, * = with_snippets.sort_by { |m, *o| m.date }.last
+    last_read, * = with_snippets.sort_by { |m, *| m.date }.last
     return last_read.snippet if last_read
     ""
   end
-  def authors; map { |m, *o| m.from if m }.compact.uniq; end
+  def authors; map { |m, *| m.from if m }.compact.uniq; end
 
-  def apply_label t; each { |m, *o| m && m.add_label(t) }; end
-  def remove_label t; each { |m, *o| m && m.remove_label(t) }; end
+  def apply_label t; each { |m, *| m && m.add_label(t) }; end
+  def remove_label t; each { |m, *| m && m.remove_label(t) }; end
 
   def toggle_label label
     if has_label? label
@@ -113,24 +113,24 @@ class Thread
     end
   end
 
-  def set_labels l; each { |m, *o| m && m.labels = l }; end
-  def has_label? t; any? { |m, *o| m && m.has_label?(t) }; end
-  def each_dirty_message; each { |m, *o| m && m.dirty? && yield(m) }; end
+  def set_labels l; each { |m, *| m && m.labels = l }; end
+  def has_label? t; any? { |m, *| m && m.has_label?(t) }; end
+  def each_dirty_message; each { |m, *| m && m.dirty? && yield(m) }; end
 
   def direct_participants
-    map { |m, *o| [m.from] + m.to if m }.flatten.compact.uniq
+    map { |m, *| [m.from] + m.to if m }.flatten.compact.uniq
   end
 
   def participants
-    map { |m, *o| [m.from] + m.to + m.cc + m.bcc if m }.flatten.compact.uniq
+    map { |m, *| [m.from] + m.to + m.cc + m.bcc if m }.flatten.compact.uniq
   end
 
-  def size; map { |m, *o| m ? 1 : 0 }.sum; end
-  def subj; argfind { |m, *o| m && m.subj }; end
-  def labels; inject(Set.new) { |s, (m, *o)| m ? s | m.labels : s } end
+  def size; map { |m, *| m ? 1 : 0 }.sum; end
+  def subj; argfind { |m, *| m && m.subj }; end
+  def labels; inject(Set.new) { |s, (m, *)| m ? s | m.labels : s } end
   def labels= l
     raise ArgumentError, "not a set" unless l.is_a?(Set)
-    each { |m, *o| m && m.labels = l.dup }
+    each { |m, *| m && m.labels = l.dup }
   end
 
   def latest_message
@@ -360,7 +360,7 @@ class ThreadSet
   ## merges in a pre-loaded thread
   def add_thread t
     raise "duplicate" if @threads.values.member? t
-    t.each { |m, *o| add_message m }
+    t.each { |m, *| add_message m }
   end
 
   ## merges two threads together. both must be members of this threadset.

data/lib/sup/util.rb

@@ -11,6 +11,7 @@ require 'benchmark'
 require 'unicode'
 require 'unicode/display_width'
 require 'fileutils'
+require 'string-scrub' if /^2\.0\./ =~ RUBY_VERSION
 
 module ExtendedLockfile
   def gen_lock_id
@@ -315,11 +316,8 @@ class String
     # first try to encode to utf-8 from whatever current encoding
     encode!('UTF-8', :invalid => :replace, :undef => :replace)
 
-    # do this anyway in case string is set to be UTF-8, encoding to
-    # something else (UTF-16 which can fully represent UTF-8) and back
-    # ensures invalid chars are replaced.
-    encode!('UTF-16', 'UTF-8', :invalid => :replace, :undef => :replace)
-    encode!('UTF-8', 'UTF-16', :invalid => :replace, :undef => :replace)
+    # ensure invalid chars are replaced
+    scrub!
 
     fail "Could not create valid UTF-8 string out of: '#{self.to_s}'." unless valid_encoding?