refactored indent_payload()

cargo-near-build/Cargo.toml

@@ -35,6 +35,7 @@ shell-words = { version = "1.0.0", optional = true }
 wasm-opt = "=0.116.1"
 humantime = "2.1.0"
 near-cli-rs = { version = "0.15.1", default-features = false }
+indenter = "0.3"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 nix = { version = "0.29.0", features = ["user", "process"], optional = true }

cargo-near-build/src/cargo_native/compile.rs

@@ -5,6 +5,7 @@ use cargo_metadata::{Artifact, Message};
 use eyre::{ContextCompat, WrapErr};
 use std::io::BufRead;
 
+use crate::pretty_print;
 use crate::types::near::build::input::ColorPreference;
 use crate::types::{cargo::manifest_path::ManifestPath, near::build::output::CompilationArtifact};
 
@@ -143,7 +144,7 @@ where
         target: "near_teach_me",
         parent: &tracing::Span::none(),
         "Invoking cargo:\n{}",
-        near_cli_rs::common::indent_payload(&format!("{:#?}", cmd))
+        pretty_print::indent_payload(&format!("{:#?}", cmd))
     );
     tracing::info!("Invoking cargo: {:#?}", cmd);
 

cargo-near-build/src/cargo_native/target.rs

@@ -2,6 +2,8 @@ use std::{ffi::OsStr, io::BufRead, path::PathBuf, process::Command};
 
 use eyre::WrapErr;
 
+use crate::pretty_print;
+
 pub const COMPILATION_TARGET: &str = "wasm32-unknown-unknown";
 
 pub fn wasm32_exists() -> bool {
@@ -57,7 +59,7 @@ fn get_rustc_wasm32_unknown_unknown_target_libdir() -> eyre::Result<PathBuf> {
         target: "near_teach_me",
         parent: &tracing::Span::none(),
         "Execution command:\n{}",
-        near_cli_rs::common::indent_payload(&format!("`{:?}`", command).replace("\"", ""))
+        pretty_print::indent_payload(&format!("`{:?}`", command).replace("\"", ""))
     );
 
     let output = command.output()?;
@@ -86,7 +88,7 @@ where
         target: "near_teach_me",
         parent: &tracing::Span::none(),
         "Invoking rustup:\n{}",
-        near_cli_rs::common::indent_payload(&format!("`{}`", format!("{:?}", cmd).replace("\"", "")))
+        pretty_print::indent_payload(&format!("`{}`", format!("{:?}", cmd).replace("\"", "")))
     );
     tracing::info!(
         "Invoking rustup: `{}`",

cargo-near-build/src/env_keys.rs

@@ -11,6 +11,7 @@ pub(crate) const CARGO_NEAR_ABI_SCHEMA_VERSION: &str = "CARGO_NEAR_ABI_SCHEMA_VE
 /// module contains variables, which are set to configure build with WASM reproducibility,
 /// which correspond to some fields of `ContractSourceMetadata` in <https://github.com/near/NEPs/blob/master/neps/nep-0330.md>
 pub mod nep330 {
+    use crate::pretty_print;
     use std::collections::HashMap;
 
     // ====================== NEP-330 1.2.0 - Build Details Extension ===========
@@ -52,7 +53,7 @@ pub mod nep330 {
             target: "near_teach_me",
             parent: &tracing::Span::none(),
             "Variables, relevant for reproducible builds:\n{}",
-            near_cli_rs::common::indent_payload(&format!("{:#?}", env_map))
+            pretty_print::indent_payload(&format!("{:#?}", env_map))
         );
     }
 }

cargo-near-build/src/near/abi/generate/dylib.rs

@@ -4,6 +4,7 @@ use std::fs;
 use camino::Utf8Path;
 
 use crate::cargo_native::Dylib;
