optionize reject nil value

basecamp · Apr 17, 2024 · c7b3f68 · c7b3f68
1 parent 31669d4
commit c7b3f68
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/kamal/utils.rb b/lib/kamal/utils.rb
@@ -18,10 +18,11 @@ def argumentize(argument, attributes, sensitive: false)
 
   # Returns a list of shell-dashed option arguments. If the value is true, it's treated like a value-less option.
   def optionize(args, with: nil)
+    args = flatten_args(args).reject { |(_key, value)| value.nil? }
     options = if with
-      flatten_args(args).collect { |(key, value)| value == true ? "--#{key}" : "--#{key}#{with}#{escape_shell_value(value)}" }
+      args.collect { |(key, value)| value == true ? "--#{key}" : "--#{key}#{with}#{escape_shell_value(value)}" }
     else
-      flatten_args(args).collect { |(key, value)| [ "--#{key}", value == true ? nil : escape_shell_value(value) ] }
+      args.collect { |(key, value)| [ "--#{key}", value == true ? nil : escape_shell_value(value) ] }
     end
 
     options.flatten.compact

diff --git a/test/utils_test.rb b/test/utils_test.rb
@@ -21,6 +21,11 @@ class UtilsTest < ActiveSupport::TestCase
       Kamal::Utils.optionize({ foo: "bar", baz: "qux", quux: true }, with: "=")
   end
 
+  test "optionize reject nil value" do
+    assert_equal [ "--foo", "\"bar\"", "--baz", "\"qux\"" ], \
+      Kamal::Utils.optionize({ foo: "bar", baz: "qux", quux: nil })
+  end
+
   test "no redaction from #to_s" do
     assert_equal "secret", Kamal::Utils.sensitive("secret").to_s
   end