chore(release): Release scryptenc-cli version 0.7.13

.github/workflows/CD.yaml

@@ -76,7 +76,7 @@ jobs:
           targets: ${{ matrix.target }}
       - name: Install cross
         if: ${{ matrix.use-cross }}
-        uses: taiki-e/[email protected].12
+        uses: taiki-e/[email protected].16
         with:
           tool: cross
       - name: Cache build artifacts

Cargo.toml

@@ -17,7 +17,7 @@ repository = "https://github.com/sorairolake/scryptenc-rs"
 
 [workspace.dependencies]
 anyhow = "1.0.86"
-clap = { version = "4.5.11", features = ["derive"] }
+clap = { version = "4.5.13", features = ["derive"] }
 dialoguer = { version = "0.11.0", default-features = false, features = ["password"] }
 
 [profile.release.package.scryptenc-cli]

crates/cli/CHANGELOG.adoc

@@ -19,6 +19,13 @@ All notable changes to this project will be documented in this file.
 The format is based on https://keepachangelog.com/[Keep a Changelog], and this
 project adheres to https://semver.org/[Semantic Versioning].
 
+== {compare-url}/scryptenc-cli-v0.7.12\...scryptenc-cli-v0.7.13[0.7.13] - 2024-08-04
+
+=== Changed
+
+* Change `--passphrase-from-env` to take an UTF-8 string as an environment
+  variable key ({pull-request-url}/407[#407])
+
 == {compare-url}/scryptenc-cli-v0.7.11\...scryptenc-cli-v0.7.12[0.7.12] - 2024-04-17
 
 === Changed

crates/cli/Cargo.toml

@@ -4,7 +4,7 @@
 
 [package]
 name = "scryptenc-cli"
-version = "0.7.12"
+version = "0.7.13"
 authors.workspace = true
 edition.workspace = true
 rust-version.workspace = true
@@ -27,17 +27,17 @@ path = "src/main.rs"
 anyhow.workspace = true
 byte-unit = "5.1.4"
 clap = { workspace = true, features = ["wrap_help"] }
-clap_complete = "4.5.11"
+clap_complete = "4.5.12"
 clap_complete_nushell = "4.5.3"
 dialoguer.workspace = true
 fraction = { version = "0.15.3", default-features = false }
 humantime = "2.1.0"
 once_cell = "1.19.0"
 scryptenc = { version = "0.9.8", path = "../scryptenc" }
 serde = { version = "1.0.204", features = ["derive"], optional = true }
-serde_json = { version = "1.0.121", optional = true }
+serde_json = { version = "1.0.122", optional = true }
 sysexits = "0.8.1"
-sysinfo = "0.30.13"
+sysinfo = "0.31.2"
 thiserror = "1.0.63"
 
 [dev-dependencies]

crates/cli/README.md

@@ -86,7 +86,7 @@ Output:
 
 ### Generate shell completion
 
-`--generate-completion` option generates shell completions to stdout.
+`--generate-completion` option generates shell completions to standard output.
 
 The following shells are supported:
 

crates/cli/src/app.rs

@@ -13,10 +13,11 @@ use crate::{
     input, output, params, passphrase,
 };
 
-/// Ensures that there are no conflicts if reading the passphrase from stdin.
+/// Ensures that there are no conflicts if reading the passphrase from standard
+/// input.
 fn ensure_stdin_does_not_conflict(path: &Path) -> anyhow::Result<()> {
     if path == Path::new("-") {
-        bail!("cannot read both passphrase and input data from stdin");
+        bail!("cannot read both passphrase and input data from standard input");
     }
     Ok(())
 }

crates/cli/src/cli.rs

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 use std::{
-    ffi::OsString,
     fmt,
     io::{self, Write},
     ops::Deref,
@@ -40,7 +39,7 @@ const ENC_AFTER_LONG_HELP: &str = "See `rscrypt-enc(1)` for more details.";
 const DEC_AFTER_LONG_HELP: &str = "See `rscrypt-dec(1)` for more details.";
 
 const INFO_AFTER_LONG_HELP: &str = concat!(
-    "The result will be write to stdout.\n",
+    "The result will be write to standard output.\n",
     '\n',
     "See `rscrypt-info(1)` for more details."
 );
@@ -60,7 +59,7 @@ const INFO_AFTER_LONG_HELP: &str = concat!(
 pub struct Opt {
     /// Generate shell completion.
     ///
-    /// The completion is output to stdout.
+    /// The completion is output to standard output.
     #[arg(long, value_enum, value_name("SHELL"))]
     pub generate_completion: Option<Shell>,
 
@@ -166,7 +165,7 @@ pub struct Encrypt {
     #[arg(long, group("passphrase"))]
     pub passphrase_from_tty: bool,
 
-    /// Read the passphrase from stdin.
+    /// Read the passphrase from standard input.
     #[arg(long, group("passphrase"))]
     pub passphrase_from_stdin: bool,
 
@@ -179,7 +178,7 @@ pub struct Encrypt {
     /// Note that storing a passphrase in an environment variable can be a
     /// security risk.
     #[arg(long, value_name("VAR"), group("passphrase"))]
-    pub passphrase_from_env: Option<OsString>,
+    pub passphrase_from_env: Option<String>,
 
     /// Read the passphrase from the file.
     ///
@@ -198,13 +197,14 @@ pub struct Encrypt {
 
     /// Input file.
     ///
-    /// If "-" is specified, data will be read from stdin.
+    /// If "-" is specified, data will be read from standard input.
     #[arg(value_name("INFILE"), value_hint(ValueHint::FilePath))]
     pub input: PathBuf,
 
     /// Output file.
     ///
-    /// If [OUTFILE] is not specified, the result will be write to stdout.
+    /// If [OUTFILE] is not specified, the result will be write to standard
+    /// output.
     #[arg(value_name("OUTFILE"), value_hint(ValueHint::FilePath))]
     pub output: Option<PathBuf>,
 }
@@ -253,7 +253,7 @@ pub struct Decrypt {
     #[arg(long, group("passphrase"))]
     pub passphrase_from_tty: bool,
 
-    /// Read the passphrase from stdin.
+    /// Read the passphrase from standard input.
     #[arg(long, group("passphrase"))]
     pub passphrase_from_stdin: bool,
 
@@ -262,7 +262,7 @@ pub struct Decrypt {
     /// Note that storing a passphrase in an environment variable can be a
     /// security risk.
     #[arg(long, value_name("VAR"), group("passphrase"))]
-    pub passphrase_from_env: Option<OsString>,
+    pub passphrase_from_env: Option<String>,
 
     /// Read the passphrase from the file.
     ///
@@ -281,13 +281,14 @@ pub struct Decrypt {
 
     /// Input file.
     ///
-    /// If "-" is specified, data will be read from stdin.
+    /// If "-" is specified, data will be read from standard input.
     #[arg(value_name("INFILE"), value_hint(ValueHint::FilePath))]
     pub input: PathBuf,
 
     /// Output file.
     ///
-    /// If [OUTFILE] is not specified, the result will be write to stdout.
+    /// If [OUTFILE] is not specified, the result will be write to standard
+    /// output.
     #[arg(value_name("OUTFILE"), value_hint(ValueHint::FilePath))]
     pub output: Option<PathBuf>,
 }
@@ -301,7 +302,7 @@ pub struct Information {
 
     /// Input file.
     ///
-    /// If "-" is specified, data will be read from stdin.
+    /// If "-" is specified, data will be read from standard input.
     #[arg(value_name("FILE"), value_hint(ValueHint::FilePath))]
     pub input: PathBuf,
 }

crates/cli/src/input.rs

@@ -16,7 +16,7 @@ pub fn read(path: &Path) -> anyhow::Result<Vec<u8>> {
         let mut buf = Vec::new();
         io::stdin()
             .read_to_end(&mut buf)
-            .context("could not read data from stdin")?;
+            .context("could not read data from standard input")?;
         Ok(buf)
     } else {
         fs::read(path).with_context(|| format!("could not read data from {}", path.display()))