Commit b79e6052 authored by Wohlgemuth, Jason's avatar Wohlgemuth, Jason
Browse files

feat: Upgrade lib dependencies

parent 5da2fb5f
Loading
Loading
Loading
Loading
Loading
+46 −85
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ dependencies = [
 "console 0.16.1",
 "convert_case",
 "data-encoding",
 "derive_more 2.0.1",
 "derive_more",
 "directories",
 "dotenvy",
 "duct",
@@ -65,7 +65,7 @@ dependencies = [
 "urlencoding",
 "validator",
 "wgpu",
 "which 8.0.0",
 "which",
 "zip",
]

@@ -272,13 +272,12 @@ dependencies = [

[[package]]
name = "assert_cmd"
version = "2.0.16"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85"
dependencies = [
 "anstyle",
 "bstr",
 "doc-comment",
 "libc",
 "predicates",
 "predicates-core",
@@ -677,30 +676,15 @@ dependencies = [
 "virtue",
]

[[package]]
name = "bit-set"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
dependencies = [
 "bit-vec 0.6.3",
]

[[package]]
name = "bit-set"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
 "bit-vec 0.8.0",
 "bit-vec",
]

[[package]]
name = "bit-vec"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"

[[package]]
name = "bit-vec"
version = "0.8.0"
@@ -1672,34 +1656,13 @@ dependencies = [
 "syn 1.0.109",
]

[[package]]
name = "derive_more"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
dependencies = [
 "derive_more-impl 1.0.0",
]

[[package]]
name = "derive_more"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
dependencies = [
 "derive_more-impl 2.0.1",
]

[[package]]
name = "derive_more-impl"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.99",
 "unicode-xid",
 "derive_more-impl",
]

[[package]]
@@ -1782,12 +1745,6 @@ dependencies = [
 "const-random",
]

[[package]]
name = "doc-comment"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

[[package]]
name = "document-features"
version = "0.2.11"
@@ -2000,22 +1957,22 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"

[[package]]
name = "fancy-regex"
version = "0.13.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
dependencies = [
 "bit-set 0.5.3",
 "bit-set",
 "regex-automata",
 "regex-syntax",
]

[[package]]
name = "fancy-regex"
version = "0.14.0"
version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
checksum = "998b056554fbe42e03ae0e152895cd1a7e1002aec800fdc6635d20270260c46f"
dependencies = [
 "bit-set 0.8.0",
 "bit-set",
 "regex-automata",
 "regex-syntax",
]
@@ -4057,7 +4014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
dependencies = [
 "arrayvec",
 "bit-set 0.8.0",
 "bit-set",
 "bitflags 2.9.0",
 "cfg_aliases",
 "codespan-reporting",
@@ -4629,31 +4586,37 @@ dependencies = [

[[package]]
name = "pep440_rs"
version = "0.6.6"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "466eada3179c2e069ca897b99006cbb33f816290eaeec62464eea907e22ae385"
checksum = "31095ca1f396e3de32745f42b20deef7bc09077f918b085307e8eab6ddd8fb9c"
dependencies = [
 "once_cell",
 "serde",
 "unicode-width 0.1.14",
 "unicode-width 0.2.0",
 "unscanny",
 "version-ranges",
]

[[package]]
name = "pep508_rs"
version = "0.6.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f8877489a99ccc80012333123e434f84e645fe1ede3b30e9d3b815887a12979"
checksum = "faee7227064121fcadcd2ff788ea26f0d8f2bd23a0574da11eca23bc935bcc05"
dependencies = [
 "derivative",
 "boxcar",
 "indexmap 2.12.0",
 "itertools 0.13.0",
 "once_cell",
 "pep440_rs",
 "regex",
 "rustc-hash 2.1.1",
 "serde",
 "smallvec",
 "thiserror 1.0.69",
 "unicode-width 0.1.14",
 "unicode-width 0.2.0",
 "url",
 "urlencoding",
 "version-ranges",
]

[[package]]
@@ -5577,15 +5540,16 @@ dependencies = [

[[package]]
name = "pyproject-toml"
version = "0.11.0"
version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef7061023bcb58a0fc4a4bbe9819c13b0dca7c2abc14da14f5ecc1532ab3a36a"
checksum = "f6d755483ad14b49e76713b52285235461a5b4f73f17612353e11a5de36a5fd2"
dependencies = [
 "indexmap 2.12.0",
 "pep440_rs",
 "pep508_rs",
 "serde",
 "toml 0.8.20",
 "thiserror 2.0.17",
 "toml 0.9.8",
]

[[package]]
@@ -8199,6 +8163,15 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

[[package]]
name = "version-ranges"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8d079415ceb2be83fc355adbadafe401307d5c309c7e6ade6638e6f9f42f42d"
dependencies = [
 "smallvec",
]

[[package]]
name = "version_check"
version = "0.9.5"
@@ -8436,8 +8409,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7b882196f8368511d613c6aeec80655160db6646aebddf8328879a88d54e500"
dependencies = [
 "arrayvec",
 "bit-set 0.8.0",
 "bit-vec 0.8.0",
 "bit-set",
 "bit-vec",
 "bitflags 2.9.0",
 "cfg_aliases",
 "document-features",
@@ -8496,7 +8469,7 @@ dependencies = [
 "android_system_properties",
 "arrayvec",
 "ash",
 "bit-set 0.8.0",
 "bit-set",
 "bitflags 2.9.0",
 "block",
 "bytemuck",
@@ -8548,18 +8521,6 @@ dependencies = [
 "web-sys",
]

[[package]]
name = "which"
version = "6.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
dependencies = [
 "either",
 "home",
 "rustix 0.38.44",
 "winsafe",
]

[[package]]
name = "which"
version = "8.0.0"
@@ -9279,11 +9240,11 @@ dependencies = [
 "clap",
 "clap-verbosity-flag",
 "color-eyre",
 "derive_more 1.0.0",
 "derive_more",
 "dotenvy",
 "env_logger",
 "exitcode",
 "fancy-regex 0.13.0",
 "fancy-regex 0.16.2",
 "is-terminal",
 "is_executable",
 "openssl",
@@ -9296,14 +9257,14 @@ dependencies = [
 "serde_yml",
 "sha2",
 "tokio",
 "toml 0.8.20",
 "toml 0.9.8",
 "tracing",
 "tracing-log",
 "tracing-subscriber",
 "uriparse",
 "valuable",
 "valuable-derive",
 "which 6.0.3",
 "which",
]

[[package]]
+0 −3
Original line number Diff line number Diff line
@@ -97,6 +97,3 @@ pub fn run(
    };
    Ok(())
}

#[cfg(test)]
mod tests;
+0 −55
Original line number Diff line number Diff line
use crate::cli::Arguments;
use assert_cmd::Command;
use clap::CommandFactory;

#[test]
fn test_cli() {
    Arguments::command().debug_assert();
}

#[ignore]
#[test]
fn test_help() {
    let expected = "░  ░░░░  ░░  ░░░░  ░░  ░░░░░░░░        ░░  ░░░░  ░
▒▒  ▒▒  ▒▒▒▒  ▒▒  ▒▒▒  ▒▒▒▒▒▒▒▒  ▒▒▒▒▒▒▒▒   ▒▒   ▒
▓▓▓    ▓▓▓▓▓▓    ▓▓▓▓  ▓▓▓▓▓▓▓▓      ▓▓▓▓        ▓
██  ██  ██████  █████  ████████  ████████  █  █  █
█  ████  █████  █████        ██        ██  ████  █

\"Digital xylem\" that transports data through workflows with structure and support

Usage: xylem [OPTIONS] [COMMAND]

Commands:
  check   Run checks on a given path to a directory
  doctor  Check environment parameters and verify Xylem requirements are met
  run     Run workflow using configuration file
  help    Print this message or the help of the given subcommand(s)

Options:
  -v, --verbose...
          Increase logging verbosity

  -q, --quiet...
          Decrease logging verbosity

  -h, --help
          Print help (see a summary with '-h')

  -V, --version
          Print version\n";
    let mut cmd = Command::cargo_bin("xylem").unwrap();
    let assert = cmd.arg("help").assert();
    assert.success().stdout(expected);
}

#[ignore]
#[test]
fn test_run() {
    let expected = "error: a value is required for '--config <PATH>' but none was supplied

For more information, try '--help'.\n";
    let mut cmd = Command::cargo_bin("xylem").unwrap();
    let assert = cmd.args(["run", "--config"]).assert();
    assert.failure().code(2).stderr(expected);
}
+17 −17
Original line number Diff line number Diff line
@@ -7,24 +7,24 @@ edition = "2021"

[dependencies]
bon = "3.8.1"
bytes = "1.7.2"
clap = { version = "4.4.2" }
derive_more = { version = "1.0.0", features = ["display", "from_str"] }
env_logger = "0.11.3"
fancy-regex = "0.13.0"
is_executable = "1.0.4"
is-terminal = "0.4.9"
openssl = "0.10.68"
bytes = "1.10.1"
clap = { version = "4.5.51" }
derive_more = { version = "2.0.1", features = ["display", "from_str"] }
env_logger = "0.11.8"
fancy-regex = "0.16.2"
is_executable = "1.0.5"
is-terminal = "0.4.17"
openssl = "0.10.74"
owo-colors = { workspace = true }
pyproject-toml = "0.11.0"
reqwest = "0.12.8"
pyproject-toml = "0.13.7"
reqwest = "0.12.24"
serde_yml = "0.0.12"
sha2 = "0.10.8"
tokio = { version = "1.39.2", features = ["rt", "time", "rt-multi-thread"] }
toml = "0.8.19"
valuable = "0.1.0"
valuable-derive = "0.1.0"
which = "6.0.3"
sha2 = "0.10.9"
tokio = { version = "1.48.0", features = ["rt", "time", "rt-multi-thread"] }
toml = "0.9.8"
valuable = "0.1.1"
valuable-derive = "0.1.1"
which = "8.0.0"
acorn-lib = { workspace = true }
clap-verbosity-flag = { workspace = true }
color-eyre = { workspace = true }
@@ -39,7 +39,7 @@ tracing-subscriber = { workspace = true }
uriparse = { workspace = true }

[dev-dependencies]
assert_cmd = "2.0.16"
assert_cmd = "2.1.1"

[lints.rust]
unsafe_code = "forbid"