intrigeri · intrigeri · intrigeri · intrigeri · intrigeri · intrigeri
--- a/Build.PL
+++ b/Build.PL

-# This file was automatically generated by Dist::Zilla::Plugin::ModuleBuild v6.009.
+# This file was automatically generated by Dist::Zilla::Plugin::ModuleBuild v6.012.
 use strict;
 use warnings;

@@ -21,7 +21,7 @@ my %module_build_args = (
    "intrigeri <intrigeri\@boum.org>"
  ],
  "dist_name" => "App-Parcimonie",
-  "dist_version" => "0.10.3",
+  "dist_version" => "0.11.0",
  "license" => "perl",
  "module_name" => "App::Parcimonie",
  "recursive_test_files" => 1,
@@ -43,6 +43,7 @@ my %module_build_args = (
    "List::Util" => "1.33",
    "Moo" => "1.003",
    "MooX::Options" => "3.83",
+    "MooX::StrictConstructor" => "0.008",
    "MooX::late" => "0.014",
    "Net::DBus" => "v0.33.6",
    "Net::DBus::GLib" => "v0.33.0",
@@ -58,13 +59,14 @@ my %module_build_args = (
  },
  "script_files" => [
    "bin/parcimonie",
-    "bin/parcimonie-applet",
-    "bin/parcimonie-torified-gpg"
+    "bin/parcimonie-applet"
  ],
  "share_dir" => {
    "dist" => "share"
  },
  "test_requires" => {
+    "ExtUtils::MakeMaker" => 0,
+    "File::Spec" => 0,
    "File::Which" => "1.08",
    "GnuPG::Interface" => "0.42",
    "IO::Handle" => "1.28",
@@ -73,14 +75,18 @@ my %module_build_args = (
    "List::Util" => "1.33",
    "Module::Pluggable::Object" => "3.9",
    "Path::Tiny" => "0.038",
+    "Test::More" => 0,
    "Test::Most" => "0.22",
-    "Test::Trap" => "v0.2.1"
+    "Test::Trap" => "v0.2.1",
+    "strictures" => "2.000003"
  }
 );


 my %fallback_build_requires = (
  "Cwd" => "3.30",
+  "ExtUtils::MakeMaker" => 0,
+  "File::Spec" => 0,
  "File::Which" => "1.08",
  "GnuPG::Interface" => "0.42",
  "IO::Handle" => "1.28",
@@ -90,9 +96,11 @@ my %fallback_build_requires = (
  "Module::Build" => "0.3601",
  "Module::Pluggable::Object" => "3.9",
  "Path::Tiny" => "0.038",
+  "Test::More" => 0,
  "Test::Most" => "0.22",
  "Test::Trap" => "v0.2.1",
-  "autodie" => "2.06_01"
+  "autodie" => "2.06_01",
+  "strictures" => "2.000003"
 );



--- a/Changes
+++ b/Changes
 ==================================================
-Changes from 1743-09-13 00:00:00 +0000 to present.
+Changes from 1744-09-24 00:00:00 +0000 to present.
 ==================================================

-------------------------------------------
-version 0.10.3 at 2017-06-27 16:58:47 +0000
-------------------------------------------
+-------------------------------------
+version  at 2018-07-09 20:07:06 +0000
+-------------------------------------
+
+  Change: 73a5963865b7bc6d032edf014de5c52b429beccf
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 20:07:06 +0000
+
+    Release parcimonie 0.11.0. 
+
+  Change: 137fd09c5cef4b0fa5aa6f9e512ed60b7229ec26
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 20:07:06 +0000
+
+    Remove leftover debugging statement. 
+
+  Change: 0424168cb27d471752da6c8dddd4bb0389643c92
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Test suite: don't set "use-tor" preemptively and let the code under
+    test do it itself. 
+
+  Change: 22e24dbbfc351376247503e5fef6044d0f4dd9da
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Test suite: run each test with its own GnuPG home directory, to avoid
+    interaction between tests.
+
+    Otherwise, with GnuPG 2.1+, persistent processes such as dirmngr are
+    started and their state will persist across tests, which skews the
+    results. 
+
+  Change: 00bdd80487cebdc8e3e1f100e6e961e379cdc237
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Test suite: add empty dirmngr_ldapservers.conf to quiet output. 
+
+  Change: 865be57330c46f3a1bba1fad7feb4ee5f60706e4
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Test suite: drop test data that's not used anymore. 
+
+  Change: ed19a9809bebd2dfdefffb980ccb1706aaf218e4
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Pass GnuPG homedir argument to GnuPG::Interface as a string.
+
+    All kinds of thinks can go wrong by passing a more complex object to
+    it, in this case a Path::Tiny directory. 
+
+  Change: 3e3718ff36126c9d31b7df08f43f70f5148ecbb4
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Pass all options to GnuPG::Interface in one go.
+
+    Otherwise, our "after BUILD" will fail or behave incorrectly because
+    the homedir attribute was not initialized yet. 
+
+  Change: ee80ce23f39e8ae3ac7291ef16dd444862167144
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Drop support for GnuPG < 2.1. 
+
+  Change: 9b914a125264430300388edb84aee85422c6eb64
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-09 19:56:11 +0000
+
+    Make gpg_is_v21 independent of the rest of parcimonie's code so the
+    test suite works from the source tree when parcimonie is not
+    installed system-wide. 
+
+-------------------------------------
+version  at 2018-07-08 15:33:48 +0000
+-------------------------------------
+
+  Change: e1bea05b96b2cfd6e8eed5510a55627653af6a45
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    Release parcimonie 0.10.4 
+
+  Change: 51f4f3474fc727fd099879b8a93d06b98d29409a
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    TODO--: torsocks is only needed with GnuPG v1 which is not the
+    current development focus anymore. 
+
+  Change: 66d75e095e64f08c3ea0c043e3559613dd9e524a
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    Documentation: adjust to take into account the default config in
+    Stretch. 
+
+  Change: b65ff9b987b1b0f19dc6e2be8fad71522a997709
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    Documentation: clarify the status and future of parcimonie-applet. 
+
+  Change: f31fa456a2ce8b6de49fea1febdf19dc491a7823
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    Documentation: drop info that's been obsolete since GNOME 3. 
+
+  Change: f7edb837b839a50ab779ca035f1044d779a757b4
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    Test suite: drop tests that can't work on Debian and add one that
+    can.
+
+    Since gnupg2 2.1.15-9, the Debian package enables a (pool of)
+    keyserver(s) by default, so we can't easily test behaviour when no
+    keyserver is configured at all. But let's at least test behaviour
+    when one is configured. 
+
+  Change: 0d977bc559019c71e18821dce02308565f17ebe7
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    Test suite: update tryRecvKey test case wrt. recent code behaviour
+    changes and re-enable it for release testing.
+
+    Since commit 948a4b8142e7141ce12ebe69d63d7aaae828871d we hide the
+    "gpg: keyserver receive failed: No data" message that GnuPG prints to
+    STDERR in such cases, so the original test case would fail (also
+    because it was expecting the GnuPG v1 error message).
+
+    Re-enabling this test not only allows us to exercise tryRecvKey
+    again, but it also gives us a regression test in case GnuPG starts
+    spitting out other errors on STDERR. 
+
+  Change: 4992bfc7f1a3cdb4ed5d572f4eab2945112bda7d
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 15:33:48 +0000
+
+    Test suite: adjust test data for GnuPG v2.1+ and require it. 
+
+  Change: c7303d09b74ab74eebd5c764aa1e2ade0ba0d15c
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 14:47:33 +0000
+
+    Test suite: turn on strict and make warnings fatal everywhere. 
+
+  Change: 20b58ee584111a858269b642e657900e78d1f429
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 08:53:11 +0000
+
+    dist.ini: enable Test::ReportPrereqs for easier debugging of test
+    failures. 
+
+  Change: 792de4e414704a5a0ffee53bd702a59e64c3418e
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 08:49:35 +0000
+
+    dist.ini: enable Test::Kwalitee. 
+
+  Change: c36d385a75d90c3a40a7cae3a0c27ed4b7bac4e5
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 08:48:44 +0000
+
+    Add license and copyright info to App::Parcimonie. 
+
+  Change: 7d504f0e023243a3847f67d870a7eedd9e6770a7
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 08:48:32 +0000
+
+    Split license and copyright sections. 
+
+  Change: 1e7862a60ec6ac3893f92b98a49d849396aa6a5c
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 08:07:25 +0000
+
+    Bump copyright years. 
+
+  Change: a07a3d59b8c17123a5f24435034fcf8ac2d237c2
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 08:04:22 +0000
+
+    Use HTTPS for every URL pointing to the project's homepage. 
+
+  Change: 0d2b660bf46152dafaa665002194a135716b1bd1
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-07-08 08:00:26 +0000
+
+    Use MooX::StrictConstructor everywhere we can. 
+
+  Change: 948a4b8142e7141ce12ebe69d63d7aaae828871d
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-06-30 16:25:27 +0000
+
+    Don't bloat the logs with fingerprints of keys that could not be
+    found (Closes: #900388)
+
+    Thanks to Paul Wise <pabs@debian.org> for the report. 
+
+  Change: 330c1d9e1303cb3218653af385875d2c3648a3ae
+  Author: intrigeri <intrigeri@boum.org>
+  Date : 2018-06-30 15:30:04 +0000
+
+    Hide spurious "dirmngr:Network:/usr/bin/dirmngr:1:1:" output. 
+
+-------------------------------------
+version  at 2017-06-27 16:32:24 +0000
+-------------------------------------

  Change: 2d6cbb520987962fd094fdfd004532cc48a083ad
  Author: intrigeri <intrigeri@boum.org>

--- a/INSTALL
+++ b/INSTALL
@@ -31,13 +31,27 @@ Then install it:

    % ./Build install

+Or the more portable variation:
+
+    % perl Build.PL
+    % perl Build
+    % perl Build test
+    % perl Build install
+
 If your perl is system-managed, you can create a local::lib in your home
 directory to install modules to. For details, see the local::lib documentation:
 https://metacpan.org/pod/local::lib

+
+The prerequisites of this distribution will also have to be installed manually. The
+prerequisites are listed in one of the files: `MYMETA.yml` or `MYMETA.json` generated
+by running the manual build process described above.
+
 ## Documentation

 App-Parcimonie documentation is available as POD.
-You can run perldoc from a shell to read the documentation:
+You can run `perldoc` from a shell to read the documentation:

    % perldoc App::Parcimonie
+For more information on installing Perl modules via CPAN, please see:
+https://www.cpan.org/modules/INSTALL.html
--- a/LICENSE
+++ b/LICENSE
-This software is copyright (c) 2016 by intrigeri.
+This software is copyright (c) 2018 by intrigeri.

 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@ b) the "Artistic License"

 --- The GNU General Public License, Version 1, February 1989 ---

-This software is Copyright (c) 2016 by intrigeri.
+This software is Copyright (c) 2018 by intrigeri.

 This is free software, licensed under:

@@ -272,7 +272,7 @@ That's all there is to it!

 --- The Artistic License 1.0 ---

-This software is Copyright (c) 2016 by intrigeri.
+This software is Copyright (c) 2018 by intrigeri.

 This is free software, licensed under:


--- a/MANIFEST
+++ b/MANIFEST
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.009.
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.012.
 Build.PL
 Changes
 Changes.OLD
@@ -12,7 +12,6 @@ README
 TODO
 bin/parcimonie
 bin/parcimonie-applet
-bin/parcimonie-torified-gpg
 design.mdwn
 dist.ini
 inc/My/Builder.pm
@@ -23,7 +22,6 @@ lib/App/Parcimonie/Daemon.pm
 lib/App/Parcimonie/GnuPG/Interface.pm
 lib/App/Parcimonie/Role/HasCodeset.pm
 lib/App/Parcimonie/Role/HasEncoding.pm
-parcimonie-torified-gpg.1.markdown
 perlcritic.rc
 po/Makefile
 po/PACKAGE
@@ -36,19 +34,22 @@ po/parcimonie-applet.pot
 share/applications/parcimonie-applet.desktop
 share/applications/parcimonie.desktop
 t/00-load_all.t
-t/05-init-keyring.t
+t/00-report-prereqs.dd
+t/00-report-prereqs.t
+t/01-check_gpg_version.t
 t/30-pickRandomItems.t
 t/31-gpgPublicKeys.t
 t/32-keyserver_defined_on_command_line.t
 t/33-checkGpgHasDefinedKeyserver.t
-t/90-tryRecvKey.t.disabled
+t/90-tryRecvKey.t
 t/91-gpgRecvKeys.t
 t/author-critic.t
 t/author-eol.t
 t/author-no-tabs.t
 t/author-pod-syntax.t
-t/data/gnupg_homedir/gpg.conf
-t/data/gnupg_homedir_without_defined_keyserver/gpg.conf
-t/data/gnupg_homedir_without_gpgconf/placeholder
+t/data/gnupg_homedir/dirmngr.conf
+t/data/gnupg_homedir/dirmngr_ldapservers.conf
 t/data/pubkeys/intrigeri.asc
 t/data/pubkeys/rms.asc
+t/lib/Test/Utils.pm
+t/release-kwalitee.t
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
      "intrigeri <intrigeri@boum.org>"
   ],
   "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 6.009, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010",
   "license" : [
      "perl_5"
   ],
@@ -30,6 +30,7 @@
      "develop" : {
         "requires" : {
            "Test::EOL" : "0",
+            "Test::Kwalitee" : "1.21",
            "Test::More" : "0.88",
            "Test::NoTabs" : "0",
            "Test::Perl::Critic" : "0",
@@ -55,6 +56,7 @@
            "List::Util" : "1.33",
            "Moo" : "1.003",
            "MooX::Options" : "3.83",
+            "MooX::StrictConstructor" : "0.008",
            "MooX::late" : "0.014",
            "Net::DBus" : "v0.33.6",
            "Net::DBus::GLib" : "v0.33.0",
@@ -70,7 +72,12 @@
         }
      },
      "test" : {
+         "recommends" : {
+            "CPAN::Meta" : "2.120900"
+         },
         "requires" : {
+            "ExtUtils::MakeMaker" : "0",
+            "File::Spec" : "0",
            "File::Which" : "1.08",
            "GnuPG::Interface" : "0.42",
            "IO::Handle" : "1.28",
@@ -79,20 +86,23 @@
            "List::Util" : "1.33",
            "Module::Pluggable::Object" : "3.9",
            "Path::Tiny" : "0.038",
+            "Test::More" : "0",
            "Test::Most" : "0.22",
-            "Test::Trap" : "v0.2.1"
+            "Test::Trap" : "v0.2.1",
+            "strictures" : "2.000003"
         }
      }
   },
   "release_status" : "stable",
   "resources" : {
-      "homepage" : "http://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/",
+      "homepage" : "https://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/",
      "repository" : {
         "type" : "git",
         "url" : "git://gaffer.ptitcanardnoir.org/App-Parcimonie.git"
      }
   },
