release: 0.3.8

Author: joshstoik1

CREDITS.md

@@ -1,15 +1,15 @@
 # Project Dependencies
     Package:   cargo-bashman
-    Version:   0.3.7
-    Generated: 2022-05-19 18:40:54 UTC
+    Version:   0.3.8
+    Generated: 2022-05-26 17:38:11 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
 | [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.7.4 | [Josh Stoik](mailto:[email protected]) | WTFPL |
 | [ahash](https://github.com/tkaitchuck/ahash) | 0.7.6 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
 | [argyle](https://github.com/Blobfolio/argyle) | 0.5.6 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [bashman_core](https://github.com/Blobfolio/bashman) | 0.3.7 | [Josh Stoik](mailto:[email protected]) | WTFPL |
-| [camino](https://github.com/camino-rs/camino) | 1.0.8 | [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 |
+| [bashman_core](https://github.com/Blobfolio/bashman) | 0.3.8 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [camino](https://github.com/camino-rs/camino) | 1.0.9 | [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.2 | The Cargo Project Developers | Apache-2.0 or MIT |
 | [cargo_metadata](https://github.com/oli-obk/cargo_metadata) | 0.14.2 | [Oliver Schneider](mailto:[email protected]) | MIT |
 | [dactyl](https://github.com/Blobfolio/dactyl) | 0.3.4 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |

bashman/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-bashman"
-version = "0.3.7"
+version = "0.3.8"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"
@@ -51,6 +51,13 @@ short = "-V"
 long = "--version"
 description = "Print application version."
 
+[[package.metadata.bashman.options]]
+short = "-f"
+long = "--features"
+description = "Comma-separated list of optional features to include when generating CREDITS.md."
+label = "<Cargo.toml>"
+path = false
+
 [[package.metadata.bashman.options]]
 short = "-m"
 long = "--manifest-path"

bashman/src/main.rs

@@ -46,7 +46,10 @@ use bashman_core::{
 	FLAG_MAN,
 };
 use fyi_msg::Msg;
-use std::path::PathBuf;
+use std::{
+	ffi::OsStr,
+	path::PathBuf,
+};
 
 
 
@@ -57,12 +60,8 @@ fn main() {
 		Err(BashManError::Argue(ArgyleError::WantsVersion)) => {
 			println!(concat!("Cargo BashMan v", env!("CARGO_PKG_VERSION")));
 		},
-		Err(BashManError::Argue(ArgyleError::WantsHelp)) => {
-			helper();
-		},
-		Err(e) => {
-			Msg::error(e.to_string()).die(1);
-		},
+		Err(BashManError::Argue(ArgyleError::WantsHelp)) => { helper(); },
+		Err(e) => { Msg::error(e.to_string()).die(1); },
 	}
 }
 
@@ -83,6 +82,8 @@ fn _main() -> Result<(), BashManError> {
 		flags &= ! FLAG_MAN;
 	}
 
+	let features = args.option2_os(b"-f", b"--features").and_then(OsStr::to_str);
+
 	let manifest =
 		if let Some(p) = args.option2_os(b"-m", b"--manifest-path") {
 			PathBuf::from(p)
@@ -93,7 +94,7 @@ fn _main() -> Result<(), BashManError> {
 				.join("Cargo.toml")
 		};
 
-	bashman_core::parse(manifest, flags)?;
+	bashman_core::parse(manifest, flags, features)?;
 
 	Ok(())
 }
@@ -129,6 +130,8 @@ FLAGS:
     -V, --version               Prints version information.
 
 OPTIONS:
+    -f, --features <FEATURES>   Comma-separated list of optional features to
+                                include when generating CREDITS.md.
     -m, --manifest-path <FILE>  Read file paths from this list.
 "
     ));

bashman_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bashman_core"
-version = "0.3.7"
+version = "0.3.8"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"

bashman_core/src/credits.rs

@@ -7,6 +7,7 @@ narrower than theirs.
 
 use adbyss_psl::Domain;
 use cargo_metadata::{
+	CargoOpt,
 	DependencyKind,
 	DepKindInfo,
 	MetadataCommand,
@@ -75,10 +76,25 @@ impl PartialOrd for Dependency {
 
 
 /// # Get Dependencies.
-pub(super) fn get_dependencies(src: &Path) -> Result<Vec<Dependency>, BashManError> {
+pub(super) fn get_dependencies(src: &Path, features: Option<&str>) -> Result<Vec<Dependency>, BashManError> {
 	let metadata = {
 		let mut cmd = MetadataCommand::new();
 		cmd.manifest_path(&src);
+
+		// Enable extra features?
+		if let Some(features) = features {
+			let features: Vec<String> = features.split(',')
+				.filter_map(|f| {
+					let f = f.trim();
+					if f.is_empty() { None }
+					else { Some(f.to_owned()) }
+				})
+				.collect();
+			if ! features.is_empty() {
+				cmd.features(CargoOpt::SomeFeatures(features));
+			}
+		}
+
 		cmd.exec().map_err(|_| BashManError::InvalidManifest)?
 	};
 

bashman_core/src/data.rs

@@ -525,9 +525,15 @@ impl<'a> Command<'a> {
 /// # Credits.
 impl<'a> Command<'a> {
 	/// # Write Bash.
-	pub(crate) fn write_credits(&self, manifest: &Path, dir: &Path, buf: &mut Vec<u8>) -> Result<(), BashManError> {
+	pub(crate) fn write_credits(
+		&self,
+		manifest: &Path,
+		features: Option<&str>,
+		dir: &Path,
+		buf: &mut Vec<u8>,
+	) -> Result<(), BashManError> {
 		// Get the dependencies.
-		let raw = crate::credits::get_dependencies(manifest)?;
+		let raw = crate::credits::get_dependencies(manifest, features)?;
 
 		// Write the header.
 		buf.extend_from_slice(format!(

bashman_core/src/lib.rs

@@ -70,7 +70,7 @@ pub const FLAG_ALL: u8 =     0b0111;
 ///
 /// Returns an error if the BASH/Man output paths are invalid, or any other
 /// metadata parsing issues come up.
-pub fn parse(manifest: PathBuf, flags: u8) -> Result<(), BashManError> {
+pub fn parse(manifest: PathBuf, flags: u8, features: Option<&str>) -> Result<(), BashManError> {
 	// Clean up the manifest path.
 	let manifest = std::fs::canonicalize(manifest)
 		.map_err(|_| BashManError::InvalidManifest)?;
@@ -109,6 +109,7 @@ pub fn parse(manifest: PathBuf, flags: u8) -> Result<(), BashManError> {
 	if FLAG_CREDITS == flags & FLAG_CREDITS {
 		cmd.write_credits(
 			&manifest,
+			features,
 			&raw.credits_dir(&dir)?,
 			&mut buf
 		)?;

release/completions/cargo-bashman.bash

@@ -15,6 +15,10 @@ _basher___cargo_bashman() {
 		opts+=("-V")
 		opts+=("--version")
 	fi
+	if [[ ! " ${COMP_LINE} " =~ " -f " ]] && [[ ! " ${COMP_LINE} " =~ " --features " ]]; then
+		opts+=("-f")
+		opts+=("--features")
+	fi
 	if [[ ! " ${COMP_LINE} " =~ " -m " ]] && [[ ! " ${COMP_LINE} " =~ " --manifest-path " ]]; then
 		opts+=("-m")
 		opts+=("--manifest-path")

release/man/cargo-bashman.1

@@ -1,6 +1,6 @@
-.TH "CARGO BASHMAN" "1" "May 2022" "Cargo BashMan v0.3.7" "User Commands"
+.TH "CARGO BASHMAN" "1" "May 2022" "Cargo BashMan v0.3.8" "User Commands"
 .SH NAME
-Cargo BashMan \- Manual page for cargo\-bashman v0.3.7.
+Cargo BashMan \- Manual page for cargo\-bashman v0.3.8.
 .SH DESCRIPTION
 A Cargo plugin to generate BASH completions and MAN pages.
 .SS USAGE:
@@ -24,5 +24,8 @@ Do not generate MAN page(s).
 Print application version.
 .SS OPTIONS:
 .TP
+\fB\-f\fR, \fB\-\-features\fR <Cargo.toml>
+Comma\-separated list of optional features to include when generating CREDITS.md.
+.TP
 \fB\-m\fR, \fB\-\-manifest\-path\fR <Cargo.toml>
 Path to the Cargo.toml file to use.