From 40fd8f7d787fd99f4329d9cbe6236c49d49d230b Mon Sep 17 00:00:00 2001
From: Bevan Kay <email@bevankay.me>
Date: Mon, 5 Dec 2022 14:26:38 +1100
Subject: [PATCH] unversioned_cask_checker: check installer artifacts

---
 .../livecheck/strategy/extract_plist_spec.rb  |   8 ++++++++
 .../livecheck/installer-manual-livecheck.rb   |  16 ++++++++++++++++
 .../test/support/fixtures/cask/caffeine.zip   | Bin 1328 -> 2296 bytes
 Library/Homebrew/unversioned_cask_checker.rb  |  10 ++++++++--
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 Library/Homebrew/test/support/fixtures/cask/Casks/livecheck/installer-manual-livecheck.rb

diff --git a/Library/Homebrew/test/livecheck/strategy/extract_plist_spec.rb b/Library/Homebrew/test/livecheck/strategy/extract_plist_spec.rb
index 5e7e03f669..fef1695751 100644
--- a/Library/Homebrew/test/livecheck/strategy/extract_plist_spec.rb
+++ b/Library/Homebrew/test/livecheck/strategy/extract_plist_spec.rb
@@ -106,4 +106,12 @@ describe Homebrew::Livecheck::Strategy::ExtractPlist do
         .to raise_error(TypeError, Homebrew::Livecheck::Strategy::INVALID_BLOCK_RETURN_VALUE_MSG)
     end
   end
