From e4f87290b593c733d7838d54eebf7169ee154e42 Mon Sep 17 00:00:00 2001 From: amr-crabnebula Date: Thu, 5 Oct 2023 03:16:34 +0300 Subject: [PATCH] release: apply version updates from current changes --- .changes/config-enabled.md | 5 ----- .changes/packager-enabled.md | 5 ----- Cargo.lock | 4 ++-- crates/config/CHANGELOG.md | 5 +++++ crates/config/Cargo.toml | 2 +- crates/config_schema_generator/Cargo.toml | 2 +- crates/packager/CHANGELOG.md | 8 ++++++++ crates/packager/Cargo.toml | 10 +++------- crates/packager/src/cli/mod.rs | 11 ++++------- 9 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 .changes/config-enabled.md delete mode 100644 .changes/packager-enabled.md create mode 100644 crates/config/CHANGELOG.md diff --git a/.changes/config-enabled.md b/.changes/config-enabled.md deleted file mode 100644 index b4470cf3..00000000 --- a/.changes/config-enabled.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"cargo-packager-config": "minor" ---- - -Add `Config.enabled` field control whether this config is enabled or not diff --git a/.changes/packager-enabled.md b/.changes/packager-enabled.md deleted file mode 100644 index b5a4ce1c..00000000 --- a/.changes/packager-enabled.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"cargo-packager": "patch" ---- - -Respect the `config.enabled` option. diff --git a/Cargo.lock b/Cargo.lock index 2a5fbee6..0503b9c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -758,7 +758,7 @@ dependencies = [ [[package]] name = "cargo-packager" -version = "0.1.1" +version = "0.1.2" dependencies = [ "ar", "base64 0.21.4", @@ -803,7 +803,7 @@ dependencies = [ [[package]] name = "cargo-packager-config" -version = "0.1.0" +version = "0.2.0" dependencies = [ "clap", "schemars", diff --git a/crates/config/CHANGELOG.md b/crates/config/CHANGELOG.md new file mode 100644 index 00000000..95d17a7d --- /dev/null +++ b/crates/config/CHANGELOG.md @@ -0,0 +1,5 @@ +# Changelog + +## \[0.2.0] + +- [`1809f10`](https://www.github.com/crabnebula-dev/cargo-packager/commit/1809f10b4fd1720fd740196f67c3c980ade0a6bd) Add `Config.enabled` field control whether this config is enabled or not diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 5ff80c3d..8c5c70e9 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-packager-config" -version = "0.1.0" +version = "0.2.0" description = "Config types for cargo-packager." authors = [ "CrabNebula Ltd.", diff --git a/crates/config_schema_generator/Cargo.toml b/crates/config_schema_generator/Cargo.toml index c2cb0202..d0652504 100644 --- a/crates/config_schema_generator/Cargo.toml +++ b/crates/config_schema_generator/Cargo.toml @@ -7,6 +7,6 @@ authors = ["CrabNebula Ltd."] license = "Apache-2.0 OR MIT" [build-dependencies] -cargo-packager-config = { path = "../config", version = "0.1.0" } +cargo-packager-config = { path = "../config" } serde_json = { workspace = true } schemars = { workspace = true } diff --git a/crates/packager/CHANGELOG.md b/crates/packager/CHANGELOG.md index 57d4ab47..fd310688 100644 --- a/crates/packager/CHANGELOG.md +++ b/crates/packager/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[0.1.2] + +- [`1809f10`](https://www.github.com/crabnebula-dev/cargo-packager/commit/1809f10b4fd1720fd740196f67c3c980ade0a6bd) Respect the `config.enabled` option. + +### Dependencies + +- Upgraded to `cargo-packager-config@0.2.0` + ## \[0.1.1] - [`2d8b8d7`](https://www.github.com/crabnebula-dev/cargo-packager/commit/2d8b8d7c1af73202639449a00dbc51bf171effc7) Initial Release diff --git a/crates/packager/Cargo.toml b/crates/packager/Cargo.toml index eabb027c..1dca0f30 100644 --- a/crates/packager/Cargo.toml +++ b/crates/packager/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-packager" -version = "0.1.1" +version = "0.1.2" description = "Rust executable packager and bundler CLI and library." authors = [ "CrabNebula Ltd.", @@ -30,14 +30,10 @@ targets = [ [features] default = [ "cli" ] -cli = [ - "clap", - "cargo-packager-config/clap", - "tracing-subscriber" -] +cli = [ "clap", "cargo-packager-config/clap", "tracing-subscriber" ] [dependencies] -cargo-packager-config = { path = "../config", version = "0.1.0" } +cargo-packager-config = { path = "../config", version = "0.2.0" } thiserror = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/crates/packager/src/cli/mod.rs b/crates/packager/src/cli/mod.rs index 0709db23..ea5d9ee3 100644 --- a/crates/packager/src/cli/mod.rs +++ b/crates/packager/src/cli/mod.rs @@ -255,20 +255,17 @@ fn parse_log_level(verbose: u8) -> tracing::Level { pub fn run() { // prepare cli args let mut args = std::env::args_os().peekable(); - match args + if let Some("cargo-packager") = args .next() .as_deref() .map(Path::new) .and_then(Path::file_stem) .and_then(OsStr::to_str) { - Some("cargo-packager") => { - if args.peek().and_then(|s| s.to_str()) == Some("packager") { - // remove the extra cargo subcommand - args.next(); - } + if args.peek().and_then(|s| s.to_str()) == Some("packager") { + // remove the extra cargo subcommand + args.next(); } - _ => {} } let cli = Cli::command();