Merge branch 'main' into enh-codespell

ylecuyer · Jan 30, 2024 · a95713f · a95713f
2 parents 5568c37 + ff9cd8d
commit a95713f
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/nuget/lib/dependabot/nuget/native_helpers.rb b/nuget/lib/dependabot/nuget/native_helpers.rb
@@ -1,6 +1,8 @@
 # typed: true
 # frozen_string_literal: true
 
+require "shellwords"
+
 require_relative "nuget_config_credential_helpers"
 
 module Dependabot
@@ -15,15 +17,16 @@ def self.native_helpers_root
 
       def self.run_nuget_framework_check(project_tfms, package_tfms)
         exe_path = File.join(native_helpers_root, "NuGetUpdater", "NuGetUpdater.Cli")
-        command = [
+        command_parts = [
           exe_path,
           "framework-check",
           "--project-tfms",
           *project_tfms,
           "--package-tfms",
           *package_tfms,
           "--verbose"
-        ].join(" ")
+        ]
+        command = Shellwords.join(command_parts)
 
         fingerprint = [
           exe_path,
@@ -50,7 +53,7 @@ def self.run_nuget_framework_check(project_tfms, package_tfms)
       # rubocop:disable Metrics/MethodLength
       def self.run_nuget_updater_tool(repo_root:, proj_path:, dependency:, is_transitive:, credentials:)
         exe_path = File.join(native_helpers_root, "NuGetUpdater", "NuGetUpdater.Cli")
-        command = [
+        command_parts = [
           exe_path,
           "update",
           "--repo-root",
@@ -63,9 +66,11 @@ def self.run_nuget_updater_tool(repo_root:, proj_path:, dependency:, is_transiti
           dependency.version,
           "--previous-version",
           dependency.previous_version,
-          is_transitive ? "--transitive" : "",
+          is_transitive ? "--transitive" : nil,
           "--verbose"
-        ].join(" ")
+        ].compact
+
+        command = Shellwords.join(command_parts)
 
         fingerprint = [
           exe_path,
@@ -80,9 +85,9 @@ def self.run_nuget_updater_tool(repo_root:, proj_path:, dependency:, is_transiti
           "<new-version>",
           "--previous-version",
           "<previous-version>",
-          is_transitive ? "--transitive" : "",
+          is_transitive ? "--transitive" : nil,
           "--verbose"
-        ].join(" ")
+        ].compact.join(" ")
 
         puts "running NuGet updater:\n" + command