Add cask install receipts

Library/Homebrew/build.rb

@@ -177,8 +177,8 @@ def install
             formula.install
 
             stdlibs = detect_stdlibs
-            tab = Tab.create(formula, ENV.compiler, stdlibs.first)
-            tab.write
+            tab = Tab.create_from_formula(formula, ENV.compiler, stdlibs.first)
+            tab.write_formula_file
 
             # Find and link metafiles
             formula.prefix.install_metafiles formula.buildpath

Library/Homebrew/cask/cask.rb

@@ -209,6 +209,10 @@ def bundle_long_version
       bundle_version&.version
     end
 
+    def tab
+      Tab.for_cask(self)
+    end
+
     def config_path
       metadata_main_container_path/"config.json"
     end
@@ -465,6 +469,24 @@ def to_hash_with_variations(hash_method: :to_h)
       hash
     end
 
+    def artifacts_list(compact: false, uninstall_phase_only: false)
+      artifacts.filter_map do |artifact|
+        if uninstall_phase_only &&
+           !artifact.respond_to?(:uninstall_phase) && !artifact.respond_to?(:post_uninstall_phase)
+          next
+        end
+
+        case artifact
+        when Artifact::AbstractFlightBlock
+          # Only indicate whether this block is used as we don't load it from the API
+          # We can skip this entirely once we move to internal JSON v3.
+          { artifact.summarize => nil } unless compact
+        else
+          { artifact.class.dsl_key => artifact.to_args }
+        end
+      end
+    end
+
     private
 
     sig { returns(T.nilable(Homebrew::BundleVersion)) }
@@ -482,19 +504,6 @@ def api_to_local_hash(hash)
       hash
     end
 
-    def artifacts_list(compact: false)
-      artifacts.filter_map do |artifact|
-        case artifact
-        when Artifact::AbstractFlightBlock
-          # Only indicate whether this block is used as we don't load it from the API
-          # We can skip this entirely once we move to internal JSON v3.
-          { artifact.summarize => nil } unless compact
-        else
-          { artifact.class.dsl_key => artifact.to_args }
-        end
-      end
-    end
-
     def url_specs
       url&.specs.dup.tap do |url_specs|
         case url_specs&.dig(:user_agent)

Library/Homebrew/cask/info.rb

@@ -12,7 +12,7 @@
       output << "#{Formatter.url(cask.homepage)}\n" if cask.homepage
       deprecate_disable = DeprecateDisable.message(cask)
       output << "#{deprecate_disable.capitalize}\n" if deprecate_disable
-      output << installation_info(cask)
+      output << "#{installation_info(cask)}\n"
       repo = repo_info(cask)
       output << "#{repo}\n" if repo
       output << name_info(cask)
@@ -37,7 +37,7 @@
     end
 
     def self.installation_info(cask)
-      return "Not installed\n" unless cask.installed?
+      return "Not installed" unless cask.installed?
 
       versioned_staged_path = cask.caskroom_path.join(cask.installed_version)
       path_details = if versioned_staged_path.exist?
@@ -46,7 +46,12 @@
         Formatter.error("does not exist")
       end
 
-      "Installed\n#{versioned_staged_path} (#{path_details})\n"
+      tab = Tab.for_cask(cask)
+
+      info = ["Installed"]
+      info << "#{versioned_staged_path} (#{path_details})"
+      info << "  #{tab.to_cask_install_message}" if tab.tabfile&.exist?
+      info.join("\n")
     end
 
     def self.name_info(cask)

Library/Homebrew/cask/installer.rb

@@ -21,8 +21,8 @@ class Installer
     def initialize(cask, command: SystemCommand, force: false, adopt: false,
                    skip_cask_deps: false, binaries: true, verbose: false,
                    zap: false, require_sha: false, upgrade: false, reinstall: false,
-                   installed_as_dependency: false, quarantine: true,
-                   verify_download_integrity: true, quiet: false)
+                   installed_as_dependency: false, installed_on_request: true,
+                   quarantine: true, verify_download_integrity: true, quiet: false)
       @cask = cask
       @command = command
       @force = force
@@ -35,13 +35,14 @@ def initialize(cask, command: SystemCommand, force: false, adopt: false,
       @reinstall = reinstall
       @upgrade = upgrade
       @installed_as_dependency = installed_as_dependency
+      @installed_on_request = installed_on_request
       @quarantine = quarantine
       @verify_download_integrity = verify_download_integrity
       @quiet = quiet
     end
 
     attr_predicate :binaries?, :force?, :adopt?, :skip_cask_deps?, :require_sha?,
-                   :reinstall?, :upgrade?, :verbose?, :zap?, :installed_as_dependency?,
+                   :reinstall?, :upgrade?, :verbose?, :zap?, :installed_as_dependency?, :installed_on_request?,
                    :quarantine?, :quiet?
 
     def self.caveats(cask)
@@ -112,6 +113,11 @@ def install
 
       install_artifacts(predecessor:)
 
+      tab = Tab.create_from_cask(@cask)
+      tab.installed_as_dependency = installed_as_dependency?
+      tab.installed_on_request = installed_on_request?
+      tab.write_cask_file
+
       if (tap = @cask.tap) && tap.should_report_analytics?
         ::Utils::Analytics.report_package_event(:cask_install, package_name: @cask.token, tap_name: tap.name,
 on_request: true)
@@ -356,6 +362,7 @@ def satisfy_cask_and_formula_dependencies
             binaries:                binaries?,
             verbose:                 verbose?,
             installed_as_dependency: true,
+            installed_on_request:    false,
             force:                   false,
           ).install
         else
