Merge pull request #441 from str4d/437-cli-cleanups

CLI cleanups
str4d · Jan 8, 2024 · 50cb0a5 · 50cb0a5
2 parents d3ded6c + a26b7ea
commit 50cb0a5
Show file tree

Hide file tree

Showing 57 changed files with 793 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/age-plugin/README.md b/age-plugin/README.md
@@ -120,7 +120,7 @@ impl IdentityPluginV1 for IdentityPlugin {
         index: usize,
         plugin_name: &str,
         bytes: &[u8]
-    ) -> Result<(), identityw::Error> {
+    ) -> Result<(), identity::Error> {
         todo!()
     }
 
@@ -149,8 +149,8 @@ fn main() -> io::Result<()> {
         // The plugin was started by an age client; run the state machine.
         run_state_machine(
             &state_machine,
-            || RecipientPlugin,
-            || IdentityPlugin,
+            Some(|| RecipientPlugin),
+            Some(|| IdentityPlugin),
         )?;
         return Ok(());
     }

diff --git a/rage/Cargo.toml b/rage/Cargo.toml
@@ -80,6 +80,7 @@ clap = { version = "4", default-features = false }
 clap_complete = "4"
 flate2 = "1"
 man = "0.3"
+trycmd = "0.14"
 
 [features]
 default = ["ssh"]

diff --git a/rage/i18n/en-US/rage.ftl b/rage/i18n/en-US/rage.ftl
@@ -101,15 +101,18 @@ rec-enc-broken-stdout = Are you piping to a program that isn't reading from stdi
 
 err-enc-broken-file = Could not write to file: {$err}
 
-err-enc-invalid-recipient = Invalid recipient '{$recipient}'
+err-enc-invalid-recipient = Invalid recipient '{$recipient}'.
+
+err-enc-invalid-recipients-file =
+    Recipients file '{$filename}' contains non-recipient data on line {$line_number}.
 
 err-enc-missing-recipients = Missing recipients.
 rec-enc-missing-recipients = Did you forget to specify {-flag-recipient}?
 
 err-enc-mixed-identity-passphrase = {-flag-identity} can't be used with {-flag-passphrase}.
-err-enc-mixed-recipient-passphrase = {-flag-recipient} can't be used with {-flag-passphrase}
-err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} can't be used with {-flag-passphrase}
-err-enc-passphrase-without-file = File to encrypt must be passed as an argument when using {-flag-passphrase}
+err-enc-mixed-recipient-passphrase = {-flag-recipient} can't be used with {-flag-passphrase}.
+err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} can't be used with {-flag-passphrase}.
+err-enc-passphrase-without-file = File to encrypt must be passed as an argument when using {-flag-passphrase}.
 
 err-enc-plugin-name-flag = {-flag-plugin-name} can't be used with {-flag-encrypt}.
 

diff --git a/rage/i18n/es-AR/rage.ftl b/rage/i18n/es-AR/rage.ftl
@@ -95,15 +95,15 @@ rec-enc-broken-stdout = Estás enviando por pipe a un programa que no está leye
 
 err-enc-broken-file = No se pudo escribir al archivo: {$err}
 
-err-enc-invalid-recipient = Destinatario inválido '{$recipient}'
+err-enc-invalid-recipient = Destinatario inválido '{$recipient}'.
 
 err-enc-missing-recipients = No se encontraron destinatarios.
 rec-enc-missing-recipients = ¿Te olvidaste de especificar {-flag-recipient}?
 
 err-enc-mixed-identity-passphrase = {-flag-identity} no puede ser usado con {-flag-passphrase}.
-err-enc-mixed-recipient-passphrase = {-flag-recipient} no puede ser usado con {-flag-passphrase}
-err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} no puede ser usado con {-flag-passphrase}
-err-enc-passphrase-without-file = El archivo a encriptar debe ser pasado como argumento cuando se utiliza {-flag-passphrase}
+err-enc-mixed-recipient-passphrase = {-flag-recipient} no puede ser usado con {-flag-passphrase}.
+err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} no puede ser usado con {-flag-passphrase}.
+err-enc-passphrase-without-file = El archivo a encriptar debe ser pasado como argumento cuando se utiliza {-flag-passphrase}.
 
 ## Decryption errors
 

