Implement command_to_string

This also drops the fun_run dependency, and produces more accurate output (e.g. by not escaping command parameters unnecessarily)
heroku · Dec 11, 2024 · 8a69593 · 8a69593
1 parent 155a60c
commit 8a69593
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/buildpacks/dotnet/Cargo.toml b/buildpacks/dotnet/Cargo.toml
@@ -10,7 +10,6 @@ autotests = false
 workspace = true
 
 [dependencies]
-fun_run = "0.2.0"
 hex = "0.4"
 indoc = "2"
 libcnb = "0.25"

diff --git a/buildpacks/dotnet/src/main.rs b/buildpacks/dotnet/src/main.rs
@@ -23,7 +23,6 @@ use buildpacks_jvm_shared::output::{
     print_buildpack_name, print_section, print_subsection, print_warning, run_command,
     track_timing, BuildpackOutputTextSection,
 };
-use fun_run::CommandWithName;
 use indoc::formatdoc;
 use inventory::artifact::{Arch, Os};
 use inventory::{Inventory, ParseInventoryError};
@@ -153,7 +152,7 @@ impl Buildpack for DotnetBuildpack {
 
         print_subsection(vec![
             BuildpackOutputTextSection::regular("Running "),
-            BuildpackOutputTextSection::Command(publish_command.name()),
+            BuildpackOutputTextSection::Command(command_to_string(&publish_command)),
         ]);
         track_timing(|| {
             run_command(
@@ -199,6 +198,15 @@ impl Buildpack for DotnetBuildpack {
     }
 }
 
+fn command_to_string(cmd: &Command) -> String {
+    let mut result = cmd.get_program().to_string_lossy().to_string();
+    for arg in cmd.get_args() {
+        result.push(' ');
+        result.push_str(&arg.to_string_lossy());
+    }
+    result
+}
+
 fn get_solution_to_publish(app_dir: &Path) -> Result<Solution, DotnetBuildpackError> {
     let solution_file_paths =
         detect::solution_file_paths(app_dir).expect("function to pass after detection");

diff --git a/buildpacks/dotnet/tests/dotnet_publish_test.rs b/buildpacks/dotnet/tests/dotnet_publish_test.rs
@@ -71,7 +71,7 @@ fn test_dotnet_publish_with_global_json_and_custom_verbosity_level() {
               &formatdoc! {r#"
                 - Publish solution
                   - Using `Release` build configuration
-                  - Running dotnet publish /workspace/foo.csproj --runtime {rid} "-p:PublishDir=bin/publish" --verbosity normal
+                  - Running dotnet publish /workspace/foo.csproj --runtime {rid} -p:PublishDir=bin/publish --verbosity normal
                     MSBuild version 17.8.3+195e7f5a3 for .NET
                     Build started <PLACEHOLDER>.
                          1>Project "/workspace/foo.csproj" on node 1 (Restore target(s)).