@@ -408,13 +415,20 @@ def uninstall(successor: nil)
       oh1 "Uninstalling Cask #{Formatter.identifier(@cask)}"
       uninstall_artifacts(clear: true, successor:)
       if !reinstall? && !upgrade?
+        remove_tabfile
         remove_download_sha
         remove_config_file
       end
       purge_versioned_files
       purge_caskroom_path if force?
     end
 
+    def remove_tabfile
+      tabfile = @cask.tab.tabfile
+      FileUtils.rm_f tabfile if tabfile.present? && tabfile.exist?
+      @cask.config_path.parent.rmdir_if_possible
+    end
+
     def remove_config_file
       FileUtils.rm_f @cask.config_path
       @cask.config_path.parent.rmdir_if_possible

Library/Homebrew/cmd/info.rb

@@ -304,7 +304,7 @@
           puts "Installed"
           kegs.each do |keg|
             puts "#{keg} (#{keg.abv})#{" *" if keg.linked?}"
-            tab = keg.tab.to_s
+            tab = keg.tab.to_formula_install_message
             puts "  #{tab}" unless tab.empty?
           end
         end

Library/Homebrew/cmd/tab.rb

@@ -10,7 +10,7 @@
     class TabCmd < AbstractCommand
       cmd_args do
         description <<~EOS
-          Edit tab information for installed formulae.
+          Edit tab information for installed formulae or casks.
 
           This can be useful when you want to control whether an installed
           formula should be removed by `brew autoremove`.
@@ -19,13 +19,18 @@
         EOS
 
         switch "--installed-on-request",
-               description: "Mark <formula> as installed on request."
+               description: "Mark <installed_formula> or <installed_cask> as installed on request."
         switch "--no-installed-on-request",
-               description: "Mark <formula> as not installed on request."
+               description: "Mark <installed_formula> or <installed_cask> as not installed on request."
+        switch "--formula", "--formulae",
+               description: "Only mark formulae."
+        switch "--cask", "--casks",
+               description: "Only mark casks."
 
+        conflicts "--formula", "--cask"
         conflicts "--installed-on-request", "--no-installed-on-request"
 
-        named_args :formula, min: 1
+        named_args [:installed_formula, :installed_cask], min: 1
       end
 
       sig { override.void }
@@ -37,38 +42,51 @@
         end
         raise UsageError, "No marking option specified." if installed_on_request.nil?
 
-        formulae = args.named.to_formulae
-        if (formulae_not_installed = formulae.reject(&:any_version_installed?)).any?
-          formula_names = formulae_not_installed.map(&:name)
-          is_or_are = (formula_names.length == 1) ? "is" : "are"
-          odie "#{formula_names.to_sentence} #{is_or_are} not installed."
+        formulae, casks = args.named.to_formulae_to_casks
+        formulae_not_installed = formulae.reject(&:any_version_installed?)
+        casks_not_installed = casks.reject(&:installed?)
+        if formulae_not_installed.any? || casks_not_installed.any?
+          names = formulae_not_installed.map(&:name) + casks_not_installed.map(&:token)
+          is_or_are = (names.length == 1) ? "is" : "are"
+          odie "#{names.to_sentence} #{is_or_are} not installed."
         end
 
-        formulae.each do |formula|
-          update_tab formula, installed_on_request:
+        [*formulae, *casks].each do |formula_or_cask|
+          update_tab formula_or_cask, installed_on_request:
         end
       end
 
       private
 
-      sig { params(formula: Formula, installed_on_request: T::Boolean).void }
-      def update_tab(formula, installed_on_request:)
-        tab = Tab.for_formula(formula)
-        unless tab.tabfile.exist?
+      sig { params(formula_or_cask: T.any(Formula, Cask::Cask), installed_on_request: T::Boolean).void }
+      def update_tab(formula_or_cask, installed_on_request:)
+        name, tab, type = if formula_or_cask.is_a?(Formula)
+          [formula_or_cask.name, Tab.for_formula(formula_or_cask), :formula]
+        else
+          [formula_or_cask.token, Tab.for_cask(formula_or_cask), :cask]
+        end
+
+        if tab.tabfile.blank? || !tab.tabfile.exist?
           raise ArgumentError,
-                "Tab file for #{formula.name} does not exist."
+                "Tab file for #{name} does not exist."
         end
 
         installed_on_request_str = "#{"not " unless installed_on_request}installed on request"
         if (tab.installed_on_request && installed_on_request) ||
            (!tab.installed_on_request && !installed_on_request)
-          ohai "#{formula.name} is already marked as #{installed_on_request_str}."
+          ohai "#{name} is already marked as #{installed_on_request_str}."
           return
         end
 
         tab.installed_on_request = installed_on_request