diff --git a/rage/i18n/it/rage.ftl b/rage/i18n/it/rage.ftl
@@ -103,15 +103,15 @@ rec-enc-broken-stdout = Stai usando una pipe verso un programma che non sta legg
 
 err-enc-broken-file = Impossibile scrivere sul file: {$err}
 
-err-enc-invalid-recipient = Destinatario '{$recipient}' invalido
+err-enc-invalid-recipient = Destinatario '{$recipient}' invalido.
 
 err-enc-missing-recipients = Destinatari mancanti.
 rec-enc-missing-recipients = Hai dimenticato di specificare {-flag-recipient}?
 
 err-enc-mixed-identity-passphrase = {-flag-identity} non può essere usato assieme a {-flag-passphrase}.
-err-enc-mixed-recipient-passphrase = {-flag-recipient} non può essere usato assieme a {-flag-passphrase}
-err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} non può essere usato assieme a {-flag-passphrase}
-err-enc-passphrase-without-file = Il file da cifrare deve essere passato come argomento quando si usa {-flag-passphrase}
+err-enc-mixed-recipient-passphrase = {-flag-recipient} non può essere usato assieme a {-flag-passphrase}.
+err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} non può essere usato assieme a {-flag-passphrase}.
+err-enc-passphrase-without-file = Il file da cifrare deve essere passato come argomento quando si usa {-flag-passphrase}.
 
 err-enc-plugin-name-flag = {-flag-plugin-name} non può essere usato assieme a {-flag-encrypt}.
 

diff --git a/rage/i18n/zh-CN/rage.ftl b/rage/i18n/zh-CN/rage.ftl
@@ -93,15 +93,15 @@ rec-enc-broken-stdout = 您是否输出至非从 stdin 读取数据的程序？
 
 err-enc-broken-file = 未能写入文件： {$err}
 
-err-enc-invalid-recipient = 无效接收方 '{$recipient}'
+err-enc-invalid-recipient = 无效接收方 '{$recipient}'。
 
 err-enc-missing-recipients = 缺少接收方。
 rec-enc-missing-recipients = 您是否忘记指定 {-flag-recipient} 标记？
 
 err-enc-mixed-identity-passphrase = {-flag-identity} 和 {-flag-passphrase} 标记不可联用。
 err-enc-mixed-recipient-passphrase = {-flag-recipient} 和 {-flag-passphrase} 标记不可联用。
 err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} 和 {-flag-passphrase} 标记不可联用。
-err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 时， 必将要加密的文件传递为参数
+err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 时， 必将要加密的文件传递为参数。
 
 ## Decryption errors
 

diff --git a/rage/i18n/zh-TW/rage.ftl b/rage/i18n/zh-TW/rage.ftl
@@ -93,15 +93,15 @@ rec-enc-broken-stdout = 您是否輸出至非從 stdin 讀取數據的程序？
 
 err-enc-broken-file = 未能寫入文件： {$err}
 
-err-enc-invalid-recipient = 無效接收方 '{$recipient}'
+err-enc-invalid-recipient = 無效接收方 '{$recipient}'。
 
 err-enc-missing-recipients = 缺少接收方。
 rec-enc-missing-recipients = 您是否忘記指定 {-flag-recipient} 標記？
 
 err-enc-mixed-identity-passphrase = {-flag-identity} 和 {-flag-passphrase} 標記不可聯用。
 err-enc-mixed-recipient-passphrase = {-flag-recipient} 和 {-flag-passphrase} 標記不可聯用。
 err-enc-mixed-recipients-file-passphrase = {-flag-recipients-file} 和 {-flag-passphrase} 標記不可聯用。
-err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 時， 必將要加密的文件傳遞為參數
+err-enc-passphrase-without-file = 在使用 {-flag-passphrase} 時， 必將要加密的文件傳遞為參數。
 
 ## Decryption errors