release: 0.4.0

Author: joshstoik1

.github/workflows/ci.yaml

@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [ master ]
+    branches: []
   pull_request:
-    branches: [ master ]
+    branches: []
 
 defaults:
   run:
@@ -48,8 +48,14 @@ jobs:
 
     - name: Build
       run: |
+        cargo build --bin cargo-bashman --target ${{ matrix.target }}
         cargo build --bin cargo-bashman --release --target ${{ matrix.target }}
 
     - name: Clippy
       run: |
         cargo clippy --release --target ${{ matrix.target }}
+
+    - name: Tests
+      run: |
+        cargo test --target ${{ matrix.target }}
+        cargo test --release --target ${{ matrix.target }}

.github/workflows/msrv.yaml

@@ -0,0 +1,54 @@
+name: MSRV
+
+on:
+  push:
+    branches: []
+  pull_request:
+    branches: []
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  all:
+    name: All
+
+    strategy:
+      matrix:
+        target:
+        - x86_64-unknown-linux-gnu
+        - x86_64-apple-darwin
+        include:
+        - target: x86_64-unknown-linux-gnu
+          os:     ubuntu-latest
+        - target: x86_64-apple-darwin
+          os:     macos-latest
+
+    runs-on: ${{matrix.os}}
+
+    env:
+      RUSTFLAGS: "-D warnings"
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        targets: ${{ matrix.target }}
+    - uses: taiki-e/install-action@v2
+      with:
+        tool: cargo-msrv
+
+    - name: Info
+      run: |
+        rustup --version
+        cargo --version
+        cargo clippy --version
+
+    - name: MSRV
+      run: |
+        cargo msrv --path bashman verify
+        cargo msrv --path bashman_core verify

CREDITS.md

@@ -1,47 +1,47 @@
 # Project Dependencies
     Package:   cargo-bashman