+
+  describe "::find_versions" do
+    it "can be used with an installer artifact" do
+      cask = Cask::CaskLoader.load(cask_path("livecheck/installer-manual-livecheck"))
+
+      expect(extract_plist.find_versions(cask: cask)[:matches].values).to eq(["1.2.3"])
+    end
+  end
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/livecheck/installer-manual-livecheck.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/livecheck/installer-manual-livecheck.rb
new file mode 100644
index 0000000000..e57431e237
--- /dev/null
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/livecheck/installer-manual-livecheck.rb
@@ -0,0 +1,16 @@
+cask "installer-manual-livecheck" do
+  version "1.2.3"
+  sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
+
+  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
+  name "With Installer Manual"
+  desc "Cask with a manual installer"
+  homepage "https://brew.sh/"
+
+  livecheck do
+    url :url
+    strategy :extract_plist
+  end
+
+  installer manual: "Caffeine.app"
+end
diff --git a/Library/Homebrew/test/support/fixtures/cask/caffeine.zip b/Library/Homebrew/test/support/fixtures/cask/caffeine.zip
index 99d61bbfb7b30994ef3c7de1bf3a4a34b40c95ce..646884181a72c87a77df1e73dbe6dd7be9937f18 100644
GIT binary patch
literal 2296
zcmWIWW@Zs#00EC|5l=7!O7Jo$FgPcsrKM)(rRpUX6zGSB@G`L9Ji9%d_1yMwwWQwU
z(h6<{MwYLP3=Ci+0&p57hHjK|eqKpxUP&>+Og2)@l)-7HZ(_24Fa;(n;50cXwK%`D
zC^?l_cXKdsFuW~l4TS~ke_&AIHr+EXEnlx7C$qQ&9MbwJy~!|)7Sc;6IC>v35NLh>
zSJd!(TA8Se%I%}MWeWqYHN_rG&J5yR=IOC$>;HRKsshTcHg8XSw)Z`6|GN8Ct#PfN
zFTD_ro5bqow7t#y?~X(5Rny}hmQK51TsHeU|5dR_)mn$EiNRu)hcplLZuMf=Fl*r|
zop)Ixk_@+P-F|4YRP!3}FlVZXX8PK5+J>Bqcz7tnEkcU7g}pENjL-jXe$y0OcIF&5
zIr1^GCvxBIJsIm*Cf{3?cE^100t4B!PJX?8^Pl=&=Un;tWpN>oMoD@^%JD77dcPOH
z<Gi98`N!#}yPdez2|up#L-Mzk-rnz-zdvqLanZ-Co{4&s4!K{9{KOaF&CbD?75?G}
zFhD_J2}yD2p?n)Cs|^h2_;_DOXaC>`eUwxTPkMUsI0D=f81QHTo}3_>oSu-B@WIz7
z>;r#TM?eG91PNw!0cpmMUJ7g<^Nj^qWt^Rw7Who)V|LK#UDm>>rFY<f!qhqQS5J=!
zm@s+O^vMx1K~ZyNO_~%jX_brsPiQq`$4*HJ7r|FtU7t<|eHQvWDOl2Ea@AzVu5I6E
zG>RG<8FYNu99QzZb_zGpo9rA<I$wUR19}YPIgq!xfJuvi;a~=8o|Of98@q1<veQA{
z1*a^jliR~_<~Mebxp086Y8RSSDmblz<Ug1*z%~kyW8+CQ8+CEoh{%^PTlF%N^NPV%
zYms6#Ba;X-?$QtzDsLS@EVxy~m5sQK29=I5@Yc~A-Dr4%1$zfn{^E=~+;)IUOBi_T
zI3K4S#Fm}7Z32~VF!0v#Cr+CXaYn4aVEG)m1VFZJNn<!8TC~8!4o6l8m9J=7J-{2{
zH<)e684pydz`&Bmy-W<$EMq_xb1~!2*9eQZFyrzj(YYL96}Ehhuu7f<msO<Za)gc8
h@-@Q7i8yUUq!@VCBQBS-vVn}}1j1{;kmF$m@c>gOVbuTt

literal 1328
zcmWIWW@h1H00B>J5l=7!O7JoWFgPcsrKM)(rRpUX6zGRW@G!8R+a7-N?Dp`lj0_9`
zIJJtQYjw`gD@n~ODF&OthSiKq8mQJQ;55TCFD+lMASbi91mq%+X*MSbxkv`5X}*cc
z{=s<MwF}K%Dg;b|1sTk30vK*Ph-RWJP7?#N(?Onv86|~b6ndQD4z!@u;{4L0<Wzi7
za1za7x;Pz%Fb(Eiz0BmiVwgj<;0|SE5@p7fym(-#&Ec&hhzU0elGr%li7mhzw=rT2
z$i`Ts8-tYaIKW8-lz5TN!%TJv^OiK$<1`OB5kgD`B|>DA(c?x2#ieI)nhZ;j*xien
z9Fg5C4$PJ)!3g(1#8jAEXavM`P~t>(GiK66Ha!!k>F|UKF&30ik&Q(U3I&v)*n-no
yL^6Xp7(MzhlPt1>nV4_|2f}1nkU$eK!~>uN9N^8$28<*I4j|kMG$<B`85jT~#5J}6

diff --git a/Library/Homebrew/unversioned_cask_checker.rb b/Library/Homebrew/unversioned_cask_checker.rb
index af6a659573..6b465d10f7 100644
--- a/Library/Homebrew/unversioned_cask_checker.rb
+++ b/Library/Homebrew/unversioned_cask_checker.rb
@@ -36,6 +36,11 @@ module Homebrew
       @qlplugins ||= @cask.artifacts.select { |a| a.is_a?(Cask::Artifact::Qlplugin) }
     end
 
+    sig { returns(T::Array[Cask::Artifact::Installer]) }
+    def installers
+      @installers ||= @cask.artifacts.select { |a| a.is_a?(Cask::Artifact::Installer) }
+    end
+
     sig { returns(T::Array[Cask::Artifact::Pkg]) }
     def pkgs
       @pkgs ||= @cask.artifacts.select { |a| a.is_a?(Cask::Artifact::Pkg) }
@@ -88,8 +93,9 @@ module Homebrew
 
         installer.extract_primary_container(to: dir)
 
-        info_plist_paths = apps.concat(qlplugins).flat_map do |artifact|
-          top_level_info_plists(Pathname.glob(dir/"**"/artifact.source.basename/"Contents"/"Info.plist")).sort
+        info_plist_paths = apps.concat(qlplugins, installers).flat_map do |artifact|
+          source = artifact.is_a?(Cask::Artifact::Installer) ? artifact.path : artifact.source.basename
+          top_level_info_plists(Pathname.glob(dir/"**"/source/"Contents"/"Info.plist")).sort
         end
 
         info_plist_paths.each(&parse_info_plist)