diff --git a/Library/Homebrew/extend/os/formula_support.rb b/Library/Homebrew/extend/os/formula_support.rb deleted file mode 100644 index ebefc4b5f4..0000000000 --- a/Library/Homebrew/extend/os/formula_support.rb +++ /dev/null @@ -1,4 +0,0 @@ -# typed: strict -# frozen_string_literal: true - -require "extend/os/mac/formula_support" if OS.mac? diff --git a/Library/Homebrew/extend/os/keg_only_reason.rb b/Library/Homebrew/extend/os/keg_only_reason.rb new file mode 100644 index 0000000000..574d671154 --- /dev/null +++ b/Library/Homebrew/extend/os/keg_only_reason.rb @@ -0,0 +1,4 @@ +# typed: strict +# frozen_string_literal: true + +require "extend/os/mac/keg_only_reason" if OS.mac? diff --git a/Library/Homebrew/extend/os/mac/formula_support.rb b/Library/Homebrew/extend/os/mac/keg_only_reason.rb similarity index 100% rename from Library/Homebrew/extend/os/mac/formula_support.rb rename to Library/Homebrew/extend/os/mac/keg_only_reason.rb diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 5c2a9a5b26..33560d6e04 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -4,7 +4,7 @@ require "autobump_constants" require "cache_store" require "did_you_mean" -require "formula_support" +require "keg_only_reason" require "lock_file" require "formula_pin" require "hardware" @@ -88,6 +88,9 @@ class Formula abstract! + # Used to track formulae that cannot be installed at the same time. + FormulaConflict = Struct.new(:name, :reason) + SUPPORTED_NETWORK_ACCESS_PHASES = [:build, :test, :postinstall].freeze private_constant :SUPPORTED_NETWORK_ACCESS_PHASES DEFAULT_NETWORK_ACCESS_ALLOWED = true diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/keg_only_reason.rb similarity index 87% rename from Library/Homebrew/formula_support.rb rename to Library/Homebrew/keg_only_reason.rb index 9380275617..f254b2a07a 100644 --- a/Library/Homebrew/formula_support.rb +++ b/Library/Homebrew/keg_only_reason.rb @@ -1,9 +1,6 @@ # typed: true # rubocop:todo Sorbet/StrictSigil # frozen_string_literal: true -# Used to track formulae that cannot be installed at the same time. -FormulaConflict = Struct.new(:name, :reason) - # Used to annotate formulae that duplicate macOS-provided software # or cause conflicts when linked in. class KegOnlyReason @@ -33,7 +30,7 @@ class KegOnlyReason sig { returns(T::Boolean) } def applicable? # macOS reasons aren't applicable on other OSs - # (see extend/os/mac/formula_support for override on macOS) + # (see extend/os/mac/keg_only_reason for override on macOS) !by_macos? end @@ -74,4 +71,4 @@ class KegOnlyReason end end -require "extend/os/formula_support" +require "extend/os/keg_only_reason" diff --git a/Library/Homebrew/test/bundle/commands/exec_spec.rb b/Library/Homebrew/test/bundle/commands/exec_spec.rb index c11b989b46..a463142984 100644 --- a/Library/Homebrew/test/bundle/commands/exec_spec.rb +++ b/Library/Homebrew/test/bundle/commands/exec_spec.rb @@ -137,7 +137,7 @@ RSpec.describe Homebrew::Bundle::Commands::Exec do plist_name: "homebrew.mxcl.nginx", service_name: "nginx", versioned_formulae_names: [], - conflicts: [instance_double(FormulaConflict, name: "httpd")], + conflicts: [instance_double(Formula::FormulaConflict, name: "httpd")], keg_only?: false, ) end diff --git a/Library/Homebrew/test/exceptions_spec.rb b/Library/Homebrew/test/exceptions_spec.rb index 8af7cd4eba..e01b95a82b 100644 --- a/Library/Homebrew/test/exceptions_spec.rb +++ b/Library/Homebrew/test/exceptions_spec.rb @@ -176,7 +176,7 @@ RSpec.describe "Exception" do subject(:error) { described_class.new(formula, [conflict]) } let(:formula) { instance_double(Formula, full_name: "foo/qux") } - let(:conflict) { instance_double(FormulaConflict, name: "bar", reason: "I decided to") } + let(:conflict) { instance_double(Formula::FormulaConflict, name: "bar", reason: "I decided to") } it(:to_s) { expect(error.to_s).to match(/Please `brew unlink bar` before continuing\./) } end diff --git a/Library/Homebrew/test/formula_support/keg_only_reason_spec.rb b/Library/Homebrew/test/keg_only_reason_spec.rb similarity index 94% rename from Library/Homebrew/test/formula_support/keg_only_reason_spec.rb rename to Library/Homebrew/test/keg_only_reason_spec.rb index ca669b5365..9835239450 100644 --- a/Library/Homebrew/test/formula_support/keg_only_reason_spec.rb +++ b/Library/Homebrew/test/keg_only_reason_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "formula_support" +require "keg_only_reason" RSpec.describe KegOnlyReason do describe "#to_s" do