release: 0.1.4

Author: joshstoik1

bashman/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-bashman"
-version = "0.1.3"
+version = "0.1.4"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2018"
@@ -47,7 +47,7 @@ path = true
 [dependencies]
 chrono = "0.4.*"
 indexmap = "1.6.*"
-libdeflater = "0.5.*"
+libdeflater = "0.6.*"
 
 [dependencies.toml]
 version = "0.5.*"

bashman/src/agree.rs

@@ -721,22 +721,14 @@ impl Agree {
 	/// choosing, using the file name "{bin}.bash".
 	pub fn write_bash<P>(&self, dir: P) -> Result<(), String>
 	where P: AsRef<Path> {
-		let mut path = std::fs::canonicalize(dir.as_ref()).map_err(|_| format!(
-			"Missing BASH completion directory: {:?}",
-			dir.as_ref()
-		))?;
-
-		if path.is_dir() {
-			path.push([&self.bin, ".bash"].concat());
-			write_to(&path, self.bash().as_bytes(), false)
-				.map_err(|_| format!(
-					"Unable to write BASH completions: {:?}",
-					path
-				))
-		}
-		else {
-			Err(format!("Invalid BASH completion directory: {:?}", dir.as_ref()))
-		}
+		let mut path = std::fs::canonicalize(dir.as_ref())
+			.ok()
+			.filter(|x| x.is_dir())
+			.ok_or_else(|| format!("Invalid BASH completion directory: {:?}", dir.as_ref()))?;
+
+		path.push([&self.bin, ".bash"].concat());
+		write_to(&path, self.bash().as_bytes(), false)
+			.map_err(|_| format!("Unable to write BASH completions: {:?}", path))
 	}
 
 	/// # Write MAN Page!
@@ -753,23 +745,15 @@ impl Agree {
 	/// either the "{bin}.1" or "{bin}.1.gz" version, not both. ;)
 	pub fn write_man<P>(&self, dir: P) -> Result<(), String>
 	where P: AsRef<Path> {
-		let mut path = std::fs::canonicalize(dir.as_ref()).map_err(|_| format!(
-			"Missing MAN directory: {:?}",
-			dir.as_ref()
-		))?;
+		let mut path = std::fs::canonicalize(dir.as_ref())
+			.ok()
+			.filter(|x| x.is_dir())
+			.ok_or_else(|| format!("Invalid MAN directory: {:?}", dir.as_ref()))?;
 
 		// The main file.
-		if path.is_dir() {
-			path.push([&self.bin, ".1"].concat());
-			write_to(&path, self.man().as_bytes(), true)
-				.map_err(|_| format!(
-					"Unable to write MAN page: {:?}",
-					path
-				))?;
-		}
-		else {
-			return Err(format!("Invalid MAN directory: {:?}", dir.as_ref()))
-		}
+		path.push([&self.bin, ".1"].concat());
+		write_to(&path, self.man().as_bytes(), true)
+			.map_err(|_| format!("Unable to write MAN page: {:?}", path))?;
 
 		// Write subcommand pages.
 		for (bin, man) in self.args.iter()
@@ -780,10 +764,7 @@ impl Agree {
 			path.pop();
 			path.push([&self.bin, "-", &bin, ".1"].concat());
 			write_to(&path, man.as_bytes(), true)
-				.map_err(|_| format!(
-					"Unable to write MAN page: {:?}",
-					path
-				))?;
+				.map_err(|_| format!("Unable to write SUB-MAN page: {:?}", path))?;
 		}
 
 		Ok(())
@@ -1040,16 +1021,14 @@ complete -F chooser_{fname} -o bashdefault -o default {bname}
 		}
 
 		// Generated ARGUMENTS Section.
-		{
-			self.args.iter()
-				.filter_map(AgreeKind::if_arg)
-				.for_each(|x| {
-					pre.push(
-						AgreeSection::new(&[&x.name, ":"].concat(), true)
-							.with_item(AgreeKind::paragraph(&x.description))
-					);
-				});
-		}
+		self.args.iter()
+			.filter_map(AgreeKind::if_arg)
+			.for_each(|x| {
+				pre.push(
+					AgreeSection::new(&[&x.name, ":"].concat(), true)
+						.with_item(AgreeKind::paragraph(&x.description))
+				);
+			});
 
 		// Generated SUBCOMMANDS Section.
 		{
@@ -1136,9 +1115,9 @@ fn man_tagline(short: Option<&str>, long: Option<&str>, value: Option<&str>) ->
 /// This writes data to a file, optionally recursing to save a `GZipped`
 /// version (for MAN pages).
 fn write_to(file: &PathBuf, data: &[u8], compress: bool) -> Result<(), ()> {
-	let mut out = std::fs::File::create(file).map_err(|_| ())?;
-	out.write_all(data).map_err(|_| ())?;
-	out.flush().map_err(|_| ())?;
+	std::fs::File::create(file)
+		.and_then(|mut out| out.write_all(data).and_then(|_| out.flush()))
+		.map_err(|_| ())?;
 
 	// Save a compressed copy?
 	if compress {

bashman/src/lib.rs

@@ -24,6 +24,7 @@
 #![allow(clippy::cast_possible_truncation)]
 #![allow(clippy::cast_precision_loss)]
 #![allow(clippy::cast_sign_loss)]
+#![allow(clippy::map_err_ignore)]
 #![allow(clippy::missing_errors_doc)]
 #![allow(clippy::module_name_repetitions)]
 
@@ -215,17 +216,15 @@ where P: AsRef<Path> {
 /// absolute, they are realigned to be relative to the manifest directory.
 fn resolve_path(path: Option<&Value>, dir: &PathBuf) -> Result<PathBuf, String> {
 	path.and_then(Value::as_str)
-		.map_or(
-			Ok(dir.clone()),
+		.map_or_else(
+			|| Ok(dir.clone()),
 			|path|
-				if path.starts_with('/') {
-					std::fs::canonicalize(path).map_err(|e| e.to_string())
-				}
+				if path.starts_with('/') { std::fs::canonicalize(path) }
 				else {
 					let mut tmp: PathBuf = dir.clone();
 					tmp.push(path);
-					std::fs::canonicalize(tmp).map_err(|e| e.to_string())
-				}
+					std::fs::canonicalize(tmp)
+				}.map_err(|e| e.to_string())
 		)
 }
 

bashman/src/main.rs

@@ -273,6 +273,7 @@ This work is free. You can redistribute it and/or modify it under the terms of t
 #![allow(clippy::cast_possible_truncation)]
 #![allow(clippy::cast_precision_loss)]
 #![allow(clippy::cast_sign_loss)]
+#![allow(clippy::map_err_ignore)]
 #![allow(clippy::missing_errors_doc)]
 #![allow(clippy::module_name_repetitions)]
 

justfile

@@ -153,6 +153,7 @@ version:
 @_init:
 	[ ! -f "{{ justfile_directory() }}/Cargo.lock" ] || rm "{{ justfile_directory() }}/Cargo.lock"
 	cargo update
+	cargo outdated -w
 
 
 # Fix file/directory permissions.

release/man/cargo-bashman.1

@@ -1,6 +1,6 @@
-.TH "CARGO BASHMAN" "1" "November 2020" "Cargo BashMan v0.1.3" "User Commands"
+.TH "CARGO BASHMAN" "1" "November 2020" "Cargo BashMan v0.1.4" "User Commands"
 .SH NAME
-Cargo BashMan \- Manual page for cargo\-bashman v0.1.3.
+Cargo BashMan \- Manual page for cargo\-bashman v0.1.4.
 .SH DESCRIPTION
 BashMan is a Cargo plugin that helps you generate BASH completions and/or MAN pages for your Rust project.
 .SS USAGE: