Merge pull request #997 from MikeMcQuaid/skip_official_tap

Only skip unbottled formulae from official taps.
Homebrew · Aug 12, 2021 · 699eea1 · 699eea1
2 parents 0fe4760 + 8f18dc0
commit 699eea1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/lib/bundle/brew_dumper.rb b/lib/bundle/brew_dumper.rb
@@ -156,7 +156,7 @@ def formula_to_hash(formula)
           bottle_files[:all].present? || bottle_files[Utils::Bottles.tag.to_sym].present?
         end
       end
-
+\
       {
         name:                     formula.name,
         desc:                     formula.desc,
@@ -177,6 +177,7 @@ def formula_to_hash(formula)
         poured_from_bottle?:      (poured_from_bottle || false),
         bottle:                   (bottle_hash || false),
         bottled_or_disabled:      (bottled_or_disabled || false),
+        official_tap:             (formula.tap&.official? || false),
       }
     end
     private_class_method :formula_to_hash

diff --git a/lib/bundle/skipper.rb b/lib/bundle/skipper.rb
@@ -8,7 +8,9 @@ class << self
       def skip?(entry, silent: false)
         if Hardware::CPU.arm? && !MacOS.version.prerelease? &&
            entry.type == :brew && entry.name.exclude?("/") &&
-           !BrewDumper.formulae_by_full_name(entry.name)[:bottled_or_disabled]
+           (formula = BrewDumper.formulae_by_full_name(entry.name)) &&
+           formula[:official_tap] &&
+           !formula[:bottled_or_disabled]
           puts Formatter.warning "Skipping #{entry.name} (no bottle for Apple Silicon)" unless silent
           return true
         end

diff --git a/spec/bundle/brew_dumper_spec.rb b/spec/bundle/brew_dumper_spec.rb
@@ -26,7 +26,8 @@
                     pinned?:                false,
                     outdated?:              false,
                     bottle_defined?:        false,
-                    bottle_disabled?:       false)
+                    bottle_disabled?:       false,
+                    tap:                    OpenStruct.new(official?: false))
   end
   let(:foo_hash) do
     {
@@ -49,6 +50,7 @@
       pinned?:                  false,
       poured_from_bottle?:      false,
       version:                  nil,
+      official_tap:             false,
     }
   end
   let(:bar) do
@@ -71,6 +73,7 @@
                     bottle_defined?:        true,
                     bottle_disabled?:       false,
                     linked_keg:             linked_keg,
+                    tap:                    OpenStruct.new(official?: true),
                     bottle_hash:            {
                       cellar: ":any",
                       files:  {
@@ -110,6 +113,7 @@
       pinned?:                  true,
       poured_from_bottle?:      true,
       version:                  "1.0",
+      official_tap:             true,
     }
   end
   let(:baz) do
@@ -129,7 +133,8 @@
                     pinned?:                false,
                     outdated?:              false,
                     bottle_defined?:        false,
-                    bottle_disabled?:       false)
+                    bottle_disabled?:       false,
+                    tap:                    OpenStruct.new(official?: false))
   end
   let(:baz_hash) do
     {
@@ -152,6 +157,7 @@
       pinned?:                  false,
       poured_from_bottle?:      false,
       version:                  nil,
+      official_tap:             false,
     }
   end
 

diff --git a/spec/stub/formula.rb b/spec/stub/formula.rb
@@ -97,4 +97,8 @@ def outdated?
   def any_installed_prefix
     opt_prefix
   end
+
+  def tap
+    OpenStruct.new official?: true
+  end
 end