Bump more dependencies and fix tests for capabilities table and searc…

…h results that use tabled

distant-core/Cargo.toml

@@ -15,41 +15,41 @@ license = "MIT OR Apache-2.0"
 schemars = ["dep:schemars", "distant-net/schemars"]
 
 [dependencies]
-async-trait = "0.1.58"
-bitflags = "1.3.2"
-bytes = "1.2.1"
+async-trait = "0.1.68"
+bitflags = "2.0.2"
+bytes = "1.4.0"
 derive_more = { version = "0.99.17", default-features = false, features = ["as_mut", "as_ref", "deref", "deref_mut", "display", "from", "error", "into", "into_iterator", "is_variant", "try_into"] }
 distant-net = { version = "=0.20.0-alpha.4", path = "../distant-net" }
-futures = "0.3.25"
-grep = "0.2.10"
+futures = "0.3.28"
+grep = "0.2.11"
 hex = "0.4.3"
-ignore = "0.4.18"
+ignore = "0.4.20"
 log = "0.4.17"
-notify = { version = "5.0.0", features = ["serde"] }
-num_cpus = "1.14.0"
-once_cell = "1.16.0"
-portable-pty = "0.7.0"
+notify = { version = "5.1.0", features = ["serde"] }
+num_cpus = "1.15.0"
+once_cell = "1.17.1"
+portable-pty = "0.8.1"
 rand = { version = "0.8.5", features = ["getrandom"] }
-regex = "1.7.0"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_bytes = "0.11.7"
-serde_json = "1.0.88"
+regex = "1.7.3"
+serde = { version = "1.0.159", features = ["derive"] }
+serde_bytes = "0.11.9"
+serde_json = "1.0.95"
 shell-words = "1.1.0"
 strum = { version = "0.24.1", features = ["derive"] }
-tokio = { version = "1.22.0", features = ["full"] }
-tokio-util = { version = "0.7.4", features = ["codec"] }
-walkdir = "2.3.2"
-whoami = "1.2.3"
+tokio = { version = "1.27.0", features = ["full"] }
+tokio-util = { version = "0.7.7", features = ["codec"] }
+walkdir = "2.3.3"
+whoami = "1.4.0"
 winsplit = "0.1.0"
 
 # Optional dependencies based on features
-clap = { version = "4.0.26", features = ["derive"], optional = true }
-schemars = { version = "0.8.11", optional = true }
+clap = { version = "4.2.1", features = ["derive"], optional = true }
+schemars = { version = "0.8.12", optional = true }
 
 [dev-dependencies]
-assert_fs = "1.0.9"
-env_logger = "0.9.3"
-indoc = "1.0.7"
-predicates = "2.1.3"
-rstest = "0.15.0"
+assert_fs = "1.0.12"
+env_logger = "0.10.0"
+indoc = "2.0.1"
+predicates = "3.0.2"
+rstest = "0.17.0"
 test-log = "0.2.11"

distant-core/src/api/local/process/pty.rs

@@ -77,7 +77,7 @@ impl PtyProcess {
         // Spawn a blocking task to process submitting stdin async
         let (stdin_tx, mut stdin_rx) = mpsc::channel::<Vec<u8>>(1);
         let mut stdin_writer = pty_master
-            .try_clone_writer()
+            .take_writer()
             .map_err(|x| io::Error::new(io::ErrorKind::Other, x))?;
         let stdin_task = tokio::task::spawn_blocking(move || {
             while let Some(input) = stdin_rx.blocking_recv() {

distant-core/src/data/metadata.rs

@@ -217,7 +217,7 @@ impl From<UnixMetadata> for u32 {
             flags.insert(UnixFilePermissionFlags::OTHER_EXEC);
         }
 
-        flags.bits
+        flags.bits()
     }
 }
 
@@ -378,7 +378,7 @@ impl From<WindowsMetadata> for u32 {
             flags.insert(WindowsFileAttributeFlags::TEMPORARY);
         }
 
-        flags.bits
+        flags.bits()
     }
 }
 

distant-net/Cargo.toml

@@ -12,30 +12,30 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-async-trait = "0.1.58"
-bytes = "1.2.1"
+async-trait = "0.1.68"
+bytes = "1.4.0"
 chacha20poly1305 = "0.10.1"
 derive_more = { version = "0.99.17", default-features = false, features = ["as_mut", "as_ref", "deref", "deref_mut", "display", "from", "error", "into", "into_iterator", "is_variant", "try_into"] }
-dyn-clone = "1.0.9"
-flate2 = "1.0.24"
+dyn-clone = "1.0.11"
+flate2 = "1.0.25"
 hex = "0.4.3"
 hkdf = "0.12.3"
 log = "0.4.17"
-paste = "1.0.9"
-p256 = { version = "0.11.1", features = ["ecdh", "pem"] }
+paste = "1.0.12"
+p256 = { version = "0.13.0", features = ["ecdh", "pem"] }
 rand = { version = "0.8.5", features = ["getrandom"] }
 rmp-serde = "1.1.1"
 sha2 = "0.10.6"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_bytes = "0.11.7"
+serde = { version = "1.0.159", features = ["derive"] }
+serde_bytes = "0.11.9"
 strum = { version = "0.24.1", features = ["derive"] }
-tokio = { version = "1.22.0", features = ["full"] }
+tokio = { version = "1.27.0", features = ["full"] }
 
 # Optional dependencies based on features
-schemars = { version = "0.8.11", optional = true }
+schemars = { version = "0.8.12", optional = true }
 
 [dev-dependencies]
-env_logger = "0.9.3"
-serde_json = "1.0.94"
-tempfile = "3.3.0"
+env_logger = "0.10.0"
+serde_json = "1.0.95"
+tempfile = "3.5.0"
 test-log = "0.2.11"

distant-ssh2/Cargo.toml

@@ -17,34 +17,34 @@ ssh2 = ["wezterm-ssh/ssh2", "wezterm-ssh/vendored-openssl-ssh2"]
 
 [dependencies]
 async-compat = "0.2.1"
-async-once-cell = "0.4.2"
-async-trait = "0.1.58"
+async-once-cell = "0.4.4"
+async-trait = "0.1.68"
 derive_more = { version = "0.99.17", default-features = false, features = ["display", "error"] }
 distant-core = { version = "=0.20.0-alpha.4", path = "../distant-core" }
-futures = "0.3.25"
+futures = "0.3.28"
 hex = "0.4.3"
 log = "0.4.17"
 rand = { version = "0.8.5", features = ["getrandom"] }
-rpassword = "7.1.0"
+rpassword = "7.2.0"
 shell-words = "1.1.0"
-smol = "1.2.5"
-tokio = { version = "1.22.0", features = ["full"] }
-typed-path = "0.1.0"
+smol = "1.3.0"
+tokio = { version = "1.27.0", features = ["full"] }
+typed-path = "0.3.2"
 wezterm-ssh = { version = "0.4.0", default-features = false }
 winsplit = "0.1.0"
 
 # Optional serde support for data structures
-serde = { version = "1.0.147", features = ["derive"], optional = true }
+serde = { version = "1.0.159", features = ["derive"], optional = true }
 
 [dev-dependencies]
-anyhow = "1.0.66"
-assert_fs = "1.0.9"
+anyhow = "1.0.70"
+assert_fs = "1.0.12"
 dunce = "1.0.3"
-env_logger = "0.9.3"
-indoc = "1.0.7"
-once_cell = "1.16.0"
-predicates = "2.1.3"
-rstest = "0.15.0"
+env_logger = "0.10.0"
+indoc = "2.0.1"
+once_cell = "1.17.1"
+predicates = "3.0.2"
+rstest = "0.17.0"
 test-log = "0.2.11"
-which = "4.3.0"
-whoami = "1.2.3"
+which = "4.4.0"
+whoami = "1.4.0"

src/cli/commands/client/format.rs

@@ -415,7 +415,7 @@ fn format_shell(state: &mut FormatterState, data: DistantResponseData) -> Output
             .to_string()
             .into_bytes();
 
-            Output::Stdout(table)
+            Output::StdoutLine(table)
         }
     }
 }

tests/cli/action/search.rs

@@ -37,15 +37,15 @@ fn should_search_filesystem_using_query(mut action_cmd: CtxCommand<Command>) {
         lines.sort_unstable();
 
         // Put together sorted text lines
-        let full_text = lines.join("\n\n");
+        let full_text = format!("{}\n", lines.join("\n\n"));
 
         // Verify that it matches our search results regex
         let regex_fn = predicates::str::is_match(SEARCH_RESULTS_REGEX).unwrap();
 
         regex_fn.eval(&full_text)
     });
 
-    // distant action system-info
+    // distant action search
     action_cmd
         .arg("search")
         .arg("te[a-z]*\\b")

tests/cli/manager/capabilities.rs

@@ -35,6 +35,6 @@ fn should_output_capabilities(ctx: DistantManagerCtx) {
     ctx.new_assert_cmd(vec!["manager", "capabilities"])
         .assert()
         .success()
-        .stdout(format!("{EXPECTED_TABLE}\n"))
+        .stdout(EXPECTED_TABLE)
         .stderr("");
 }