Rename sq verify --signer-cert to --signer.

- Fixes #372.

NEWS

@@ -95,6 +95,7 @@
    - Add a new flag `--all` to `sq network wkd publish` and `sq
      network dane generate` that adds all certificates with a user ID
      in the target domain that can be authenticated.
+   - The argument `sq verify --signer-cert` is now called `--signer`.
 
 * Changes in 0.38.0
 ** Notable changes

src/cli/verify.rs

@@ -126,14 +126,16 @@ pub struct Command {
                             will not be considered verified."
     )]
     pub signatures: usize,
+
     #[clap(
         long = "signer-file",
         value_name = "CERT_FILE",
         help = "Verify signatures using the certificate in CERT_FILE",
     )]
-    pub sender_file: Vec<PathBuf>,
+    pub signer_files: Vec<PathBuf>,
+
     #[clap(
-        long = "signer-cert",
+        long = "signer",
         value_name = "FINGERPRINT|KEYID",
         help = "Verify signatures using the specified certificate",
         long_help = "\
@@ -143,6 +145,6 @@ authenticated.  When this option is not provided, the certificate is
 still read from the certificate store, if it exists, but it is not
 considered authenticated."
     )]
-    pub sender_certs: Vec<KeyHandle>,
+    pub signer_certs: Vec<KeyHandle>,
 }
 

src/commands/verify.rs

@@ -27,14 +27,13 @@ pub fn dispatch(sq: Sq, command: cli::verify::Command)
     let mut input = command.input.open()?;
     let mut output = command.output.create_safe(&sq)?;
     let signatures = command.signatures;
-    let mut certs = load_certs(
-        command.sender_file.iter())?;
+    let mut certs = load_certs(command.signer_files.iter())?;
     certs.extend(
-        sq.lookup(command.sender_certs,
+        sq.lookup(command.signer_certs,
                       Some(KeyFlags::empty().set_signing()),
                       true,
                       false)
-            .context("--sender-cert")?);
+            .context("loading a --signer certificate")?);
     verify(sq, &mut input,
            command.detached,
            &mut output, signatures, certs)?;

tests/integration/sq_sign.rs

@@ -975,7 +975,7 @@ fn sq_sign_using_cert_store() -> Result<()> {
     let mut cmd = sq.command();
     cmd.arg("--cert-store").arg(&certd)
         .arg("verify")
-        .arg("--signer-cert").arg(&alice.fingerprint().to_string())
+        .arg("--signer").arg(&alice.fingerprint().to_string())
         .arg(&msg_pgp);
     let output = cmd.output().expect("success");
     let stdout = String::from_utf8_lossy(&output.stdout);