From 7f067c55e5f7eee9b180b6a63ae6cfebf3b76f0d Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 11 Apr 2022 13:47:41 +0200
Subject: [PATCH] Rename 'fetch' subcommand to 'get'

---
 wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java        | 6 ++++--
 .../java/pgp/wkd/cli/command/{Fetch.java => GetCmd.java}  | 8 ++++----
 ...omGithubPages.java => TestGetKeysFromGithubPages.java} | 2 +-
 .../java/pgp/wkd/cli/test_suite/TestSuiteTestRunner.java  | 8 ++++----
 4 files changed, 13 insertions(+), 11 deletions(-)
 rename wkd-java-cli/src/main/java/pgp/wkd/cli/command/{Fetch.java => GetCmd.java} (92%)
 rename wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/{TestFetchKeysFromGithubPages.java => TestGetKeysFromGithubPages.java} (94%)

diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java
index d4ff56d..4fed57d 100644
--- a/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java
+++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java
@@ -6,13 +6,15 @@ package pgp.wkd.cli;
 
 import pgp.wkd.exception.CertNotFetchableException;
 import pgp.wkd.exception.RejectedCertificateException;
-import pgp.wkd.cli.command.Fetch;
+import pgp.wkd.cli.command.GetCmd;
 import picocli.CommandLine;
 
 @CommandLine.Command(
+        name = "wkd",
+        description = "Interact with the Web Key Directory",
         subcommands = {
                 CommandLine.HelpCommand.class,
-                Fetch.class
+                GetCmd.class
         }
 )
 public class WKDCLI {
diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/command/GetCmd.java
similarity index 92%
rename from wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java
rename to wkd-java-cli/src/main/java/pgp/wkd/cli/command/GetCmd.java
index b977bf2..b5d7c05 100644
--- a/wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java
+++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/command/GetCmd.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 @CommandLine.Command(
-        name = "fetch",
-        description = "Fetch an OpenPGP Certificate via the Web Key Directory"
+        name = "get",
+        description = "Get an OpenPGP Certificate via the Web Key Directory"
 )
-public class Fetch implements Runnable {
+public class GetCmd implements Runnable {
 
     @CommandLine.Parameters(
             index = "0",
@@ -67,7 +67,7 @@ public class Fetch implements Runnable {
             throw new NullPointerException("CertificateDiscoverer cannot be null.");
         }
 
-        Fetch.discoverer = discoverer;
+        GetCmd.discoverer = discoverer;
     }
 
     private WKDAddress addressFromUserId(String userId) {
diff --git a/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestFetchKeysFromGithubPages.java b/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java
similarity index 94%
rename from wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestFetchKeysFromGithubPages.java
rename to wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java
index ef7cc8f..fa96e4a 100644
--- a/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestFetchKeysFromGithubPages.java
+++ b/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java
@@ -12,7 +12,7 @@ import pgp.wkd.cli.WKDCLI;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @Disabled("For privacy reasons")
-public class TestFetchKeysFromGithubPages extends RedirectSystemStreamsTest {
+public class TestGetKeysFromGithubPages extends RedirectSystemStreamsTest {
 
     // Valid WKD publication.
     // Cert is available at https://pgpainless.github.io/.well-known/openpgpkey/hu/eprjcbeppbna3f6xabhtpddzpn41nknw
diff --git a/wkd-java-cli/src/test/java/pgp/wkd/cli/test_suite/TestSuiteTestRunner.java b/wkd-java-cli/src/test/java/pgp/wkd/cli/test_suite/TestSuiteTestRunner.java
index a7596d3..1a24f27 100644
--- a/wkd-java-cli/src/test/java/pgp/wkd/cli/test_suite/TestSuiteTestRunner.java
+++ b/wkd-java-cli/src/test/java/pgp/wkd/cli/test_suite/TestSuiteTestRunner.java
@@ -10,7 +10,7 @@ import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import pgp.wkd.cli.PGPainlessCertificateParser;
 import pgp.wkd.cli.WKDCLI;
-import pgp.wkd.cli.command.Fetch;
+import pgp.wkd.cli.command.GetCmd;
 import pgp.wkd.discovery.CertificateDiscoverer;
 import pgp.wkd.discovery.ValidatingCertificateDiscoverer;
 import pgp.wkd.discovery.DiscoveryMethod;
@@ -45,7 +45,7 @@ public class TestSuiteTestRunner {
         // Fetch certificates from a local directory instead of the internetzzz.
         CertificateDiscoverer discoverer = new ValidatingCertificateDiscoverer(
                 new PGPainlessCertificateParser(), new DirectoryBasedCertificateFetcher(tempPath));
-        Fetch.setCertificateDiscoverer(discoverer);
+        GetCmd.setCertificateDiscoverer(discoverer);
     }
 
     @TestFactory
@@ -61,7 +61,7 @@ public class TestSuiteTestRunner {
 
             String mail = testCase.getLookupMailAddress();
             int exitCode = WKDCLI.execute(new String[] {
-                    "fetch", "--armor", mail
+                    "get", "--armor", mail
             });
 
             if (testCase.isExpectSuccess()) {
@@ -74,6 +74,6 @@ public class TestSuiteTestRunner {
 
     @AfterAll
     public static void reset() {
-        Fetch.setCertificateDiscoverer(Fetch.DEFAULT_DISCOVERER);
+        GetCmd.setCertificateDiscoverer(GetCmd.DEFAULT_DISCOVERER);
     }
 }