Skip to content

Commit 3afe36e

Browse files
joshstoik1joshstoik1
committed
release: 0.8.2
2 parents f60b577 + ebf6ee9 commit 3afe36e

File tree

6 files changed

+48
-60
lines changed

6 files changed

+48
-60
lines changed

‎CREDITS.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
# Project Dependencies
22
Package: yesvgmap
3-
Version: 0.8.1
3+
Version: 0.8.2
44
Target: x86_64-unknown-linux-gnu
5-
Generated: 2025-09-19 05:13:43 UTC
5+
Generated: 2025-10-31 02:44:04 UTC
66

77
| Package | Version | Author(s) | License |
88
| ---- | ---- | ---- | ---- |
99
| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.12 | [Tom Kaitchuck](mailto:tom.kaitchuck@gmail.com) | MIT OR Apache-2.0 |
10-
| [**argyle**](https://github.com/Blobfolio/argyle) | 0.13.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
11-
| [bitflags](https://github.com/bitflags/bitflags) | 2.9.4 | The Rust Project Developers | MIT OR Apache-2.0 |
12-
| [cfg-if](https://github.com/rust-lang/cfg-if) | 1.0.3 | [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
10+
| [**argyle**](https://github.com/Blobfolio/argyle) | 0.14.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
11+
| [bitflags](https://github.com/bitflags/bitflags) | 2.10.0 | The Rust Project Developers | MIT OR Apache-2.0 |
12+
| [cfg-if](https://github.com/rust-lang/cfg-if) | 1.0.4 | [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
1313
| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.13.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
14-
| [**dowser**](https://github.com/Blobfolio/dowser) | 0.17.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
14+
| [**dowser**](https://github.com/Blobfolio/dowser) | 0.18.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
1515
| [fastrand](https://github.com/smol-rs/fastrand) | 2.3.0 | [Stjepan Glavina](mailto:stjepang@gmail.com) | Apache-2.0 OR MIT |
1616
| [filetime](https://github.com/alexcrichton/filetime) | 0.2.26 | [Alex Crichton](mailto:alex@alexcrichton.com) | MIT OR Apache-2.0 |
17-
| [fyi_ansi](https://github.com/Blobfolio/fyi) | 2.2.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
18-
| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 2.4.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
19-
| [getrandom](https://github.com/rust-random/getrandom) | 0.3.3 | The Rand Project Developers | MIT OR Apache-2.0 |
20-
| [libc](https://github.com/rust-lang/libc) | 0.2.175 | The Rust Project Developers | MIT OR Apache-2.0 |
17+
| [fyi_ansi](https://github.com/Blobfolio/fyi) | 2.2.2 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
18+
| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 2.4.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
19+
| [getrandom](https://github.com/rust-random/getrandom) | 0.3.4 | The Rand Project Developers | MIT OR Apache-2.0 |
20+
| [libc](https://github.com/rust-lang/libc) | 0.2.177 | The Rust Project Developers | MIT OR Apache-2.0 |
2121
| [linux-raw-sys](https://github.com/sunfishcode/linux-raw-sys) | 0.11.0 | [Dan Gohman](mailto:dev@sunfishcode.online) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
2222
| [once_cell](https://github.com/matklad/once_cell) | 1.21.3 | [Aleksey Kladov](mailto:aleksey.kladov@gmail.com) | MIT OR Apache-2.0 |
2323
| [rustix](https://github.com/bytecodealliance/rustix) | 1.1.2 | [Dan Gohman](mailto:dev@sunfishcode.online) and [Jakub Konka](mailto:kubkon@jakubkonka.com) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
2424
| [**svg**](https://github.com/bodoni/svg) | 0.18.0 | [Adam Bryant](mailto:adam.w.bryant@outlook.com), [Felix Schütt](mailto:felix.schuett@maps4print.com), [Felix Zwettler](mailto:f.zwettler@posteo.de), [GeoffreyY](mailto:yeungchingho123@gmail.com), [Gijs Burghoorn](mailto:g.burghoorn@gmail.com), [Ivan Ukhov](mailto:ivan.ukhov@gmail.com), [Jack Greenbaum](mailto:j.greenbaum@computer.org), [Joshua Klein](mailto:mobiusklein@gmail.com), [Mike Wilkerson](mailto:mwilkerson@gmail.com), [Nathan Hüsken](mailto:nathan@wintercloud.de), [Nathaniel Cook](mailto:nvcook42@gmail.com), [Nick Angelou](mailto:angelou.nick@gmail.com), [Nicolas Silva](mailto:nical@fastmail.com), [Nor Khasyatillah](mailto:mazznoer@ymail.com), [OCTronics](mailto:octronics@riseup.net), [Patrick Chieppe](mailto:patrick.chieppe@hotmail.com), [Will Nelson](mailto:will@wnelson.xyz), [Xander Rudelis](mailto:xander.rudelis@gmail.com), [e-matteson](mailto:e.r.matteson@gmail.com), and [kmkzt](mailto:info.pscreator@gmail.com) | Apache-2.0 OR MIT |
25-
| [tempfile](https://github.com/Stebalien/tempfile) | 3.22.0 | [Steven Allen](mailto:steven@stebalien.com), The Rust Project Developers, [Ashley Mannix](mailto:ashleymannix@live.com.au), and [Jason White](mailto:me@jasonwhite.io) | MIT OR Apache-2.0 |
26-
| [unicode-width](https://github.com/unicode-rs/unicode-width) | 0.2.1 | [kwantam](mailto:kwantam@gmail.com) and [Manish Goregaokar](mailto:manishsmail@gmail.com) | MIT OR Apache-2.0 |
25+
| [tempfile](https://github.com/Stebalien/tempfile) | 3.23.0 | [Steven Allen](mailto:steven@stebalien.com), The Rust Project Developers, [Ashley Mannix](mailto:ashleymannix@live.com.au), and [Jason White](mailto:me@jasonwhite.io) | MIT OR Apache-2.0 |
26+
| [unicode-width](https://github.com/unicode-rs/unicode-width) | 0.2.2 | [kwantam](mailto:kwantam@gmail.com) and [Manish Goregaokar](mailto:manishsmail@gmail.com) | MIT OR Apache-2.0 |
2727
| [version_check](https://github.com/SergioBenitez/version_check) ⚒️ | 0.9.5 | [Sergio Benitez](mailto:sb@sergio.bz) | MIT OR Apache-2.0 |
2828
| [**write_atomic**](https://github.com/Blobfolio/write_atomic) | 0.7.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
2929
| [zerocopy](https://github.com/google/zerocopy) | 0.8.27 | [Joshua Liebow-Feeser](mailto:joshlf@google.com) and [Jack Wrenn](mailto:jswrenn@amazon.com) | BSD-2-Clause OR Apache-2.0 OR MIT |

‎Cargo.toml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "yesvgmap"
3-
version = "0.8.1"
3+
version = "0.8.2"
44
license = "WTFPL"
55
authors = ["Josh Stoik <josh@blobfolio.com>"]
66
edition = "2024"
@@ -69,18 +69,15 @@ label = "<PATH(s)…>"
6969
description = "One or more file and/or directory paths to crunch and/or (recursively) crawl. Only files with the extension .svg will ultimately be included."
7070

7171
[build-dependencies]
72-
argyle = "0.13.*"
72+
argyle = "0.14.*"
7373

7474
[dependencies]
75+
argyle = "0.14.*"
7576
dactyl = "0.13.*"
76-
dowser = "0.17.*"
77+
dowser = "0.18.*"
7778
svg = "=0.18.0"
7879
write_atomic = "0.7.*"
7980

80-
[dependencies.argyle]
81-
version = "0.13.*"
82-
features = [ "try_paths" ]
83-
8481
[dependencies.fyi_msg]
8582
version = "2.4.*"
8683
features = [ "fitted" ]

‎build.rs‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
# Yesvgmap: Build
33
*/
44

5-
use argyle::{
6-
FlagsBuilder,
7-
KeyWordsBuilder,
8-
};
5+
use argyle::FlagsBuilder;
96
use std::{
107
collections::BTreeSet,
118
fs::File,
@@ -302,27 +299,10 @@ static TAGS: [&str; 74] = [
302299
fn main() {
303300
println!("cargo:rerun-if-env-changed=CARGO_PKG_VERSION");
304301

305-
build_cli();
306302
build_flags();
307303
build_spec();
308304
}
309305

310-
/// # Build CLI Keys.
311-
fn build_cli() {
312-
let mut builder = KeyWordsBuilder::default();
313-
builder.push_keys([
314-
"-h", "--help",
315-
"-V", "--version",
316-
]);
317-
builder.push_keys_with_values([
318-
"-a", "--attribute",
319-
"-l", "--list",
320-
"-o", "--output",
321-
"-p", "--prefix",
322-
]);
323-
builder.save(out_path("argyle.rs"));
324-
}
325-
326306
/// # Build Flags.
327307
fn build_flags() {
328308
FlagsBuilder::new("ContentWarnings")

‎release/man/yesvgmap.1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.TH "YESVGMAP" "1" "September 2025" "yesvgmap v0.8.1" "User Commands"
1+
.TH "YESVGMAP" "1" "October 2025" "yesvgmap v0.8.2" "User Commands"
22
.SH NAME
3-
YESVGMAP \- Manual page for yesvgmap v0.8.1.
3+
YESVGMAP \- Manual page for yesvgmap v0.8.2.
44
.SH DESCRIPTION
55
Generate SVG sprite maps from individual SVG images.
66
.SS USAGE:

‎src/main.rs‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
clippy::format_push_string,
2525
clippy::get_unwrap,
2626
clippy::impl_trait_in_params,
27+
clippy::implicit_clone,
2728
clippy::lossy_float_literal,
2829
clippy::missing_assert_message,
2930
clippy::missing_docs_in_private_items,
@@ -33,7 +34,6 @@
3334
clippy::rest_pat_in_fully_bound_structs,
3435
clippy::semicolon_inside_block,
3536
clippy::str_to_string,
36-
clippy::string_to_string,
3737
clippy::todo,
3838
clippy::undocumented_unsafe_blocks,
3939
clippy::unneeded_field_pattern,
@@ -61,7 +61,6 @@ mod sprite;
6161

6262

6363

64-
use argyle::Argument;
6564
use dactyl::traits::NiceInflection;
6665
use dowser::Extension;
6766
use error::{
@@ -122,18 +121,28 @@ fn main() -> ExitCode {
122121
/// Do our work here so we can easily bubble up errors and handle them nice and
123122
/// pretty.
124123
fn main__() -> Result<(), SvgError> {
125-
// Parse CLI arguments.
126-
let args = argyle::args()
127-
.with_keywords(include!(concat!(env!("OUT_DIR"), "/argyle.rs")));
124+
argyle::argue! {
125+
Help "-h" "--help",
126+
Version "-V" "--version",
127+
128+
@options
129+
Attribute "-a" "--attribute",
130+
List "-l" "--list",
131+
Output "-o" "--output",
132+
Prefix "-p" "--prefix",
133+
134+
@catchall-paths Path,
135+
}
128136

137+
// Parse CLI arguments.
129138
let mut settings = SpriteOptions::default();
130139
let mut dst = None;
131-
for arg in args {
140+
for arg in Argument::args_os() {
132141
match arg {
133-
Argument::Key("-h" | "--help") => return Err(SvgErrorKind::PrintHelp.into()),
134-
Argument::Key("-V" | "--version") => return Err(SvgErrorKind::PrintVersion.into()),
142+
Argument::Help => return Err(SvgErrorKind::PrintHelp.into()),
143+
Argument::Version => return Err(SvgErrorKind::PrintVersion.into()),
135144

136-
Argument::KeyWithValue("-a" | "--attribute", s) =>
145+
Argument::Attribute(s) =>
137146
// Key and value, maybe.
138147
if let Some((a, b)) = s.split_once('=') {
139148
settings.set_attribute(a, Some(b))?;
@@ -142,17 +151,17 @@ fn main__() -> Result<(), SvgError> {
142151
else {
143152
settings.set_attribute(s.trim(), None)?;
144153
},
145-
Argument::KeyWithValue("-l" | "--list", s) => {
146-
settings.set_path(PathBuf::from(s), true)?;
147-
},
148-
Argument::KeyWithValue("-o" | "--output", s) => {
154+
Argument::List(s) =>
155+
if s == "-" { settings.set_paths_from_stdin(); }
156+
else { settings.set_path(PathBuf::from(s), true)?; },
157+
Argument::Output(s) => {
149158
let s = PathBuf::from(s);
150159
if s.is_dir() || ! crate::valid_extension(&s) {
151160
return Err((SvgErrorKind::InvalidDst, s).into());
152161
}
153162
dst.replace(s);
154163
},
155-
Argument::KeyWithValue("-p" | "--prefix", s) => { settings.set_prefix(s)?; },
164+
Argument::Prefix(s) => { settings.set_prefix(s)?; },
156165

157166
Argument::Path(s) => { settings.set_path(PathBuf::from(s), false)?; },
158167

@@ -164,10 +173,7 @@ fn main__() -> Result<(), SvgError> {
164173
"--map-id" => SvgErrorKind::DeprecatedMapId.into(),
165174
_ => (SvgErrorKind::InvalidCli, s).into(),
166175
}),
167-
Argument::InvalidUtf8(s) => return Err((SvgErrorKind::InvalidCli, s).into()),
168-
169-
// Nothing else is relevant.
170-
_ => {},
176+
Argument::OtherOs(s) => return Err((SvgErrorKind::InvalidCli, s).into()),
171177
}
172178
}
173179

‎src/sprite.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ impl SpriteOptions {
128128
}
129129
}
130130

131+
/// # Add Crawl Paths from STDIN.
132+
pub(crate) fn set_paths_from_stdin(&mut self) {
133+
self.paths.push_paths_from_stdin();
134+
}
135+
131136
/// # Set Prefix.
132137
///
133138
/// Customize the `id` prefix used for sprite symbols, minus the trailing

0 commit comments

Comments
 (0)