-   "version" : "0.10.3",
-   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0225"
+   "version" : "0.11.0",
+   "x_generated_by_perl" : "v5.26.2",
+   "x_serialization_backend" : "Cpanel::JSON::XS version 4.02"
 }

--- a/META.yml
+++ b/META.yml
@@ -4,6 +4,8 @@ author:
  - 'intrigeri <intrigeri@boum.org>'
 build_requires:
  Cwd: '3.30'
+  ExtUtils::MakeMaker: '0'
+  File::Spec: '0'
  File::Which: '1.08'
  GnuPG::Interface: '0.42'
  IO::Handle: '1.28'
@@ -13,13 +15,15 @@ build_requires:
  Module::Build: '0.3601'
  Module::Pluggable::Object: '3.9'
  Path::Tiny: '0.038'
+  Test::More: '0'
  Test::Most: '0.22'
  Test::Trap: v0.2.1
  autodie: 2.06_01
+  strictures: '2.000003'
 configure_requires:
  Module::Build: '0.3601'
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 6.009, CPAN::Meta::Converter version 2.150010'
+generated_by: 'Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010'
 license: perl
 meta-spec:
  url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -43,6 +47,7 @@ requires:
  List::Util: '1.33'
  Moo: '1.003'
  MooX::Options: '3.83'