-    Version:   0.3.19
-    Generated: 2023-04-20 17:08:58 UTC
+    Version:   0.4.0
+    Generated: 2023-06-02 01:42:40 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
-| [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.7.21 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.8.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
 | [ahash](https://github.com/tkaitchuck/ahash) | 0.8.3 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
-| [argyle](https://github.com/Blobfolio/argyle) | 0.6.7 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [bashman_core](https://github.com/Blobfolio/bashman) | 0.3.19 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [argyle](https://github.com/Blobfolio/argyle) | 0.6.8 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [bashman_core](https://github.com/Blobfolio/bashman) | 0.4.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
 | [camino](https://github.com/camino-rs/camino) | 1.1.4 | [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.4 | [Oliver Schneider](mailto:[email protected]) | MIT |
 | [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
-| [dactyl](https://github.com/Blobfolio/dactyl) | 0.4.8 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.10.8 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [dactyl](https://github.com/Blobfolio/dactyl) | 0.5.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.11.0 | [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.3 |  | Apache-2.0 or MIT |
 | [itoa](https://github.com/dtolnay/itoa) | 1.0.6 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [libdeflate-sys](https://github.com/adamkewley/libdeflater) | 0.13.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
-| [libdeflater](https://github.com/adamkewley/libdeflater) | 0.13.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
+| [libdeflate-sys](https://github.com/adamkewley/libdeflater) | 0.14.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
+| [libdeflater](https://github.com/adamkewley/libdeflater) | 0.14.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
 | [memchr](https://github.com/BurntSushi/memchr) | 2.5.0 | [Andrew Gallant](mailto:[email protected]) and bluss | MIT or Unlicense |
 | [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.7 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [proc-macro2](https://github.com/dtolnay/proc-macro2) | 1.0.56 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
-| [quote](https://github.com/dtolnay/quote) | 1.0.26 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [oxford_join](https://github.com/Blobfolio/oxford_join) | 0.2.8 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [proc-macro2](https://github.com/dtolnay/proc-macro2) | 1.0.59 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
+| [quote](https://github.com/dtolnay/quote) | 1.0.28 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
 | [ryu](https://github.com/dtolnay/ryu) | 1.0.13 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or BSL-1.0 |
 | [semver](https://github.com/dtolnay/semver) | 1.0.17 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [serde](https://github.com/serde-rs/serde) | 1.0.160 | [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.160 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [serde](https://github.com/serde-rs/serde) | 1.0.163 | [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.163 | [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.96 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
-| [serde_spanned](https://github.com/toml-rs/toml) | 0.6.1 |  | Apache-2.0 or MIT |
-| [syn](https://github.com/dtolnay/syn) | 2.0.15 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
+| [serde_spanned](https://github.com/toml-rs/toml) | 0.6.2 |  | Apache-2.0 or MIT |
+| [syn](https://github.com/dtolnay/syn) | 2.0.18 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
 | [thiserror](https://github.com/dtolnay/thiserror) | 1.0.40 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
 | [thiserror-impl](https://github.com/dtolnay/thiserror) | 1.0.40 | [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.1 | [Soveu](mailto:[email protected]) | Apache-2.0, MIT, or Zlib |
-| [toml](https://github.com/toml-rs/toml) | 0.7.3 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
-| [toml_datetime](https://github.com/toml-rs/toml) | 0.6.1 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
-| [toml_edit](https://github.com/ordian/toml_edit) | 0.19.8 | [Andronik Ordian](mailto:[email protected]) and [Ed Page](mailto:[email protected]) | Apache-2.0 or MIT |
-| [trimothy](https://github.com/Blobfolio/trimothy) | 0.1.6 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [toml](https://github.com/toml-rs/toml) | 0.7.4 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
+| [toml_datetime](https://github.com/toml-rs/toml) | 0.6.2 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
+| [toml_edit](https://github.com/toml-rs/toml) | 0.19.10 | [Andronik Ordian](mailto:[email protected]) and [Ed Page](mailto:[email protected]) | Apache-2.0 or MIT |
+| [trimothy](https://github.com/Blobfolio/trimothy) | 0.1.7 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
 | [unicode-bidi](https://github.com/servo/unicode-bidi) | 0.3.13 | The Servo Project Developers | Apache-2.0 or MIT |
-| [unicode-ident](https://github.com/dtolnay/unicode-ident) | 1.0.8 | [David Tolnay](mailto:[email protected]) | Apache-2.0 AND Unicode-DFS-2016 or MIT |
+| [unicode-ident](https://github.com/dtolnay/unicode-ident) | 1.0.9 | [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.15 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [winnow](https://github.com/winnow-rs/winnow) | 0.4.1 |  | MIT |
+| [utc2k](https://github.com/Blobfolio/utc2k) | 0.6.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [winnow](https://github.com/winnow-rs/winnow) | 0.4.6 |  | MIT |

bashman/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "cargo-bashman"
-version = "0.3.19"
+version = "0.4.0"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.70"
 description = "A Cargo plugin to generate BASH completions and MAN pages."
 repository = "https://github.com/Blobfolio/bashman"
 publish = false
@@ -67,7 +67,7 @@ path = true
 
 [dependencies]
 argyle = "0.6.*"
-fyi_msg = "0.10.*"
+fyi_msg = "0.11.*"
 
 [dependencies.bashman_core]
 path = "../bashman_core"

bashman_core/Cargo.toml

@@ -1,24 +1,24 @@
 [package]
 name = "bashman_core"
-version = "0.3.19"
+version = "0.4.0"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.70"
 description = "The backing library for Cargo Bashman."
 repository = "https://github.com/Blobfolio/bashman"
 publish = false
 
 [dependencies]
-adbyss_psl = "0.7.*"
+adbyss_psl = "0.8.*"
 argyle = "0.6.*"
 cargo_metadata = "=0.15.4"
-fyi_msg = "0.10.*"
+fyi_msg = "0.11.*"
 indexmap = "=1.9.3"
-libdeflater = "=0.13.0"
+libdeflater = "=0.14.0"
 oxford_join = "0.2.*"
 trimothy = "0.1.*"
-utc2k = "0.5.*"
+utc2k = "0.6.*"
 
 [dependencies.serde]
 version = "1.0.*"

bashman_core/src/data.rs

@@ -12,10 +12,8 @@ use libdeflater::{
 	Compressor,
 };
 use std::{
-	ffi::OsStr,
 	fs::File,
 	io::Write,
-	os::unix::ffi::OsStrExt,
 	path::Path,
 };
 use utc2k::Utc2k;
@@ -371,7 +369,9 @@ impl<'a> Command<'a> {
 		buf.truncate(len);
 
 		// Toss ".gz" onto the original file path and write again!
-		File::create(OsStr::from_bytes(&[path.as_os_str().as_bytes(), b".gz"].concat()))
+		let mut dst = path.to_path_buf();
+		dst.as_mut_os_string().push(".gz");
+		File::create(dst)
 			.and_then(|mut f| f.write_all(&buf).and_then(|_| f.flush()))
 			.map_err(|_| BashManError::WriteSubMan(Box::from(self.bin)))
 	}

justfile

@@ -56,16 +56,6 @@ release_dir := justfile_directory() + "/release"
 	mv "{{ justfile_directory() }}/target" "{{ cargo_dir }}"
 
 
-# Check Release!
-@check:
-	# First let's build the Rust bit.
-	cargo check \
-		--workspace \
-		--release \
-		--target x86_64-unknown-linux-gnu \
-		--target-dir "{{ cargo_dir }}"
-
-
 @clean:
 	# Most things go here.
 	[ ! -d "{{ cargo_dir }}" ] || rm -rf "{{ cargo_dir }}"
@@ -118,6 +108,10 @@ release_dir := justfile_directory() + "/release"
 # Unit tests!
 @test:
 	clear
+	cargo test \
+		--workspace \
+		--target x86_64-unknown-linux-gnu \
+		--target-dir "{{ cargo_dir }}"
 	cargo test \
 		--release \
 		--workspace \

release/man/cargo-bashman.1

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