release: 0.4.6

Author: joshstoik1

.github/workflows/msrv.yaml

@@ -1,48 +1,50 @@
 # Project Dependencies
     Package:   cargo-bashman
-    Version:   0.4.5
-    Generated: 2024-02-08 19:39:10 UTC
+    Version:   0.4.6
+    Generated: 2024-02-28 01:59:04 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
-| [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.9.5 | [Josh Stoik](mailto:[email protected]) | WTFPL |
-| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.7 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
-| [argyle](https://github.com/Blobfolio/argyle) | 0.7.1 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [bashman_core](https://github.com/Blobfolio/bashman) | 0.4.5 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.10.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [adler](https://github.com/jonas-schievink/adler.git) | 1.0.2 | [Jonas Schievink](mailto:[email protected]) | 0BSD, Apache-2.0, or MIT |
+| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.10 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
+| [argyle](https://github.com/Blobfolio/argyle) | 0.7.2 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [bashman_core](https://github.com/Blobfolio/bashman) | 0.4.6 | [Josh Stoik](mailto:[email protected]) | WTFPL |
 | [camino](https://github.com/camino-rs/camino) | 1.1.6 | [Without Boats](mailto:[email protected]), [Ashley Williams](mailto:[email protected]), [Steve Klabnik](mailto:[email protected]), and [Rain](mailto:[email protected]) | Apache-2.0 or MIT |
-| [cargo-platform](https://github.com/rust-lang/cargo) | 0.1.6 |  | Apache-2.0 or MIT |
+| [cargo-platform](https://github.com/rust-lang/cargo) | 0.1.7 |  | Apache-2.0 or MIT |
 | [cargo_metadata](https://github.com/oli-obk/cargo_metadata) | 0.18.1 | [Oliver Schneider](mailto:[email protected]) | MIT |
 | [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
+| [crc32fast](https://github.com/srijs/rust-crc32fast) | 1.4.0 | [Sam Rijs](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
 | [dactyl](https://github.com/Blobfolio/dactyl) | 0.7.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
 | [equivalent](https://github.com/cuviper/equivalent) | 1.0.1 |  | Apache-2.0 or MIT |
-| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.12.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [flate2](https://github.com/rust-lang/flate2-rs) | 1.0.28 | [Alex Crichton](mailto:[email protected]) and [Josh Triplett](mailto:[email protected]) | Apache-2.0 or MIT |
+| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.13.1 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
 | [hashbrown](https://github.com/rust-lang/hashbrown) | 0.14.3 | [Amanieu d'Antras](mailto:[email protected]) | Apache-2.0 or MIT |
-| [indexmap](https://github.com/indexmap-rs/indexmap) | 2.2.2 |  | Apache-2.0 or MIT |
+| [indexmap](https://github.com/indexmap-rs/indexmap) | 2.2.3 |  | Apache-2.0 or MIT |
 | [itoa](https://github.com/dtolnay/itoa) | 1.0.10 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [libdeflate-sys](https://github.com/adamkewley/libdeflater) | 1.19.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
-| [libdeflater](https://github.com/adamkewley/libdeflater) | 1.19.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
 | [memchr](https://github.com/BurntSushi/memchr) | 2.7.1 | [Andrew Gallant](mailto:[email protected]) and bluss | MIT or Unlicense |
+| [miniz_oxide](https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide) | 0.7.2 | [Frommi](mailto:[email protected]) and [oyvindln](mailto:[email protected]) | Apache-2.0, MIT, or Zlib |
 | [oxford_join](https://github.com/Blobfolio/oxford_join) | 0.2.9 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
 | [proc-macro2](https://github.com/dtolnay/proc-macro2) | 1.0.78 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
 | [quote](https://github.com/dtolnay/quote) | 1.0.35 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [ryu](https://github.com/dtolnay/ryu) | 1.0.16 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or BSL-1.0 |
-| [semver](https://github.com/dtolnay/semver) | 1.0.21 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [serde](https://github.com/serde-rs/serde) | 1.0.196 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [serde_derive](https://github.com/serde-rs/serde) | 1.0.196 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [serde_json](https://github.com/serde-rs/json) | 1.0.113 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [ryu](https://github.com/dtolnay/ryu) | 1.0.17 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or BSL-1.0 |
+| [semver](https://github.com/dtolnay/semver) | 1.0.22 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [serde](https://github.com/serde-rs/serde) | 1.0.197 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [serde_derive](https://github.com/serde-rs/serde) | 1.0.197 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [serde_json](https://github.com/serde-rs/json) | 1.0.114 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
 | [serde_spanned](https://github.com/toml-rs/toml) | 0.6.5 |  | Apache-2.0 or MIT |
-| [syn](https://github.com/dtolnay/syn) | 2.0.48 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [thiserror](https://github.com/dtolnay/thiserror) | 1.0.56 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [thiserror-impl](https://github.com/dtolnay/thiserror) | 1.0.56 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [syn](https://github.com/dtolnay/syn) | 2.0.51 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [thiserror](https://github.com/dtolnay/thiserror) | 1.0.57 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [thiserror-impl](https://github.com/dtolnay/thiserror) | 1.0.57 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
 | [tinyvec](https://github.com/Lokathor/tinyvec) | 1.6.0 | [Lokathor](mailto:[email protected]) | Apache-2.0, MIT, or Zlib |
 | [tinyvec_macros](https://github.com/Soveu/tinyvec_macros) | 0.1.1 | [Soveu](mailto:[email protected]) | Apache-2.0, MIT, or Zlib |
 | [toml](https://github.com/toml-rs/toml) | 0.8.10 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
 | [toml_datetime](https://github.com/toml-rs/toml) | 0.6.5 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
-| [toml_edit](https://github.com/toml-rs/toml) | 0.22.4 | [Andronik Ordian](mailto:[email protected]) and [Ed Page](mailto:[email protected]) | Apache-2.0 or MIT |
+| [toml_edit](https://github.com/toml-rs/toml) | 0.22.6 | [Andronik Ordian](mailto:[email protected]) and [Ed Page](mailto:[email protected]) | Apache-2.0 or MIT |
 | [trimothy](https://github.com/Blobfolio/trimothy) | 0.2.2 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
 | [unicode-bidi](https://github.com/servo/unicode-bidi) | 0.3.15 | The Servo Project Developers | Apache-2.0 or MIT |
 | [unicode-ident](https://github.com/dtolnay/unicode-ident) | 1.0.12 | [David Tolnay](mailto:[email protected]) | Apache-2.0 AND Unicode-DFS-2016 or MIT |
-| [unicode-normalization](https://github.com/unicode-rs/unicode-normalization) | 0.1.22 | [kwantam](mailto:[email protected]) and [Manish Goregaokar](mailto:[email protected]) | Apache-2.0 or MIT |
+| [unicode-normalization](https://github.com/unicode-rs/unicode-normalization) | 0.1.23 | [kwantam](mailto:[email protected]) and [Manish Goregaokar](mailto:[email protected]) | Apache-2.0 or MIT |
 | [utc2k](https://github.com/Blobfolio/utc2k) | 0.8.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [winnow](https://github.com/winnow-rs/winnow) | 0.5.39 |  | MIT |
+| [winnow](https://github.com/winnow-rs/winnow) | 0.6.2 |  | MIT |
 | [zerocopy](https://github.com/google/zerocopy) | 0.7.32 | [Joshua Liebow-Feeser](mailto:[email protected]) | Apache-2.0, BSD-2-Clause, or MIT |

CREDITS.md

@@ -1,10 +1,9 @@
 [package]
 name = "cargo-bashman"
-version = "0.4.5"
+version = "0.4.6"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"
-rust-version = "1.70"
 description = "A Cargo plugin to generate BASH completions and MAN pages."
 repository = "https://github.com/Blobfolio/bashman"
 publish = false
@@ -66,8 +65,8 @@ label = "<Cargo.toml>"
 path = true
 
 [dependencies]
-argyle = "0.7.*"
-fyi_msg = "0.12.*"
+argyle = "0.7.2"
+fyi_msg = "0.13.*"
 
 [dependencies.bashman_core]
 path = "../bashman_core"

bashman/Cargo.toml

@@ -64,6 +64,14 @@ fn _main() -> Result<(), BashManError> {
 	// Parse CLI arguments.
 	let args = Argue::new(FLAG_HELP | FLAG_VERSION).map_err(BashManError::Argue)?;
 
+	// Check for invalid CLI options.
+	if let Some(boo) = args.check_keys(
+		&[b"--no-bash", b"--no-credits", b"--no-man"],
+		&[b"--features", b"--manifest-path", b"-f", b"-m"],
+	) {
+		return Err(BashManError::InvalidCli(String::from_utf8_lossy(boo).into()));
+	}
+
 	let mut flags: u8 = FLAG_ALL;
 	if args.switch(b"--no-bash") {
 		flags &= ! FLAG_BASH;

bashman/src/main.rs

@@ -1,21 +1,20 @@
 [package]
 name = "bashman_core"
-version = "0.4.5"
+version = "0.4.6"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"
-rust-version = "1.70"
 description = "The backing library for Cargo Bashman."
 repository = "https://github.com/Blobfolio/bashman"
 publish = false
 
 [dependencies]
-adbyss_psl = "0.9.*"
-argyle = "0.7.*"
+adbyss_psl = "0.10.*"
+argyle = "0.7.2"
 cargo_metadata = "=0.18.1"
-fyi_msg = "0.12.*"
+flate2 = "=1.0.28"
+fyi_msg = "0.13.*"
 indexmap = "2.2.*"
-libdeflater = "=1.19.0"
 oxford_join = "0.2.*"
 trimothy = "0.2.*"
 utc2k = "0.8.*"

bashman_core/Cargo.toml

@@ -7,9 +7,9 @@ This module contains the [`Command`] and related data structures produced from
 
 use crate::BashManError;
 use fyi_msg::Msg;
-use libdeflater::{
-	CompressionLvl,
-	Compressor,
+use flate2::{
+	Compression,
+	write::GzEncoder,
 };
 use std::{
 	fs::File,
@@ -359,14 +359,12 @@ impl<'a> Command<'a> {
 			.and_then(|mut f| f.write_all(data).and_then(|()| f.flush()))
 			.map_err(|_| BashManError::WriteSubMan(Box::from(self.bin)))?;
 
-		// Write compressed.
-		let mut writer = Compressor::new(CompressionLvl::best());
-		let mut buf: Vec<u8> = vec![0; writer.gzip_compress_bound(data.len())];
-
-		// Trim any excess now that we know the final length.
-		let len = writer.gzip_compress(data, &mut buf)
+		// Gzip it.
+		let mut writer = GzEncoder::new(Vec::new(), Compression::best());
+		let buf = writer.write_all(data)
+			.and_then(|()| writer.flush())
+			.and_then(|()| writer.finish())
 			.map_err(|_| BashManError::WriteSubMan(Box::from(self.bin)))?;
-		buf.truncate(len);
 
 		// Toss ".gz" onto the original file path and write again!
 		let mut dst = path.to_path_buf();

bashman_core/src/data.rs

@@ -17,6 +17,8 @@ pub enum BashManError {
 	InvalidBashDir,
 	/// # Invalid Credits output directory.
 	InvalidCreditsDir,
+	/// # Invalid CLI Option.
+	InvalidCli(Box<str>),
 	/// # Invalid flag.
 	InvalidFlag,
 	/// # Invalid item.
@@ -52,6 +54,7 @@ impl fmt::Display for BashManError {
 		match self {
 			Self::Argue(src) => f.write_str(src.as_str()),
 			Self::InvalidBashDir => f.write_str("Invalid BASH output directory."),
+			Self::InvalidCli(s) => f.write_fmt(format_args!("Invalid/unknown CLI option: {s}")),
 			Self::InvalidCreditsDir => f.write_str("Invalid credits output directory."),
 			Self::InvalidFlag => f.write_str("Flags require at least one short/long key."),
 			Self::InvalidItem => f.write_str("Items require a key and value."),

bashman_core/src/error.rs

@@ -1,6 +1,6 @@
-.TH "CARGO BASHMAN" "1" "February 2024" "Cargo BashMan v0.4.5" "User Commands"
+.TH "CARGO BASHMAN" "1" "February 2024" "Cargo BashMan v0.4.6" "User Commands"
 .SH NAME
-Cargo BashMan \- Manual page for cargo\-bashman v0.4.5.
+Cargo BashMan \- Manual page for cargo\-bashman v0.4.6.
 .SH DESCRIPTION
 A Cargo plugin to generate BASH completions and MAN pages.
 .SS USAGE: