Merge pull request #1225 from colindean/gh1223-fix-dump-deprecation-e…

…rrors Use Formula#oldnames to silence deprecation notices
Homebrew · Jul 10, 2023 · 5264d22 · 5264d22
2 parents c02dfff + d6899ef
commit 5264d22
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/bundle/brew_dumper.rb b/lib/bundle/brew_dumper.rb
@@ -157,7 +157,7 @@ def formula_to_hash(formula)
       {
         name:                     formula.name,
         desc:                     formula.desc,
-        oldname:                  formula.oldname,
+        oldname:                  formula.oldnames.first,
         full_name:                formula.full_name,
         aliases:                  formula.aliases,
         any_version_installed?:   formula.any_version_installed?,

diff --git a/spec/bundle/brew_dumper_spec.rb b/spec/bundle/brew_dumper_spec.rb
@@ -14,6 +14,7 @@
                     name:                   "foo",
                     desc:                   "foobar",
                     oldname:                "oldfoo",
+                    oldnames:               ["oldfoo"],
                     full_name:              "qux/quuz/foo",
                     any_version_installed?: true,
                     aliases:                ["foobar"],
@@ -58,6 +59,7 @@
                     name:                   "bar",
                     desc:                   "barfoo",
                     oldname:                nil,
+                    oldnames:               [],
                     full_name:              "bar",
                     any_version_installed?: true,
                     aliases:                [],
@@ -119,6 +121,7 @@
                     name:                   "baz",
                     desc:                   "",
                     oldname:                nil,
+                    oldnames:               [],
                     full_name:              "bazzles/bizzles/baz",
                     any_version_installed?: true,
                     aliases:                [],

diff --git a/spec/stub/formula.rb b/spec/stub/formula.rb
@@ -62,6 +62,10 @@ def oldname
     nil
   end
 
+  def oldnames
+    []
+  end
+
   def aliases
     []
   end