Rename sq encrypt --symmetric to --with-password.

- This is an ugly gpgism.  All encrypted messages are symmetrically
    encrypted.  Not all password-encrypted messages encrypt the
    session key symmetrically.  Use language the user understands.

  - Fixes #331.

src/cli/encrypt.rs

@@ -171,7 +171,7 @@ pub struct Command {
     pub signer_key: Vec<KeyHandle>,
 
     #[clap(
-        long = "symmetric",
+        long = "with-password",
         help = "Prompt to add a password to encrypt with",
         long_help =
             "Prompt to add a password to encrypt with.  \
@@ -186,7 +186,7 @@ pub struct Command {
     pub symmetric: u8,
 
     #[clap(
-        long = "symmetric-password-file",
+        long = "with-password-file",
         value_name = "PASSWORD_FILE",
         help = "\
 File containing password to encrypt the secret key material",

tests/integration/sq_encrypt.rs

@@ -412,7 +412,7 @@ fn sq_encrypt_with_password() -> Result<()>
     let cipher_file = sq.base().join("ciphertext");
     let mut cmd = sq.command();
     cmd.args(["encrypt",
-              "--symmetric-password-file", &password_file.display().to_string(),
+              "--with-password-file", &password_file.display().to_string(),
               "--output", &cipher_file.display().to_string(),
               &plain_file.display().to_string()]);
     sq.run(cmd, Some(true));