release: 0.3.16

Author: joshstoik1

CREDITS.md

@@ -1,14 +1,14 @@
 # Project Dependencies
     Package:   cargo-bashman
-    Version:   0.3.15
-    Generated: 2022-12-15 17:46:38 UTC
+    Version:   0.3.16
+    Generated: 2022-12-26 19:47:30 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
 | [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.7.16 | [Josh Stoik](mailto:[email protected]) | WTFPL |
 | [ahash](https://github.com/tkaitchuck/ahash) | 0.8.2 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
 | [argyle](https://github.com/Blobfolio/argyle) | 0.6.3 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [bashman_core](https://github.com/Blobfolio/bashman) | 0.3.15 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [bashman_core](https://github.com/Blobfolio/bashman) | 0.3.16 | [Josh Stoik](mailto:[email protected]) | WTFPL |
 | [camino](https://github.com/camino-rs/camino) | 1.1.1 | [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.15.2 | [Oliver Schneider](mailto:[email protected]) | MIT |
@@ -17,26 +17,26 @@
 | [fyi_msg](https://github.com/Blobfolio/fyi) | 0.10.3 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
 | [hashbrown](https://github.com/rust-lang/hashbrown) | 0.12.3 | [Amanieu d'Antras](mailto:[email protected]) | Apache-2.0 or MIT |
 | [indexmap](https://github.com/bluss/indexmap) | 1.9.2 |  | Apache-2.0 or MIT |
-| [itoa](https://github.com/dtolnay/itoa) | 1.0.4 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [itoa](https://github.com/dtolnay/itoa) | 1.0.5 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
 | [libdeflate-sys](https://github.com/adamkewley/libdeflater) | 0.11.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
 | [libdeflater](https://github.com/adamkewley/libdeflater) | 0.11.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
 | [num-traits](https://github.com/rust-num/num-traits) | 0.2.15 | The Rust Project Developers | Apache-2.0 or MIT |
 | [oxford_join](https://github.com/Blobfolio/oxford_join) | 0.2.5 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [proc-macro2](https://github.com/dtolnay/proc-macro2) | 1.0.47 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
-| [quote](https://github.com/dtolnay/quote) | 1.0.21 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [ryu](https://github.com/dtolnay/ryu) | 1.0.11 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or BSL-1.0 |
-| [semver](https://github.com/dtolnay/semver) | 1.0.14 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [serde](https://github.com/serde-rs/serde) | 1.0.150 | [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.150 | [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.89 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [syn](https://github.com/dtolnay/syn) | 1.0.105 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [thiserror](https://github.com/dtolnay/thiserror) | 1.0.37 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [thiserror-impl](https://github.com/dtolnay/thiserror) | 1.0.37 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [proc-macro2](https://github.com/dtolnay/proc-macro2) | 1.0.49 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
+| [quote](https://github.com/dtolnay/quote) | 1.0.23 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [ryu](https://github.com/dtolnay/ryu) | 1.0.12 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or BSL-1.0 |
+| [semver](https://github.com/dtolnay/semver) | 1.0.16 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [serde](https://github.com/serde-rs/serde) | 1.0.152 | [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.152 | [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.91 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [syn](https://github.com/dtolnay/syn) | 1.0.107 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [thiserror](https://github.com/dtolnay/thiserror) | 1.0.38 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [thiserror-impl](https://github.com/dtolnay/thiserror) | 1.0.38 | [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.0 | [Soveu](mailto:[email protected]) | Apache-2.0, MIT, or Zlib |
 | [toml](https://github.com/toml-rs/toml) | 0.5.10 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
 | [trimothy](https://github.com/Blobfolio/trimothy) | 0.1.4 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
 | [unicode-bidi](https://github.com/servo/unicode-bidi) | 0.3.8 | The Servo Project Developers | Apache-2.0 or MIT |
-| [unicode-ident](https://github.com/dtolnay/unicode-ident) | 1.0.5 | [David Tolnay](mailto:[email protected]) | Apache-2.0 AND Unicode-DFS-2016 or MIT |
+| [unicode-ident](https://github.com/dtolnay/unicode-ident) | 1.0.6 | [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 |
 | [utc2k](https://github.com/Blobfolio/utc2k) | 0.5.10 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |

README.md

@@ -1,6 +1,6 @@
 # Cargo BashMan
 
-[![ci](https://img.shields.io/github/workflow/status/Blobfolio/bashman/Build.svg?style=flat-square&label=ci)](https://github.com/Blobfolio/bashman/actions)
+[![ci](https://img.shields.io/github/actions/workflow/status/Blobfolio/bashman/ci.yaml?style=flat-square&label=ci)](https://github.com/Blobfolio/bashman/actions)
 [![deps.rs](https://deps.rs/repo/github/blobfolio/bashman/status.svg?style=flat-square&label=deps.rs)](https://deps.rs/repo/github/blobfolio/bashman)<br>
 [![license](https://img.shields.io/badge/license-wtfpl-ff1493?style=flat-square)](https://en.wikipedia.org/wiki/WTFPL)
 [![contributions welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square&label=contributions)](https://github.com/Blobfolio/bashman/issues)
@@ -120,6 +120,7 @@ Switches have the following fields:
 | short | *string* | A short key, like `-h`. |
 | long | *string* | A long key, like `--help`. |
 | description | *string* | A description for the flag. |
+| duplicate | *bool* | If `true`, the BASH completions will suggest this switch even if already present (so i.e. it can be supplied more than once). |
 | subcommands | *array* | If this switch applies to one or more subcommands, list the commands here. If a switch applies to the top-level app, omit this field, or include an empty `""` entry in the array. |
 
 Example:
@@ -147,6 +148,7 @@ An "option" is exactly like a "switch", except it takes a value. As such, they h
 | long | *string* | A long key, like `--help`. |
 | description | *string* | A description for the flag. |
 | label | *string* | A placeholder label for the value bit, like `<FILE>`. |
+| duplicate | *bool* | If `true`, the BASH completions will suggest this option even if already present (so i.e. it can be supplied more than once). |
 | path | *bool* | If `true`, the BASH completions will suggest files/directories as potential values. If `false`, no value suggestion will be hazarded. |
 | subcommands | *array* | If this option applies to one or more subcommands, list the commands here. If an option applies to the top-level app, omit this field, or include an empty `""` entry in the array. |
 

bashman/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-bashman"
-version = "0.3.15"
+version = "0.3.16"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"

bashman_core/Cargo.toml

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

bashman_core/src/data.rs

@@ -665,11 +665,13 @@ impl<'a> DataKind<'a> {
 				buf,
 				s.short,
 				s.long,
+				s.duplicate,
 			),
 			Self::Option(s) => bash_long_short_conds(
 				buf,
 				s.flag.short,
 				s.flag.long,
+				s.flag.duplicate,
 			),
 			Self::SubCommand(s) => writeln!(buf, "\topts+=(\"{}\")", s.bin)
 				.map_err(|_| BashManError::WriteBash),
@@ -750,6 +752,7 @@ pub(super) struct DataFlag<'a> {
 	pub(crate) short: Option<&'a str>,
 	pub(crate) long: Option<&'a str>,
 	pub(crate) description: &'a str,
+	pub(crate) duplicate: bool,
 }
 
 
@@ -800,25 +803,40 @@ fn bash_subfname(parent: &[u8], bin: &[u8]) -> Box<str> {
 fn bash_long_short_conds(
 	buf: &mut Vec<u8>,
 	short: Option<&str>,
-	long: Option<&str>
+	long: Option<&str>,
+	duplicate: bool,
 ) -> Result<(), BashManError> {
 	match (short, long) {
-		(Some(s), Some(l)) => write!(
-			buf,
-			r#"	if [[ ! " ${{COMP_LINE}} " =~ " {short} " ]] && [[ ! " ${{COMP_LINE}} " =~ " {long} " ]]; then
+		(Some(s), Some(l)) =>
+			if duplicate {
+				writeln!(
+					buf,
+					"\topts+=(\"{short}\")\n\topts+=(\"{long}\")",
+					short=s,
+					long=l,
+				)
+			}
+			else {
+				write!(
+					buf,
+					r#"	if [[ ! " ${{COMP_LINE}} " =~ " {short} " ]] && [[ ! " ${{COMP_LINE}} " =~ " {long} " ]]; then
 		opts+=("{short}")
 		opts+=("{long}")
 	fi
 "#,
-			short=s,
-			long=l
-		)
+					short=s,
+					long=l
+				)
+			}
 			.map_err(|_| BashManError::WriteBash),
-		(None, Some(k)) | (Some(k), None) => writeln!(
-			buf,
-			"\t[[ \" ${{COMP_LINE}} \" =~ \" {key} \" ]] || opts+=(\"{key}\")",
-			key=k
-		)
+		(None, Some(k)) | (Some(k), None) =>
+			if duplicate { writeln!(buf, "\topts+=(\"{k}\")") }
+			else {
+				writeln!(
+					buf,
+					"\t[[ \" ${{COMP_LINE}} \" =~ \" {k} \" ]] || opts+=(\"{k}\")",
+				)
+			}
 			.map_err(|_| BashManError::WriteBash),
 		(None, None) => Ok(()),
 	}

bashman_core/src/raw.rs

@@ -290,6 +290,9 @@ struct RawSwitch<'a> {
 	#[serde(deserialize_with = "deserialize_nonempty_str")]
 	description: &'a str,
 
+	#[serde(default)]
+	duplicate: bool,
+
 	#[serde(default)]
 	subcommands: Vec<&'a str>,
 }
@@ -319,6 +322,9 @@ struct RawOption<'a> {
 	#[serde(default)]
 	path: bool,
 
+	#[serde(default)]
+	duplicate: bool,
+
 	#[serde(default)]
 	subcommands: Vec<&'a str>,
 }
@@ -483,6 +489,7 @@ impl<'a> TryFrom<&'a RawSwitch<'a>> for DataKind<'a> {
 					short: src.short,
 					long: src.long,
 					description: src.description,
+					duplicate: src.duplicate,
 				}
 			))
 		}
@@ -503,9 +510,10 @@ impl<'a> TryFrom<&'a RawOption<'a>> for DataKind<'a> {
 						short: src.short,
 						long: src.long,
 						description: src.description,
+						duplicate: src.duplicate,
 					},
 					label: src.label.unwrap_or("<VAL>"),
-					path: src.path
+					path: src.path,
 				}
 			))
 		}

release/man/cargo-bashman.1

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