+use crate::pretty_print;
 use crate::types::near::build::output::CompilationArtifact;
 
 pub fn extract_abi_entries(
@@ -38,7 +39,7 @@ pub fn extract_abi_entries(
         target: "near_teach_me",
         parent: &tracing::Span::none(),
         "Detected NEAR ABI symbols:\n{}",
-        near_cli_rs::common::indent_payload(&format!("{:#?}", &near_abi_symbols))
+        pretty_print::indent_payload(&format!("{:#?}", &near_abi_symbols))
     );
     tracing::debug!("Detected NEAR ABI symbols: {:?}", &near_abi_symbols);
 

cargo-near-build/src/near/build/export.rs

@@ -1,11 +1,11 @@
-use crate::{env_keys, types::near::build::input::Opts};
+use crate::{env_keys, pretty_print, types::near::build::input::Opts};
 
 pub fn nep_330_build_command(args: &Opts) -> eyre::Result<()> {
     tracing::info!(
         target: "near_teach_me",
         parent: &tracing::Span::none(),
         "Compute `CARGO_NEAR_BUILD_COMMAND`, current executable:\n{}",
-        near_cli_rs::common::indent_payload(&format!("`{}`", std::env::args().collect::<Vec<String>>().join(" ")))
+        pretty_print::indent_payload(&format!("`{}`", std::env::args().collect::<Vec<String>>().join(" ")))
     );
     tracing::debug!(
         "compute `CARGO_NEAR_BUILD_COMMAND`,  current executable: {:?}",

cargo-near-build/src/near/docker_build/subprocess_step.rs

@@ -11,6 +11,7 @@ use std::{
 use nix::unistd::{getgid, getuid};
 
 use crate::env_keys;
+use crate::pretty_print;
 use crate::types::near::docker_build::subprocess::{container_paths, env_vars};
 use crate::types::near::docker_build::{cloned_repo, metadata};
 
@@ -75,7 +76,7 @@ pub fn run(
                 target: "near_teach_me",
                 parent: &tracing::Span::none(),
                 "Input device is a TTY:\n{}",
-                near_cli_rs::common::indent_payload(&stdin_is_terminal.to_string())
+                pretty_print::indent_payload(&stdin_is_terminal.to_string())
             );
             tracing::debug!("input device is a tty: {}", stdin_is_terminal);
             if stdin_is_terminal
@@ -93,7 +94,7 @@ pub fn run(
                 target: "near_teach_me",
                 parent: &tracing::Span::none(),
                 "Execution docker command:\n{}",
-                near_cli_rs::common::indent_payload(&format!("`{}`", docker_args.join(" ")))
+                pretty_print::indent_payload(&format!("`{}`", docker_args.join(" ")))
             );
             tracing::debug!("docker command : {:#?}", docker_args);
             docker_args

cargo-near-build/src/pretty_print.rs

@@ -33,3 +33,14 @@ pub fn duration(start: Instant, activity: &str) {
         humantime::format_duration(duration)
     );
 }
+
+pub fn indent_payload(s: &str) -> String {
+    use std::fmt::Write;
+
+    let mut indented_string = String::new();
+    indenter::indented(&mut indented_string)
+        .with_str(" |    ")
+        .write_str(s)
+        .ok();
+    indented_string
+}

cargo-near-build/src/types/cargo/metadata.rs

@@ -5,6 +5,7 @@ use cargo_metadata::{MetadataCommand, Package};
 use colored::Colorize;
 use eyre::{ContextCompat, WrapErr};
 
+use crate::pretty_print;
 use crate::types::near::build::buildtime_env;
 
 use super::manifest_path::ManifestPath;
@@ -54,7 +55,7 @@ impl CrateMetadata {
         tracing::info!(
             target: "near_teach_me",
             parent: &tracing::Span::none(),
-            "Crate metadata:\n{}", near_cli_rs::common::indent_payload(
+            "Crate metadata:\n{}", pretty_print::indent_payload(
                 "Metadata information is very large. So, if you need it, use the \"RUST_LOG=trace\" flag. \
                     For example, `RUST_LOG=trace cargo-near near build`"
             )
@@ -111,7 +112,7 @@ fn get_cargo_metadata(
         target: "near_teach_me",
         parent: &tracing::Span::none(),
         "Execution command:\n{}",
-        near_cli_rs::common::indent_payload(&format!("`{:?}`", cmd.cargo_command()).replace("\"", ""))
+        pretty_print::indent_payload(&format!("`{:?}`", cmd.cargo_command()).replace("\"", ""))
     );
     tracing::debug!("metadata command: {:#?}", cmd.cargo_command());
     let metadata = cmd.exec();