Merge pull request Homebrew#18917 from Homebrew/send-args-to-cask-info

cask/info: send missing args after removing openstruct

Library/Homebrew/cask/info.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "cmd/info"
 
 module Cask
   class Info
@@ -31,12 +32,12 @@ def self.get_info(cask)
       output
     end
 
-    sig { params(cask: Cask).void }
-    def self.info(cask)
+    sig { params(cask: Cask, args: Homebrew::Cmd::Info::Args).void }
+    def self.info(cask, args:)
       puts get_info(cask)
 
       require "utils/analytics"
-      ::Utils::Analytics.cask_output(cask, args: Homebrew::CLI::Args.new)
+      ::Utils::Analytics.cask_output(cask, args:)
     end
 
     sig { params(cask: Cask).returns(String) }

Library/Homebrew/cmd/info.rb

@@ -382,7 +382,7 @@ def dep_display_s(dep)
       def info_cask(cask)
         require "cask/info"
 
-        Cask::Info.info(cask)
+        Cask::Info.info(cask, args:)
       end
     end
   end

Library/Homebrew/test/cask/info_spec.rb

@@ -3,14 +3,16 @@
 require "utils"
 
 RSpec.describe Cask::Info, :cask do
+  let(:args) { instance_double(Homebrew::Cmd::Info::Args) }
+
   before do
     # Prevent unnecessary network requests in `Utils::Analytics.cask_output`
     ENV["HOMEBREW_NO_ANALYTICS"] = "1"
   end
 
   it "displays some nice info about the specified Cask" do
     expect do
-      described_class.info(Cask::CaskLoader.load("local-transmission"))
+      described_class.info(Cask::CaskLoader.load("local-transmission"), args:)
     end.to output(<<~EOS).to_stdout
       ==> local-transmission: 2.61
       https://transmissionbt.com/
@@ -27,7 +29,7 @@
 
   it "prints cask dependencies if the Cask has any" do
     expect do
-      described_class.info(Cask::CaskLoader.load("with-depends-on-cask-multiple"))
+      described_class.info(Cask::CaskLoader.load("with-depends-on-cask-multiple"), args:)
     end.to output(<<~EOS).to_stdout
       ==> with-depends-on-cask-multiple: 1.2.3
       https://brew.sh/with-depends-on-cask-multiple
@@ -46,7 +48,7 @@
 
   it "prints cask and formulas dependencies if the Cask has both" do
     expect do
-      described_class.info(Cask::CaskLoader.load("with-depends-on-everything"))
+      described_class.info(Cask::CaskLoader.load("with-depends-on-everything"), args:)
     end.to output(<<~EOS).to_stdout
       ==> with-depends-on-everything: 1.2.3
       https://brew.sh/with-depends-on-everything
@@ -65,7 +67,7 @@
 
   it "prints auto_updates if the Cask has `auto_updates true`" do
     expect do
-      described_class.info(Cask::CaskLoader.load("with-auto-updates"))
+      described_class.info(Cask::CaskLoader.load("with-auto-updates"), args:)
     end.to output(<<~EOS).to_stdout
       ==> with-auto-updates: 1.0 (auto_updates)
       https://brew.sh/autoupdates
@@ -82,7 +84,7 @@
 
   it "prints caveats if the Cask provided one" do
     expect do
-      described_class.info(Cask::CaskLoader.load("with-caveats"))
+      described_class.info(Cask::CaskLoader.load("with-caveats"), args:)
     end.to output(<<~EOS).to_stdout
       ==> with-caveats: 1.2.3
       https://brew.sh/
@@ -109,7 +111,7 @@
 
   it 'does not print "Caveats" section divider if the caveats block has no output' do
     expect do
-      described_class.info(Cask::CaskLoader.load("with-conditional-caveats"))
+      described_class.info(Cask::CaskLoader.load("with-conditional-caveats"), args:)
     end.to output(<<~EOS).to_stdout
       ==> with-conditional-caveats: 1.2.3
       https://brew.sh/
@@ -126,7 +128,7 @@
 
   it "prints languages specified in the Cask" do
     expect do
-      described_class.info(Cask::CaskLoader.load("with-languages"))
+      described_class.info(Cask::CaskLoader.load("with-languages"), args:)
     end.to output(<<~EOS).to_stdout
       ==> with-languages: 1.2.3
       https://brew.sh/
@@ -145,7 +147,7 @@
 
   it 'does not print "Languages" section divider if the languages block has no output' do
     expect do
-      described_class.info(Cask::CaskLoader.load("without-languages"))
+      described_class.info(Cask::CaskLoader.load("without-languages"), args:)
     end.to output(<<~EOS).to_stdout
       ==> without-languages: 1.2.3
       https://brew.sh/
@@ -173,7 +175,7 @@
       expect(Cask::Tab).to receive(:for_cask).with(cask).and_return(tab)
 
       expect do
-        described_class.info(cask)
+        described_class.info(cask, args:)
       end.to output(<<~EOS).to_stdout
         ==> local-transmission: 2.61
         https://transmissionbt.com/