From 7cf5c2cdd9a3b408e0739c5857f894fd95e6bf64 Mon Sep 17 00:00:00 2001 From: Harald Nordgren Date: Fri, 2 Aug 2024 20:53:50 +0200 Subject: [PATCH 1/3] Show dependencies for casks --- Library/Homebrew/cask/info.rb | 18 ++++++++++++ Library/Homebrew/test/cask/info_spec.rb | 38 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/Library/Homebrew/cask/info.rb b/Library/Homebrew/cask/info.rb index 937d620c92..2dc5a076fc 100644 --- a/Library/Homebrew/cask/info.rb +++ b/Library/Homebrew/cask/info.rb @@ -18,6 +18,8 @@ module Cask output << "#{repo}\n" if repo output << name_info(cask) output << desc_info(cask) + deps = deps_info(cask) + output << deps if deps language = language_info(cask) output << language if language output << "#{artifact_info(cask)}\n" @@ -76,6 +78,22 @@ module Cask EOS end + sig { params(cask: Cask).returns(T.nilable(String)) } + def self.deps_info(cask) + depends_on = cask.depends_on + + formula_deps = depends_on[:formula] ? depends_on[:formula].map(&:to_s) : [] + cask_deps = depends_on[:cask] ? depends_on[:cask].map { |dep| "#{dep} (cask)" } : [] + + all_deps = formula_deps + cask_deps + return if all_deps.empty? + + <<~EOS + #{ohai_title("Dependencies")} + #{all_deps.join(", ")} + EOS + end + sig { params(cask: Cask).returns(T.nilable(String)) } def self.language_info(cask) return if cask.languages.empty? diff --git a/Library/Homebrew/test/cask/info_spec.rb b/Library/Homebrew/test/cask/info_spec.rb index d37557cc08..20a5fa214c 100644 --- a/Library/Homebrew/test/cask/info_spec.rb +++ b/Library/Homebrew/test/cask/info_spec.rb @@ -25,6 +25,44 @@ RSpec.describe Cask::Info, :cask do EOS end + it "prints cask dependencies if the Cask has any" do + expect do + described_class.info(Cask::CaskLoader.load("with-depends-on-cask-multiple")) + end.to output(<<~EOS).to_stdout + ==> with-depends-on-cask-multiple: 1.2.3 + https://brew.sh/with-depends-on-cask-multiple + Not installed + From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/w/with-depends-on-cask-multiple.rb + ==> Name + None + ==> Description + None + ==> Dependencies + local-caffeine (cask), local-transmission (cask) + ==> Artifacts + Caffeine.app (App) + EOS + end + + it "prints cask and formulas dependencies if the Cask has both" do + expect do + described_class.info(Cask::CaskLoader.load("with-depends-on-everything")) + end.to output(<<~EOS).to_stdout + ==> with-depends-on-everything: 1.2.3 + https://brew.sh/with-depends-on-everything + Not installed + From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/w/with-depends-on-everything.rb + ==> Name + None + ==> Description + None + ==> Dependencies + unar, local-caffeine (cask), with-depends-on-cask (cask) + ==> Artifacts + Caffeine.app (App) + EOS + end + it "prints auto_updates if the Cask has `auto_updates true`" do expect do described_class.info(Cask::CaskLoader.load("with-auto-updates")) From 676bc0e38fba4e7ca2517f1602df112f7a63c629 Mon Sep 17 00:00:00 2001 From: Harald Nordgren Date: Sat, 3 Aug 2024 21:20:52 +0200 Subject: [PATCH 2/3] Update Library/Homebrew/cask/info.rb Co-authored-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> --- Library/Homebrew/cask/info.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cask/info.rb b/Library/Homebrew/cask/info.rb index 2dc5a076fc..1dd99f3809 100644 --- a/Library/Homebrew/cask/info.rb +++ b/Library/Homebrew/cask/info.rb @@ -82,8 +82,8 @@ module Cask def self.deps_info(cask) depends_on = cask.depends_on - formula_deps = depends_on[:formula] ? depends_on[:formula].map(&:to_s) : [] - cask_deps = depends_on[:cask] ? depends_on[:cask].map { |dep| "#{dep} (cask)" } : [] + formula_deps = depends_on[:formula]&.map(&:to_s) || [] + cask_deps = depends_on[:cask]&.map { |dep| "#{dep} (cask)" } || [] all_deps = formula_deps + cask_deps return if all_deps.empty? From feb1d5593d7acdc015796ea4e42ed6f60965b2db Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 5 Aug 2024 09:33:59 +0100 Subject: [PATCH 3/3] cask/info: tweak style. --- Library/Homebrew/cask/info.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cask/info.rb b/Library/Homebrew/cask/info.rb index 1dd99f3809..11b6149428 100644 --- a/Library/Homebrew/cask/info.rb +++ b/Library/Homebrew/cask/info.rb @@ -82,8 +82,8 @@ module Cask def self.deps_info(cask) depends_on = cask.depends_on - formula_deps = depends_on[:formula]&.map(&:to_s) || [] - cask_deps = depends_on[:cask]&.map { |dep| "#{dep} (cask)" } || [] + formula_deps = Array(depends_on[:formula]).map(&:to_s) + cask_deps = Array(depends_on[:cask]).map { |dep| "#{dep} (cask)" } all_deps = formula_deps + cask_deps return if all_deps.empty?