Merge pull request #20895 from Homebrew/tap-path-and-latest-formula

Add `Formula#tap_path` and use `Formula#latest_formula`

Author: Rylan12

Library/Homebrew/cmd/outdated.rb

@@ -101,7 +101,7 @@ def print_outdated(formulae_or_casks)
                 # There is a newer HEAD but the version number has not changed.
                 "latest HEAD"
               else
-                f.pkg_version.to_s
+                f.latest_formula.pkg_version.to_s
               end
 
               outdated_versions = outdated_kegs.group_by { |keg| Formulary.from_keg(keg).full_name }

Library/Homebrew/cmd/reinstall.rb

@@ -141,7 +141,7 @@ def run
             end
             Migrator.migrate_if_needed(formula, force: args.force?)
             Homebrew::Reinstall.build_install_context(
-              formula,
+              formula.latest_formula,
               flags:                      args.flags_only,
               force_bottle:               args.force_bottle?,
               build_from_source_formulae: args.build_from_source_formulae,

Library/Homebrew/dev-cmd/bottle.rb

@@ -661,8 +661,8 @@ def bottle_formula(formula)
             "formula" => {
               "name"             => formula.name,
               "pkg_version"      => formula.pkg_version.to_s,
-              "path"             => formula.path.to_s.delete_prefix("#{HOMEBREW_REPOSITORY}/"),
-              "tap_git_path"     => formula.path.to_s.delete_prefix("#{tap_path}/"),
+              "path"             => formula.tap_path.to_s.delete_prefix("#{HOMEBREW_REPOSITORY}/"),
+              "tap_git_path"     => formula.tap_path.to_s.delete_prefix("#{tap_path}/"),
               "tap_git_revision" => tap_git_revision,
               "tap_git_remote"   => tap_git_remote,
               # descriptions can contain emoji. sigh.

Library/Homebrew/formula.rb

@@ -426,6 +426,13 @@ def installed_alias_name = installed_alias_path&.basename&.to_s
   sig { returns(T.nilable(String)) }
   def full_installed_alias_name = full_name_with_optional_tap(installed_alias_name)
 
+  sig { returns(Pathname) }
+  def tap_path
+    return path unless (t = tap)
+
+    t.new_formula_path(name)
+  end
+
   # The path that was specified to find this formula.
   sig { returns(T.nilable(Pathname)) }
   def specified_path
@@ -1714,14 +1721,15 @@ def outdated_kegs(fetch_head: false)
     Formula.cache[:outdated_kegs][cache_key] ||= begin
       all_kegs = []
       current_version = T.let(false, T::Boolean)
+      latest = latest_formula
 
       installed_kegs.each do |keg|
         all_kegs << keg
         version = keg.version
         next if version.head?
 
-        next if version_scheme > keg.version_scheme && pkg_version != version
-        next if version_scheme == keg.version_scheme && pkg_version > version
+        next if latest.version_scheme > keg.version_scheme && latest.pkg_version != version
+        next if latest.version_scheme == keg.version_scheme && latest.pkg_version > version
 
         # don't consider this keg current if there's a newer formula available
         next if follow_installed_alias? && new_formula_available?
@@ -1779,7 +1787,7 @@ def alias_changed?
   # Otherwise, return self.
   sig { returns(Formula) }
   def latest_formula
-    installed_alias_target_changed? ? T.must(current_installed_alias_target) : self
+    installed_alias_target_changed? ? T.must(current_installed_alias_target) : Formulary.factory(name)
   end
 
   sig { returns(T::Array[Formula]) }

Library/Homebrew/formula_versions.rb

@@ -20,7 +20,7 @@ class FormulaVersions
   sig { params(formula: Formula).void }
   def initialize(formula)
     @name = formula.name
-    @path = formula.path
+    @path = formula.tap_path
     @repository = T.must(formula.tap).path
     @relative_path = @path.relative_path_from(repository).to_s
     # Also look at e.g. older homebrew-core paths before sharding.

Library/Homebrew/test/formula_spec.rb

@@ -880,6 +880,8 @@ def post_install
 
       expect(f3.runtime_dependencies.map(&:name)).to eq(["baz/qux/f2"])
 
+      described_class.clear_cache
+
       f1_path = Tap.fetch("foo", "bar").path/"Formula/f1.rb"
       stub_formula_loader(formula("f1", path: f1_path) { url("f1-1.0") }, "foo/bar/f1")
 
@@ -965,6 +967,7 @@ def post_install
         sha256 cellar: :any, Utils::Bottles.tag.to_sym => TEST_SHA256
       end
     end
+    stub_formula_loader(f1)
 
     h = f1.to_hash
 
@@ -1275,6 +1278,8 @@ def pour_bottle?
     let(:alias_path) { CoreTap.instance.alias_dir/alias_name }
 
     before do
+      stub_formula_loader(f)
+      stub_formula_loader(new_formula)
       allow(described_class).to receive(:installed).and_return([f])
 
       f.build = tab
@@ -1367,6 +1372,12 @@ def pour_bottle?
     let(:alias_name) { "bar" }
     let(:alias_path) { f.tap.alias_dir/alias_name }
 
+    before do
+      stub_formula_loader(f)
+      stub_formula_loader(old_formula)
+      stub_formula_loader(new_formula)
+    end
+
     def setup_tab_for_prefix(prefix, options = {})
       prefix.mkpath
 

Library/Homebrew/test/migrator_spec.rb

@@ -21,6 +21,9 @@
 
   before do |example|
     allow(new_formula).to receive(:oldnames).and_return(["oldname"])
+    allow(Formulary).to receive(:factory).with("homebrew/core/oldname", any_args).and_return(old_formula)
+    allow(Formulary).to receive(:factory).with("oldname", any_args).and_return(old_formula)
+    allow(Formulary).to receive(:factory).with("newname", any_args).and_return(new_formula)
 
     # do not create directories for error tests
     next if example.metadata[:description].start_with?("raises an error")

Library/Homebrew/test/support/helper/formula.rb

@@ -15,7 +15,7 @@ def formula(name = "formula_name", path: nil, spec: :stable, alias_path: nil, ta
       def stub_formula_loader(formula, ref = formula.full_name, call_original: false)
         allow(Formulary).to receive(:loader_for).and_call_original if call_original
 
-        loader = instance_double(Formulary::FormulaLoader, get_formula: formula)
+        loader = instance_double(Formulary::FormulaLoader, get_formula: formula, name: formula.name)
         allow(Formulary).to receive(:loader_for).with(ref, any_args).and_return(loader)
       end
     end