Merge pull request #19921 from Homebrew/cask_args-combine

bundle/dsl: combine cask_args calls

Author: MikeMcQuaid

Library/Homebrew/bundle/cask_installer.rb

@@ -41,7 +41,7 @@ def self.install(name, preinstall: true, no_upgrade: false, verbose: false, forc
             case v
             when TrueClass
               "--#{k}"
-            when FalseClass
+            when FalseClass, NilClass
               nil
             else
               "--#{k}=#{v}"

Library/Homebrew/bundle/dsl.rb

@@ -42,7 +42,7 @@ def process
       def cask_args(args)
         raise "cask_args(#{args.inspect}) should be a Hash object" unless args.is_a? Hash
 
-        @cask_arguments = args
+        @cask_arguments.merge!(args)
       end
 
       def brew(name, options = {})

Library/Homebrew/test/bundle/dsl_spec.rb

@@ -60,6 +60,20 @@ def dsl_from_string(string)
     end
   end
 
+  context "with multiple cask_args" do
+    subject(:dsl) do
+      dsl_from_string <<~EOS
+        cask_args appdir: '/global-apps'
+        cask_args require_sha: true
+        cask_args appdir: '~/my-apps'
+      EOS
+    end
+
+    it "merges the arguments" do
+      expect(dsl.cask_arguments).to eql(appdir: "~/my-apps", require_sha: true)
+    end
+  end
+
   context "with invalid input" do
     it "handles completely invalid code" do
       expect { dsl_from_string "abcdef" }.to raise_error(RuntimeError)