From 087af1f285a6430b508aff11b4ccd986563ec0d2 Mon Sep 17 00:00:00 2001
From: dcookspi <92065525+dcookspi@users.noreply.github.com>
Date: Wed, 15 May 2024 12:28:18 -0700
Subject: [PATCH] Add -v flags to `spk-convert-pip` and update `spk convert` to
 pass verbosity through (#1019)

* Adds verbose flag to spk-convert-pip, and updates spk convert to pass verbosity level on

Signed-off-by: David Gilligan-Cook <dcook@imageworks.com>
---
 Cargo.lock                                    | 1 +
 crates/spk-cli/cmd-convert/Cargo.toml         | 1 +
 crates/spk-cli/cmd-convert/src/cmd_convert.rs | 5 +++++
 packages/spk-convert-pip/spk-convert-pip      | 7 +++++++
 4 files changed, 14 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index c8c32e392..068a289c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3966,6 +3966,7 @@ dependencies = [
  "miette",
  "spk-cli-common",
  "spk-cmd-env",
+ "tracing",
 ]
 
 [[package]]
diff --git a/crates/spk-cli/cmd-convert/Cargo.toml b/crates/spk-cli/cmd-convert/Cargo.toml
index 3aff6c7e3..204957d90 100644
--- a/crates/spk-cli/cmd-convert/Cargo.toml
+++ b/crates/spk-cli/cmd-convert/Cargo.toml
@@ -13,3 +13,4 @@ async-trait = { workspace = true }
 clap = { workspace = true }
 spk-cli-common = { workspace = true }
 spk-cmd-env = { workspace = true }
+tracing = { workspace = true }
diff --git a/crates/spk-cli/cmd-convert/src/cmd_convert.rs b/crates/spk-cli/cmd-convert/src/cmd_convert.rs
index acc58f5d5..e0be7a457 100644
--- a/crates/spk-cli/cmd-convert/src/cmd_convert.rs
+++ b/crates/spk-cli/cmd-convert/src/cmd_convert.rs
@@ -44,6 +44,11 @@ impl Run for Convert {
 
         let mut command = vec![converter_package.clone()];
         command.extend(self.args.clone());
+        if self.verbose > 0 {
+            // Pass the verbosity level into the conversion command
+            command.push(format!("-{}", "v".repeat(self.verbose.into())));
+        }
+        tracing::debug!("Underlying command: {}", command.join(" "));
 
         let mut env = spk_cmd_env::cmd_env::Env {
             solver: self.solver.clone(),
diff --git a/packages/spk-convert-pip/spk-convert-pip b/packages/spk-convert-pip/spk-convert-pip
index 0f1dc70b6..599b35045 100755
--- a/packages/spk-convert-pip/spk-convert-pip
+++ b/packages/spk-convert-pip/spk-convert-pip
@@ -41,6 +41,10 @@ def main() -> int:
     pip_cmd = argparse.ArgumentParser(
         "spk-convert-pip", description="Convert and import packages using pip"
     )
+    pip_cmd.add_argument(
+        "-v", "--verbose",  action="count", dest="verbose", default=0,
+        help="Increase the verbosity of the output"
+    )
     pip_cmd.add_argument(
         "--python-version", default="3.7", help="The version of python to install for"
     )
@@ -89,6 +93,9 @@ def main() -> int:
     original_cmd_and_args = " ".join(sys.argv)
     args = pip_cmd.parse_args()
 
+    if args.verbose > 0:
+        _LOGGER.setLevel(logging.DEBUG)
+
     specs = []
     importer = PipImporter().with_cli_args(original_cmd_and_args).recursive(args.deps)
     if args.python_version: