release: 2.4.1

Author: joshstoik1

CREDITS.md

@@ -1,17 +1,17 @@
 # Project Dependencies
     Package:   fyi
-    Version:   2.4.0
+    Version:   2.4.1
     Target:    x86_64-unknown-linux-gnu
-    Generated: 2025-09-19 01:58:59 UTC
+    Generated: 2025-10-30 19:59:41 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
-| [**argyle**](https://github.com/Blobfolio/argyle) | 0.13.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [**argyle**](https://github.com/Blobfolio/argyle) | 0.14.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
 | [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.13.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
-| [**fyi_ansi**](https://github.com/Blobfolio/fyi) | 2.2.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
-| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 2.4.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
-| [tz-rs](https://github.com/x-hgg-x/tz-rs) | 0.7.0 | x-hgg-x | MIT OR Apache-2.0 |
-| [**utc2k**](https://github.com/Blobfolio/utc2k) | 0.17.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [**fyi_ansi**](https://github.com/Blobfolio/fyi) | 2.2.2 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 2.4.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [tz-rs](https://github.com/x-hgg-x/tz-rs) | 0.7.1 | x-hgg-x | MIT OR Apache-2.0 |
+| [**utc2k**](https://github.com/Blobfolio/utc2k) | 0.18.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
 
 ### Legend
 

fyi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fyi"
-version = "2.4.0"
+version = "2.4.1"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -180,7 +180,7 @@ description = "The message!"
 subcommands = [ "confirm", "print", "aborted", "crunched", "debug", "done", "error", "found", "info", "notice", "review", "skipped", "success", "task", "warning" ]
 
 [build-dependencies]
-argyle = "0.13.*"
+argyle = "0.14.*"
 
 [build-dependencies.fyi_ansi]
 path = "../fyi_ansi"
@@ -190,7 +190,7 @@ features = [ "bin_kinds", "timestamps" ]
 path = "../fyi_msg"
 
 [dependencies]
-argyle = "0.13.*"
+argyle = "0.14.*"
 dactyl = "0.13.*"
 
 [dependencies.fyi_ansi]

fyi/build.rs

@@ -2,10 +2,7 @@
 # FYI: Build
 */
 
-use argyle::{
-	FlagsBuilder,
-	KeyWordsBuilder,
-};
+use argyle::FlagsBuilder;
 use fyi_ansi::{
 	ansi,
 	csi,
@@ -44,9 +41,6 @@ fn main() {
 	println!("cargo:rerun-if-changed=help");
 	println!("cargo:rerun-if-env-changed=CARGO_PKG_VERSION");
 
-	// Build the CLI arguments.
-	write_cli();
-
 	// Build the flags.
 	write_flags();
 
@@ -63,49 +57,6 @@ fn out_path(stub: &str) -> PathBuf {
 		.join(stub)
 }
 
-/// # Generate CLI arguments.
-fn write_cli() {
-	// Main arguments first.
-	let mut builder = KeyWordsBuilder::default();
-	builder.push_commands(
-		MsgKind::ALL.into_iter().filter_map(|k| {
-			let cmd = k.command();
-			if cmd.is_empty() { None }
-			else { Some(cmd) }
-		})
-	);
-	builder.push_keys([
-		"-h", "--help",
-		"-V", "--version",
-	]);
-	builder.save(out_path("argyle-kind.rs"));
-
-	// Blank arguments.
-	builder = KeyWordsBuilder::default();
-	builder.push_keys([
-		"-h", "--help",
-		"--stderr",
-	]);
-	builder.push_keys_with_values(["-c", "--count"]);
-	builder.save(out_path("argyle-blank.rs"));
-
-	// Message arguments.
-	builder = KeyWordsBuilder::default();
-	builder.push_keys([
-		"-h", "--help",
-		"-i", "--indent",
-		"--stderr",
-		"-t", "--timestamp",
-		"-y", "--yes",
-	]);
-	builder.push_keys_with_values([
-		"-c", "--prefix-color",
-		"-e", "--exit",
-		"-p", "--prefix",
-	]);
-	builder.save(out_path("argyle-msg.rs"));
-}
-
 /// # Write flags (program settings bools).
 fn write_flags() {
 	FlagsBuilder::new("Flags")

fyi/src/cli.rs

@@ -2,13 +2,11 @@
 # FYI: CLI
 */
 
-use argyle::{
-	Argue,
-	Argument,
-};
+use argyle::argue;
 use crate::FyiError;
 use dactyl::traits::BytesToUnsigned;
 use fyi_msg::{
+	CliCommandArg,
 	Msg,
 	MsgKind,
 };
@@ -22,6 +20,9 @@ use std::{
 // Flags generated by build.rs.
 include!(concat!(env!("OUT_DIR"), "/flags.rs"));
 
+/// # Remaining CLI Args.
+type RemainingArgs = std::iter::Skip<std::env::ArgsOs>;
+
 
 
 #[derive(Debug, Clone, Copy)]
@@ -65,43 +66,57 @@ impl Settings {
 
 
 /// # Parse Message Kind.
-pub(super) fn parse_kind() -> Result<MsgKind, FyiError> {
-	let mut args = argyle::args().with_keywords(
-		include!(concat!(env!("OUT_DIR"), "/argyle-kind.rs"))
-	);
+pub(super) fn parse_kind() -> Result<(MsgKind, RemainingArgs), FyiError> {
+	let mut args = CliCommandArg::args_os();
 
 	// The first result must be a subcommand or help/version flag.
 	let kind = match args.next() {
-		Some(Argument::Key("-V" | "--version")) => return Err(FyiError::PrintVersion),
-		Some(Argument::Command(s)) => MsgKind::from(s.as_bytes()),
-		_ => return Err(FyiError::PrintHelp(MsgKind::None)),
+		Some(CliCommandArg::Blank) =>    MsgKind::Blank,
+		Some(CliCommandArg::Confirm) =>  MsgKind::Confirm,
+		Some(CliCommandArg::Custom) =>   MsgKind::Custom,
+		Some(CliCommandArg::Aborted) =>  MsgKind::Aborted,
+		Some(CliCommandArg::Crunched) => MsgKind::Crunched,
+		Some(CliCommandArg::Debug) =>    MsgKind::Debug,
+		Some(CliCommandArg::Done) =>     MsgKind::Done,
+		Some(CliCommandArg::Error) =>    MsgKind::Error,
+		Some(CliCommandArg::Found) =>    MsgKind::Found,
+		Some(CliCommandArg::Info) =>     MsgKind::Info,
+		Some(CliCommandArg::Notice) =>   MsgKind::Notice,
+		Some(CliCommandArg::Review) =>   MsgKind::Review,
+		Some(CliCommandArg::Skipped) =>  MsgKind::Skipped,
+		Some(CliCommandArg::Success) =>  MsgKind::Success,
+		Some(CliCommandArg::Task) =>     MsgKind::Task,
+		Some(CliCommandArg::Warning) =>  MsgKind::Warning,
+		Some(CliCommandArg::Version) =>  return Err(FyiError::PrintVersion),
+		Some(CliCommandArg::Other(_) | CliCommandArg::OtherOs(_)) | None => return Err(FyiError::PrintHelp(MsgKind::None)),
 	};
 
-	// Force the help screen if no kind was parsed.
-	if matches!(kind, MsgKind::None) { Err(FyiError::PrintHelp(MsgKind::None)) }
-	// Otherwise return it!
-	else { Ok(kind) }
+	Ok((kind, args.into_inner()))
 }
 
 /// # Parse and Print Blanks!
-pub(super) fn parse_blank() -> Result<(), FyiError> {
-	// The first arg is always skipped, the second we read earlier.
-	let args = Argue::from(std::env::args_os().skip(2))
-		.with_keywords(include!(concat!(env!("OUT_DIR"), "/argyle-blank.rs")));
+pub(super) fn parse_blank(args: RemainingArgs) -> Result<(), FyiError> {
+	argue! {
+		Help   "-h" "--help",
+		Stderr      "--stderr",
+		@options
+		Count  "-c" "--count",
+	}
 
+	// The first arg is always skipped, the second we read earlier.
 	let mut stderr = false;
 	let mut count = NonZeroUsize::MIN;
-	for arg in args {
+	for arg in ArgumentIter::new(args) {
 		match arg {
-			Argument::Key("-h" | "--help") => return Err(FyiError::PrintHelp(MsgKind::Blank)),
-			Argument::Key("--stderr") => { stderr = true; },
-			Argument::KeyWithValue("-c" | "--count", s) =>
+			Argument::Help => return Err(FyiError::PrintHelp(MsgKind::Blank)),
+			Argument::Stderr => { stderr = true; },
+			Argument::Count(s) =>
 				if let Some(s) = NonZeroUsize::btou(s.trim().as_bytes()) {
 					count = NonZeroUsize::max(count, s);
 				},
 
 			// Nothing else is relevant here.
-			_ => {},
+			Argument::Other(_) | Argument::OtherOs(_) => {},
 		}
 	}
 
@@ -114,35 +129,43 @@ pub(super) fn parse_blank() -> Result<(), FyiError> {
 }
 
 /// # Parse Message.
-pub(super) fn parse_msg(kind: MsgKind) -> Result<(Msg, Settings), FyiError> {
-	// The first arg is always skipped, the second we read earlier.
-	let args = Argue::from(std::env::args_os().skip(2))
-		.with_keywords(include!(concat!(env!("OUT_DIR"), "/argyle-msg.rs")));
+pub(super) fn parse_msg(kind: MsgKind, args: RemainingArgs)
+-> Result<(Msg, Settings), FyiError> {
+	argue! {
+		Help      "-h" "--help",
+		Indent    "-i" "--indent",
+		Stderr         "--stderr",
+		Timestamp "-t" "--timestamp",
+		Yes       "-y" "--yes",
+		@options
+		Color     "-c" "--prefix-color",
+		Prefix    "-p" "--prefix",
+		Exit      "-e" "--exit",
+	}
 
 	let mut msg = None;
 	let mut prefix = String::new();
 	let mut color = 199_u8;
 	let mut flags = Settings::new();
-	for arg in args {
+	for arg in ArgumentIter::new(args) {
 		match arg {
-			Argument::Key("-h" | "--help") => return Err(FyiError::PrintHelp(kind)),
-			Argument::Key("-i" | "--indent") => { flags.flags.set(Flags::Indent); },
-			Argument::Key("--stderr") => { flags.flags.set(Flags::Stderr); },
-			Argument::Key("-t" | "--timestamp") => { flags.flags.set(Flags::Timestamp); },
-			Argument::Key("-y" | "--yes") => { flags.flags.set(Flags::Yes); },
+			Argument::Help => return Err(FyiError::PrintHelp(kind)),
+			Argument::Indent => { flags.flags.set(Flags::Indent); },
+			Argument::Stderr => { flags.flags.set(Flags::Stderr); },
+			Argument::Timestamp => { flags.flags.set(Flags::Timestamp); },
+			Argument::Yes => { flags.flags.set(Flags::Yes); },
 
-			Argument::KeyWithValue("-c" | "--prefix-color", s) =>
+			Argument::Color(s) =>
 				if let Some(s) = u8::btou(s.trim().as_bytes()) { color = s; },
-			Argument::KeyWithValue("-p" | "--prefix", s) => { prefix = s; },
-			Argument::KeyWithValue("-e" | "--exit", s) =>
+			Argument::Prefix(s) => { prefix = s; },
+			Argument::Exit(s) =>
 				if let Some(s) = u8::btou(s.trim().as_bytes()) { flags.exit = s.into(); },
 
 			Argument::Other(s) =>
 				if msg.is_none() { msg.replace(s); }
 				else { return Err(FyiError::InvalidCli(kind)); },
 
-			Argument::End(_) => {},
-			_ => return Err(FyiError::InvalidCli(kind)),
+			Argument::OtherOs(_) => return Err(FyiError::InvalidCli(kind)),
 		}
 	}
 

fyi/src/main.rs

@@ -24,6 +24,7 @@
 	clippy::format_push_string,
 	clippy::get_unwrap,
 	clippy::impl_trait_in_params,
+	clippy::implicit_clone,
 	clippy::lossy_float_literal,
 	clippy::missing_assert_message,
 	clippy::missing_docs_in_private_items,
@@ -33,7 +34,6 @@
 	clippy::rest_pat_in_fully_bound_structs,
 	clippy::semicolon_inside_block,
 	clippy::str_to_string,
-	clippy::string_to_string,
 	clippy::todo,
 	clippy::undocumented_unsafe_blocks,
 	clippy::unneeded_field_pattern,
@@ -93,9 +93,9 @@ fn main() -> ExitCode {
 /// This lets us more easily bubble errors, which are printed and handled
 /// specially.
 fn main__() -> Result<(), FyiError> {
-	let kind = cli::parse_kind()?;
-	if matches!(kind, MsgKind::Blank) { return cli::parse_blank(); }
-	let (msg, flags) = cli::parse_msg(kind)?;
+	let (kind, args) = cli::parse_kind()?;
+	if matches!(kind, MsgKind::Blank) { return cli::parse_blank(args); }
+	let (msg, flags) = cli::parse_msg(kind, args)?;
 
 	if matches!(kind, MsgKind::Confirm) {
 		return

fyi_ansi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fyi_ansi"
-version = "2.2.1"
+version = "2.2.2"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
 rust-version = "1.87"

fyi_ansi/src/lib.rs

@@ -65,6 +65,7 @@ assert_eq!(strike!("I'm struck!"),        "\x1b[9mI'm struck!\x1b[0m");
 	clippy::format_push_string,
 	clippy::get_unwrap,
 	clippy::impl_trait_in_params,
+	clippy::implicit_clone,
 	clippy::lossy_float_literal,
 	clippy::missing_assert_message,
 	clippy::missing_docs_in_private_items,
@@ -74,7 +75,6 @@ assert_eq!(strike!("I'm struck!"),        "\x1b[9mI'm struck!\x1b[0m");
 	clippy::rest_pat_in_fully_bound_structs,
 	clippy::semicolon_inside_block,
 	clippy::str_to_string,
-	clippy::string_to_string,
 	clippy::todo,
 	clippy::undocumented_unsafe_blocks,
 	clippy::unneeded_field_pattern,
@@ -292,8 +292,8 @@ mod macros {
 		// Close with a generic (full) reset.
 		(($($style:tt)+) $($content:expr),+ $(,)?) => (
 			::std::concat!(
-				csi!($($style)+),
-				$($content),+,
+				csi!($( $style )+),
+				$( $content, )+
 				csi!(),
 			)
 		);

fyi_msg/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "fyi_msg"
-version = "2.4.0"
+version = "2.4.1"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.90"
 description = "Simple ANSI-formatted, prefixed messages for console printing."
 license = "WTFPL"
 repository = "https://github.com/Blobfolio/fyi"
@@ -17,6 +17,10 @@ features = [ "fitted", "progress", "signals", "timestamps" ]
 default-target = "x86_64-unknown-linux-gnu"
 targets = [ "x86_64-unknown-linux-gnu", "x86_64-apple-darwin" ]
 
+[dependencies.argyle]
+version = "0.14.*"
+optional = true
+
 [dependencies.dactyl]
 version = "0.13.*"
 optional = true
@@ -39,7 +43,7 @@ version = "0.2.*"
 optional = true
 
 [dependencies.utc2k]
-version = "0.17.*"
+version = "0.18.*"
 features = [ "local" ]
 optional = true
 
@@ -107,4 +111,4 @@ signals_sigint = [ "progress", "signal-hook" ]
 signals = [ "signals_sigint", "signals_sigwinch" ]
 
 # INTERNAL: used by the accompanying "fyi" binary.
-bin_kinds = []
+bin_kinds = [ "argyle" ]