+  MooX::StrictConstructor: '0.008'
  MooX::late: '0.014'
  Net::DBus: v0.33.6
  Net::DBus::GLib: v0.33.0
@@ -56,7 +61,8 @@ requires:
  namespace::clean: '0.25'
  version: '0.9909'
 resources:
-  homepage: http://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/
+  homepage: https://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/
  repository: git://gaffer.ptitcanardnoir.org/App-Parcimonie.git
-version: 0.10.3
-x_serialization_backend: 'YAML::Tiny version 1.70'
+version: 0.11.0
+x_generated_by_perl: v5.26.2
+x_serialization_backend: 'YAML::Tiny version 1.73'
--- a/README
+++ b/README
@@ -31,12 +31,12 @@ man command:
 You can also look for information at:

    parcimonie's homepage
-        http://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/
+        https://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/


 LICENSE AND COPYRIGHT
 =====================

-Copyright (C) 2010-2016 intrigeri
+Copyright (C) 2010-2018 intrigeri

 This program is released under the same terms as Perl itself.
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@

 * Robustness++
  - Don't wait indefinitely for spawned gpg processes. Somehow timeout.
-  - use MooX::StrictConstructor (available in Debian Stretch)

 * User feedback
  - custom applet icons
@@ -20,7 +19,6 @@
    and background:
      /usr/share/icons/hicolor/48x48/apps/seahorse.png
  - avoid passing "at .../../xxx.pm" in the signal message
-  - painful torsocks "error" output filtering does not work

 * l10n/i18n:
  - Use Dist::Zilla::LocaleTextDomain and then `dzil msg-scan' +
@@ -29,11 +27,6 @@
  
 * Add functional tests, probably using Test::Trap.

-* Debian packaging
-  - Split into two binary packages: parcimonie and parcimonie-applet
-    · Debian#774529
-    · https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782443#24
-
 * Make sure an update is attempted for every key on a regular basis.
  Remember last time a given key update has been attempted, and randomly
  pick the key to update among the oldest-updated keys. Beware: key update
@@ -46,8 +39,3 @@
    App::Parcimonie::Role::HasCodeset could be quite easily tested

 * Test suite: configure, use and run Tor
-
-* Scroll to the bottom when the log window is open
-
-* Log window: only display the most recent fraction of the log
-  - how much shall we display?
--- a/bin/parcimonie
+++ b/bin/parcimonie
@@ -6,7 +6,7 @@ parcimonie - privacy-friendly helper to refresh a GnuPG keyring

 =head1 VERSION

-Version 0.10.3
+Version 0.11.0

 =head1 SYNOPSIS

@@ -29,23 +29,18 @@ models parcimonie attempts to help coping with.

 =head1 USAGE

-1. Configure GnuPG to be able to use a keyserver.
+1. Configure GnuPG to be able to use a keyserver with Tor.

-Skip this section if you already have configured a keyserver, or if
-you have gnupg2 2.1.15-9 or newer installed (it comes with a sensible
-default keyserver configuration).
+If you already have configured a keyserver and you run Tor
+0.3.0.3-alpha-1 or newer from Debian, then parcimonie will probably
+work fine and you can skip this step. Otherwise, you will probably
+need to replace your keyserver with the one documented below, or to
+enable IPv6 traffic in your Tor client (by enabling the IPv6Traffic
+flag for your SocksPort).

-If you are using GnuPG v2, add to ~/.gnupg/dirmngr.conf something like:
+Add to ~/.gnupg/dirmngr.conf something like:

-        keyserver hkp://pool.sks-keyservers.net
-
-If are still using GnuPG v1, add to gpg.conf something like:
-
-        keyserver hkp://pool.sks-keyservers.net
-
-For hkps:// support with GnuPG v1, install the gnupg1-curl or
-gnupg-curl package, whichever is available in your distribution.
-Or switch to GnuPG v2.
+        keyserver hkp://jirk5u4osbsr34t5.onion

 2. Run "parcimonie --verbose".

@@ -53,8 +48,6 @@ Or switch to GnuPG v2.

 4. Once happy, start the daemon without the --verbose option.
   Note: the Debian package automatically starts the daemon with your X session.
-   For example, GNOME users can configure its startup from the
-   "System -> Preferences -> Startup Applications" menu.

 =head1 OPTIONS

@@ -96,9 +89,11 @@ connections itself.

 intrigeri <intrigeri@boum.org>

-=head1 LICENSE AND COPYRIGHT
+=head1 COPYRIGHT
+
+Copyright (C) 2010-2018 intrigeri <intrigeri@boum.org>

-Copyright (C) 2010-2016 intrigeri <intrigeri@boum.org>
+=head1 LICENSE

 Licensed under the same terms as Perl itself.

@@ -119,7 +114,7 @@ You can also look for information at:

 =item * parcimonie's homepage

-L<http://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/>
+L<https://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/>

 =back

@@ -128,7 +123,7 @@ L<http://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/>
 use strict;
 use warnings;

-our $VERSION = '0.10.3';
+our $VERSION = '0.11.0';

 use FindBin;
 use lib "$FindBin::Bin/../lib";

--- a/bin/parcimonie-applet
+++ b/bin/parcimonie-applet
@@ -2,7 +2,45 @@

 =head1 NAME

-parcimonie-applet - GNOME monitoring applet for parcimonie
+parcimonie-applet - (deprecated) system tray applet for parcimonie
+
+=head1 DESCRIPTION
+
+parcimonie-applet displays an icon in the "system tray" or
+"notification area", following the FreeDesktop System Tray
+Specification on X11. It may or may not work for you, depending on
+your desktop environment.
+
+=head1 DEPRECATION WARNING
+
+The underlying technologies have been deprecated in GNOME 3 and
+GTK+ 3.14. The author of this applet does not use it anymore.
+Therefore, the author cannot support it and this applet will be
+removed from the parcimonie package at some point, unless someone
+takes over its maintenance.
+
+=head2 Future plans
+
+=head3 GNOME
+
+Modern GNOME technologies will be supported at some point, most likely
+in the form of a GNOME Shell extension; the exact user interactions
+have not been designed yet. For more details, see:
+
+=over
+
+=item https://bugs.debian.org/799942
+
+=item https://bugs.debian.org/850217
+
+=back
+
+=head3 Other desktop environments
+
+Ideally, someone should create an applet that works for non-GNOME
+users, possibly using the FreeDesktop Status Notifier Item
+specification. It would have to talk to the parcimonie daemon over
+D-Bus.

 =cut


--- a/bin/parcimonie-torified-gpg
+++ b/bin/parcimonie-torified-gpg
-#!/bin/sh
-
-exec torsocks gpg $@
--- a/dist.ini
+++ b/dist.ini
@@ -3,12 +3,12 @@ main_module      = bin/parcimonie
 author           = intrigeri <intrigeri@boum.org>
 license          = Perl_5
 copyright_holder = intrigeri
-copyright_year   = 2016
+copyright_year   = 2018

 [VersionFromModule]

 [MetaResources]
-homepage = http://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/
+homepage = https://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/
 repository.url  = git://gaffer.ptitcanardnoir.org/App-Parcimonie.git
 repository.type = git

@@ -23,10 +23,12 @@ mb_class = My::Builder
 [InstallGuide] ; must come after ModuleBuild
 [MetaJSON]

+[Test::ReportPrereqs]
 [Test::Perl::Critic]
 [PodSyntaxTests]
 [Test::NoTabs]
 [Test::EOL]
+[Test::Kwalitee]

 [Prereqs]
 namespace::clean = 0.25
@@ -49,6 +51,7 @@ List::Util = 1.33
 Moo = 1.003
 MooX::late = 0.014
 MooX::Options = 3.83
+MooX::StrictConstructor = 0.008
 Net::DBus = 0.33.6
 Net::DBus::GLib = 0.33.0
 Pango = 1.221
@@ -65,6 +68,7 @@ Cwd = 3.30
 Path::Tiny = 0.038

 [Prereqs / TestRequires]
+strictures = 2.000003
 File::Which = 1.08
 GnuPG::Interface = 0.42
 IO::Handle = 1.28

--- a/inc/My/Builder.pm
+++ b/inc/My/Builder.pm
@@ -59,10 +59,8 @@ sub ACTION_test {
    my @args = @_;

    my $datadir = path(getcwd)->child('t', 'data');
-    my @gnupg_homedirs = map {
-        $datadir->child("gnupg_homedir$_")->stringify
-    } ('', '_without_defined_keyserver', '_without_gpgconf');
-    chmod 0700, @gnupg_homedirs;
+    my $gnupg_homedir = $datadir->child('gnupg_homedir')->stringify;
+    chmod 0700, $gnupg_homedir;

    $self->SUPER::ACTION_test(@args);
 };

--- a/lib/App/Parcimonie.pm
+++ b/lib/App/Parcimonie.pm
@@ -10,6 +10,7 @@ use Config::General qw/ParseConfig/;
 use Encode;
 use English qw/-no_match_vars/;
 use File::HomeDir;
+use GnuPG::Options;
 use IPC::System::Simple qw/capturex/;
 use List::MoreUtils qw/uniq/;
 use List::Util qw/shuffle/;
@@ -33,6 +34,14 @@ See bin/parcimonie :)

 =head1 EXPORT

+=head1 COPYRIGHT
+
+Copyright (C) 2010-2018 intrigeri <intrigeri@boum.org>
+
+=head1 LICENSE
+
+Licensed under the same terms as Perl itself.
+
 =cut

 our @EXPORT = qw/pickRandomItems gpgPublicKeys gpgRecvKeys gpg_is_v21
@@ -77,7 +86,7 @@ Returns true iff. it is 2.1 or newer.

 =cut
 sub gpg_is_v21 {
-    version->parse(App::Parcimonie::GnuPG::Interface->new()->version())
+    version->parse(GnuPG::Interface->new()->version())
        >= version->parse('2.1.0');
 }

@@ -94,8 +103,10 @@ sub gpgPublicKeys {
    my $gnupg_options = shift;
    my %gi_args       = @_;

-    my $gnupg = App::Parcimonie::GnuPG::Interface->new(%gi_args);
-    $gnupg->options->hash_init(%{ clone($gnupg_options) });
+    my $gnupg = App::Parcimonie::GnuPG::Interface->new(
+        %gi_args,
+        options => GnuPG::Options->new(%{clone($gnupg_options)}),
+    );
    $gnupg->get_public_keys_hex();
 }

@@ -114,8 +125,10 @@ sub gpgRecvKeys {
    my $gnupg_options = shift;
    my %gi_args       = @_;

-    my $gnupg = App::Parcimonie::GnuPG::Interface->new(%gi_args);
-    $gnupg->options->hash_init(%{ clone($gnupg_options) });
+    my $gnupg = App::Parcimonie::GnuPG::Interface->new(
+        %gi_args,
+        options => GnuPG::Options->new(%{clone($gnupg_options)}),
+    );
    my $err_h = IO::Handle->new();
    my $handles = GnuPG::Handles->new(stderr => $err_h);
    my $pid = $gnupg->recv_keys( handles => $handles, command_args => $keyids );
@@ -171,9 +184,7 @@ sub checkGpgHasDefinedKeyserver {
    my $gnupg_options = shift;
    my $arg_ref       = shift;
    my $gnupg_homedir = $gnupg_options->{homedir};
-    my $gnupg2        = $arg_ref->{gnupg2};

-    if ($gnupg2) {
    my @homedir_args = defined $gnupg_homedir
        ? ('--homedir', $gnupg_homedir)
        : ();
@@ -189,7 +200,6 @@ sub checkGpgHasDefinedKeyserver {
            return;
        }
    }
-    }

    my $gpgconf;
    if (defined $gnupg_homedir) {

--- a/lib/App/Parcimonie/Applet.pm
+++ b/lib/App/Parcimonie/Applet.pm
@@ -31,6 +31,7 @@ use Try::Tiny;
 use namespace::clean;

 with 'App::Parcimonie::Role::HasEncoding';
+use MooX::StrictConstructor;


 =head1 ATTRIBUTES
@@ -148,7 +149,7 @@ a) the GNU General Public License as published by the Free Software Foundation;
 b) the "Artistic License" which comes with Perl.
 },
        'wrap-license' => 1,
-        'website'      => 'http://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/',
+        'website'      => 'https://gaffer.ptitcanardnoir.org/intrigeri/code/parcimonie/',
    )});
    $menu->append($mlog);
    $menu->append(Gtk3::SeparatorMenuItem->new);

--- a/lib/App/Parcimonie/Daemon.pm
+++ b/lib/App/Parcimonie/Daemon.pm
@@ -27,6 +27,7 @@ use namespace::clean;

 with 'App::Parcimonie::Role::HasEncoding';
 use MooX::Options;
+use MooX::StrictConstructor;


 =head1 TYPES
@@ -119,14 +120,6 @@ option 'gnupg_already_torified' => (
    default   => sub { 0; },
 );

-option 'gnupg2' => (
-    documentation => q{Use GnuPG 2.1+ (default: autodetect gpg's version).},
-    isa      => 'Bool',
-    is       => 'ro',
-    required => 0,
-    default  => sub { gpg_is_v21(); },
-);
-
 has 'memory_usage' => (
    isa       => 'Memory::Usage',
    is        => 'ro',
@@ -148,12 +141,10 @@ sub BUILD {

    $self->record_memory_usage("[BUILD]: entering");

+    gpg_is_v21() or croak "parcimonie requires GnuPG 2.1 or newer";
+
    $self->keyserver_defined_on_command_line
-        or checkGpgHasDefinedKeyserver(
-            $self->gnupg_options,
-            {
-                gnupg2 => $self->gnupg2,
-            });
+        or checkGpgHasDefinedKeyserver($self->gnupg_options);

    if ($self->with_dbus) {
        $self->record_memory_usage("[BUILD]: starting to load D-Bus dependencies");
@@ -280,7 +271,7 @@ sub _build_gnupg_options {
    my %opts = (
        extra_args => [],
    );
-    $opts{homedir} = $self->gnupg_homedir if defined $self->gnupg_homedir;
+    $opts{homedir} = $self->gnupg_homedir->stringify if defined $self->gnupg_homedir;
    push @{$opts{extra_args}}, @{$self->gnupg_builtin_args}
        if defined $self->gnupg_builtin_args;
    push @{$opts{extra_args}}, @{$self->gnupg_extra_args}
@@ -341,7 +332,9 @@ sub tryRecvKey {
    my $self  = shift;
    my $keyid = shift;
    my $gpg_output;
-    my $gpg_error;
+    my $gpg_error = '';
+    my $filtered_gpg_error = '';
+    my $success;

    $self->debug(sprintf("tryRecvKey: trying to fetch %s", $keyid));
    $self->notify({ signal => 'FetchBegin', keyid => $keyid });
@@ -351,21 +344,43 @@ sub tryRecvKey {
            [ $keyid ],
            $self->gnupg_options,
            already_torified => $self->gnupg_already_torified,
-            gnupg2           => $self->gnupg2,
        );
+        $success = 1;
    } catch {
        $gpg_error = $_;
+        $success = 0;
    };

+    if ($success) {
        $gpg_output ||= '';
-    my $success = 0;
-    if (defined $gpg_error) {
-        warn $self->encoding->encode($gpg_error);
+        $gpg_error = '';
+        $self->debug($gpg_output);
    }
    else {
-        $self->debug($gpg_output);
-        $success = 1;
-        $gpg_error = '';
+        if (defined $gpg_error) {
+            $filtered_gpg_error = $gpg_error;
+            # Filter out lines such as:
+            #   gpg: keyserver receive failed: No data
+            #   gpg: key "0123456789ABCDEF0123456789ABCDEF01234567" not found: Not found
+            # ... followed by " at /path/to/App/Parcimonie/Daemon.pm line 350"
+            $filtered_gpg_error =~ s{
+                                        ^gpg:\s+
+                                        (?:
+                                            keyserver\s+receive\s+failed:\s+No\s+data
+                                        |
+                                            key\s+"[^"\n]+"\s+not\s+found:\s+Not\s+found
+                                        )
+                                        $
+                                        (?:
+                                            [\n]
+                                            \s+at\s+[^\n]+\s+line\s+\d+[.]
+                                            $
+                                        )?
+                                        [\n]*
+                                }{}xmsg;
+            warn $self->encoding->encode($filtered_gpg_error)
+                if length($filtered_gpg_error);
+        }
    }

    $self->notify({
@@ -414,7 +429,6 @@ sub iterate {
    my @public_keys = gpgPublicKeys(
        $self->gnupg_options,
        already_torified => $self->gnupg_already_torified,
-        gnupg2           => $self->gnupg2,
    );
    unless (@public_keys) {
        warn "No public key was found.";

--- a/lib/App/Parcimonie/GnuPG/Interface.pm
+++ b/lib/App/Parcimonie/GnuPG/Interface.pm
@@ -18,6 +18,9 @@ use IPC::System::Simple qw{system systemx};

 use namespace::clean;

+# This child class cannot use MooX::StrictConstructor:
+# see "Inheritance" section in its doc for details.
+
 extends 'GnuPG::Interface';

 has 'already_torified' => (
@@ -27,38 +30,21 @@ has 'already_torified' => (
    default  => sub { 0; },
 );

-has 'gnupg2' => (
-    isa      => 'Bool',
-    is       => 'rw',
-    required => 0,
-    default  => sub { 0; },
-);
-
 after 'BUILD' => sub {
    my $self = shift;
-    if ($self->gnupg2) {
    unless ($self->already_torified) {
        my $gnupg_homedir = defined $self->options->homedir()
            ? $self->options->homedir()
            : '';
        system(
            q{echo 'use-tor:0:1' | } .
-                "GNUPGHOME='$gnupg_homedir' gpgconf --change-options dirmngr"
+            "GNUPGHOME='$gnupg_homedir' gpgconf --change-options dirmngr " .
+            ">/dev/null"
        );
        # Passing --runtime to the previous command does not work,
        # so we have to:
        system("GNUPGHOME='$gnupg_homedir' gpgconf --reload dirmngr");
    }
-        $self->call('gpg2');
-    }
-    else {
-        unless ($self->already_torified) {
-            foreach my $prog (qw{torsocks parcimonie-torified-gpg}) {
-                defined which($prog) or croak "$prog not found in \$PATH";
-            }
-            $self->call('parcimonie-torified-gpg');
-        }
-    }
 };

 sub get_public_keys_hex {

--- a/parcimonie-torified-gpg.1.markdown
+++ b/parcimonie-torified-gpg.1.markdown
-% PARCIMONIE-TORIFIED-GPG(1) parcimonie-torified-gpg user manual
-% parcimonie and this manual page were written by intrigeri <intrigeri@boum.org>
-% July 21, 2011
-
-NAME
-====
-
-parcimonie-torified-gpg - torified gpg wrapper for parcimonie
-
-SYNOPSIS
-========
-
-	parcimonie-torified-gpg GPG_ARGS
-
-Calls the `torsocks gpg` command, passing it the arguments received on
-the initial command line.
--- a/t/00-load_all.t
+++ b/t/00-load_all.t
 use Test::Most;

+use strictures 2;
 use Path::Tiny;
 use Module::Pluggable::Object;
 eval { require Win32; };