-        tab.write
-        ohai "#{formula.name} is now marked as #{installed_on_request_str}."
+
+        if type == :formula
+          tab.write_formula_file
+        else
+          tab.write_cask_file
+        end
+
+        ohai "#{name} is now marked as #{installed_on_request_str}."
       end
     end
   end

Library/Homebrew/cmd/update-report.rb

@@ -165,7 +165,7 @@
               tab = keg.tab
               # force a `brew upgrade` from the linuxbrew-core version to the homebrew-core version (even if lower)
               tab.source["versions"]["version_scheme"] = -1
-              tab.write
+              tab.write_formula_file
             end
 
             Settings.write "linuxbrewmigrated", true

Library/Homebrew/dev-cmd/bottle.rb

@@ -459,7 +459,7 @@
           raise "This bottle does not contain the file INSTALL_RECEIPT.json: #{bottle_path}" unless tab_path
 
           tab_json = Utils::Bottles.file_from_bottle(bottle_path, tab_path)
-          tab = Tab.from_file_content(tab_json, tab_path)
+          tab = Tab.from_formula_file_content(tab_json, tab_path)
 
           tag_spec = Formula[formula.name].bottle_specification
                                           .tag_specification_for(bottle_tag, no_older_versions: true)
@@ -504,7 +504,7 @@
               tab.changed_files.delete(Pathname.new(Tab::FILENAME))
               tab.tabfile.unlink
             else
-              tab.write
+              tab.write_formula_file
             end
 
             sbom = SBOM.create(formula, tab)
@@ -578,7 +578,7 @@
             raise
           ensure
             ignore_interrupts do
-              original_tab&.write
+              original_tab&.write_formula_file
               keg.replace_placeholders_with_locations changed_files unless args.skip_relocation?
             end
           end

Library/Homebrew/extend/os/linux/cmd/update-report.rb

@@ -26,7 +26,7 @@
       tab = keg.tab
       # Force reinstallation upon `brew upgrade` to fix the bottle RPATH.
       tab.source["versions"]["version_scheme"] = -1
-      tab.write
+      tab.write_formula_file
     rescue TapFormulaUnavailableError
       nil
     end

Library/Homebrew/extend/os/mac/diagnostic.rb

@@ -95,7 +95,7 @@
         return unless findutils.any_version_installed?
 
         gnubin = %W[#{findutils.opt_libexec}/gnubin #{findutils.libexec}/gnubin]
-        default_names = Tab.for_name("findutils").with? "default-names"
+        default_names = Tab.for_formula_name("findutils").with? "default-names"
         return if !default_names && !paths.intersect?(gnubin)
 
         <<~EOS

Library/Homebrew/formula_installer.rb

@@ -474,7 +474,7 @@ def install
       tab = keg.tab
       tab.installed_as_dependency = installed_as_dependency?
       tab.installed_on_request = installed_on_request?
-      tab.write
+      tab.write_formula_file
     end
 
     build_bottle_postinstall if build_bottle?
@@ -826,8 +826,8 @@ def finish
     tab = keg.tab
     Tab.clear_cache
     f_runtime_deps = formula.runtime_dependencies(read_from_tab: false)
-    tab.runtime_dependencies = Tab.runtime_deps_hash(formula, f_runtime_deps)
-    tab.write
+    tab.runtime_dependencies = Tab.formula_runtime_deps_hash(formula, f_runtime_deps)
+    tab.write_formula_file
 
     # write/update a SBOM file (if we aren't bottling)
     unless build_bottle?
@@ -1312,7 +1312,7 @@ def pour
     tab.source["path"] = formula.specified_path.to_s
     tab.source["tap_git_head"] = formula.tap&.installed? ? formula.tap&.git_head : nil
     tab.tap = formula.tap
-    tab.write
+    tab.write_formula_file
 
     keg = Keg.new(formula.prefix)
     skip_linkage = formula.bottle_specification.skip_relocation?

Library/Homebrew/install.rb

@@ -214,7 +214,7 @@
         tab = keg.tab
         unless tab.installed_on_request
           tab.installed_on_request = true
-          tab.write
+          tab.write_formula_file
         end
 
         false

Library/Homebrew/migrator.rb

@@ -157,7 +157,7 @@
   def fix_tabs
     old_tabs.each do |tab|
       tab.tap = formula.tap
-      tab.write
+      tab.write_formula_file
     end
   end
 
@@ -377,7 +377,7 @@
     new_tabs = new_cellar.subdirs.map { |d| Keg.new(d).tab }
     new_tabs.each do |tab|
       tab.source["path"] = formula.path.to_s if tab.source["path"]
-      tab.write
+      tab.write_formula_file
     end
   end
 

Library/Homebrew/sorbet/rbi/parlour.rbi

@@ -344,6 +344,9 @@ module Cask
     sig { returns(T::Boolean) }
     def installed_as_dependency?; end
 
+    sig { returns(T::Boolean) }
+    def installed_on_request?; end
+
     sig { returns(T::Boolean) }
     def quarantine?; end