release: 1.7.0

Author: joshstoik1

CREDITS.md

@@ -1,14 +1,14 @@
 # Project Dependencies
     Package:   fyi
-    Version:   1.6.1
+    Version:   1.7.0
     Target:    x86_64-unknown-linux-gnu
-    Generated: 2025-01-17 08:19:07 UTC
+    Generated: 2025-02-24 07:32:03 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
-| [**argyle**](https://github.com/Blobfolio/argyle) | 0.10.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [**argyle**](https://github.com/Blobfolio/argyle) | 0.11.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
 | [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.9.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
-| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 1.6.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
+| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 1.7.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.11.2 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
 

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
 	"fyi",
     "fyi_msg",

README.md

@@ -39,23 +39,15 @@ fyi error "Something broke!"
 
 Debian and Ubuntu users can just grab the pre-built `.deb` package from the [latest release](https://github.com/Blobfolio/fyi/releases/latest).
 
-This application is written in [Rust](https://www.rust-lang.org/) and can alternatively be built from source using [Cargo](https://github.com/rust-lang/cargo):
+This application is written in [Rust](https://www.rust-lang.org/) and can alternatively be built/installed from source using [Cargo](https://github.com/rust-lang/cargo):
 
 ```bash
-# Clone the source.
-git clone https://github.com/Blobfolio/fyi.git
-
-# Go to it.
-cd fyi
-
-# Build as usual. Specify additional flags as desired.
-cargo build \
-    --bin fyi \
-    --release
+# See "cargo install --help" for more options.
+cargo install \
+    --git https://github.com/Blobfolio/fyi.git \
+    --bin fyi
 ```
 
-(This should work under other 64-bit Unix environments too, like MacOS.)
-
 
 
 ## Usage

fyi/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "fyi"
-version = "1.6.1"
+version = "1.7.0"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
-edition = "2021"
+edition = "2024"
 description = "A dead-simple CLI status message printer for use in BASH scripts, etc."
 repository = "https://github.com/Blobfolio/fyi"
 publish = false
@@ -143,7 +143,7 @@ subcommands = [ "blank" ]
 [[package.metadata.bashman.options]]
 short = "-e"
 long = "--exit"
-description = "Exit with this status code after printing. [default: 0]"
+description = "Exit with this code (0-255) after printing. [default: 0]"
 label = "<NUM>"
 path = false
 subcommands = [ "print", "crunched", "debug", "done", "error", "info", "notice", "review", "skipped", "success", "task", "warning" ]
@@ -170,13 +170,13 @@ description = "The message!"
 subcommands = [ "confirm", "print", "crunched", "debug", "done", "error", "info", "notice", "review", "skipped", "success", "task", "warning" ]
 
 [build-dependencies]
-argyle = "0.10.*"
+argyle = "0.11.*"
 
 [build-dependencies.fyi_msg]
 path = "../fyi_msg"
 
 [dependencies]
-argyle = "0.10.*"
+argyle = "0.11.*"
 dactyl = "0.9.*"
 
 [dependencies.fyi_msg]

fyi/help/generic-bottom.txt

@@ -5,7 +5,7 @@ FLAGS:
     -t, --timestamp    Include a timestamp.
 
 OPTIONS:
-    -e, --exit <num>   Exit with this status code after printing. [default: 0]
+    -e, --exit <num>   Exit with this code (0-255) after printing. [default: 0]
 
 ARGS:
     <MSG>    The message!

fyi/help/print.txt

@@ -10,7 +10,8 @@ FLAGS:
     -t, --timestamp    Include a timestamp.
 
 OPTIONS:
-    -e, --exit <num>            Exit with this status code after printing. [default: 0]
+    -e, --exit <num>            Exit with this code (0-255) after printing.
+                                [default: 0]
     -p, --prefix <txt>          Set a custom prefix. [default: ]
     -c, --prefix-color <num>    Use this color for the prefix. [default: 199]
 

fyi/src/cli.rs

@@ -7,15 +7,15 @@ use argyle::{
 	Argument,
 };
 use crate::FyiError;
-use dactyl::traits::{
-	BytesToSigned,
-	BytesToUnsigned,
-};
+use dactyl::traits::BytesToUnsigned;
 use fyi_msg::{
 	Msg,
 	MsgKind,
 };
-use std::num::NonZeroUsize;
+use std::{
+	num::NonZeroUsize,
+	process::ExitCode,
+};
 
 
 
@@ -29,7 +29,7 @@ pub(super) struct Settings {
 	flags: u8,
 
 	/// # Exit.
-	exit: i32,
+	exit: ExitCode,
 }
 
 impl Settings {
@@ -46,8 +46,8 @@ impl Settings {
 	const FLAG_YES: u8 =       0b1000;
 
 	/// # Exit Code.
-	pub(super) const fn exit(self) -> Result<(), FyiError> {
-		if self.exit == 0 { Ok(()) }
+	pub(super) fn exit(self) -> Result<(), FyiError> {
+		if self.exit == ExitCode::SUCCESS { Ok(()) }
 		else { Err(FyiError::Passthrough(self.exit)) }
 	}
 
@@ -75,7 +75,7 @@ impl Settings {
 
 	/// # New.
 	const fn new() -> Self {
-		Self { flags: 0, exit: 0 }
+		Self { flags: 0, exit: ExitCode::SUCCESS }
 	}
 
 	/// # Set Indent.
@@ -164,7 +164,7 @@ pub(super) fn parse_msg(kind: MsgKind) -> Result<(Msg, Settings), FyiError> {
 				if let Some(s) = u8::btou(s.trim().as_bytes()) { color = s; },
 			Argument::KeyWithValue("-p" | "--prefix", s) => { prefix = s; },
 			Argument::KeyWithValue("-e" | "--exit", s) =>
-				if let Some(s) = i32::btoi(s.trim().as_bytes()) { flags.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); }

fyi/src/error.rs

@@ -3,11 +3,14 @@
 */
 
 use fyi_msg::MsgKind;
-use std::fmt;
+use std::{
+	fmt,
+	process::ExitCode,
+};
 
 
 
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 /// # Errors!
 pub(super) enum FyiError {
 	/// # Unrecognized CLI.
@@ -17,7 +20,7 @@ pub(super) enum FyiError {
 	NoMessage,
 
 	/// # Passthrough.
-	Passthrough(i32),
+	Passthrough(ExitCode),
 
 	/// # Print Help (Not an Error).
 	PrintHelp(MsgKind),
@@ -52,13 +55,4 @@ impl FyiError {
 			Self::PrintVersion => concat!("FYI v", env!("CARGO_PKG_VERSION")),
 		}
 	}
-
-	/// # Exit Code.
-	pub(super) const fn exit_code(self) -> i32 {
-		match self {
-			Self::Passthrough(e) => e,
-			Self::PrintHelp(_) | Self::PrintVersion => 0,
-			_ => 1,
-		}
-	}
 }

fyi/src/main.rs

@@ -63,22 +63,27 @@ use fyi_msg::{
 	Msg,
 	MsgKind,
 };
+use std::process::ExitCode;
 
 
 
 /// # Main.
-fn main() {
-	// Handle errors.
-	if let Err(e) = main__() {
-		match e {
-			FyiError::Passthrough(_) => {},
-			FyiError::PrintHelp(x) => return helper(x),
-			FyiError::PrintVersion => { println!("{}", FyiError::PrintVersion); },
-			_ => { Msg::error(e.to_string()).eprint(); },
-		}
-
-		let code = e.exit_code();
-		if code != 0 { std::process::exit(code); }
+fn main() -> ExitCode {
+	match main__() {
+		Ok(()) => ExitCode::SUCCESS,
+		Err(FyiError::PrintHelp(x)) => {
+			helper(x);
+			ExitCode::SUCCESS
+		},
+		Err(FyiError::PrintVersion) => {
+			println!("{}", FyiError::PrintVersion);
+			ExitCode::SUCCESS
+		},
+		Err(FyiError::Passthrough(e)) => e,
+		Err(e) => {
+			Msg::error(e.to_string()).eprint();
+			ExitCode::FAILURE
+		},
 	}
 }
 
@@ -95,7 +100,7 @@ fn main__() -> Result<(), FyiError> {
 	if matches!(kind, MsgKind::Confirm) {
 		return
 			if msg.prompt_with_default(flags.yes()) { Ok(()) }
-			else { Err(FyiError::Passthrough(1)) };
+			else { Err(FyiError::Passthrough(ExitCode::FAILURE)) };
 	}
 
 	// Print to `STDERR`.

fyi_msg/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "fyi_msg"
-version = "1.6.1"
+version = "1.7.0"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
-edition = "2021"
-rust-version = "1.83"
+edition = "2024"
+rust-version = "1.85"
 description = "Simple ANSI-formatted, prefixed messages for console printing."
 license = "WTFPL"
 repository = "https://github.com/Blobfolio/fyi"