Rename treat_as_*? to simulating_or_running_on_*?

This commit is contained in:
Rylan Polster 2022-07-28 09:18:16 -04:00
parent 91cf9f2ad8
commit 4cc0e854ce
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
5 changed files with 18 additions and 18 deletions

View File

@ -25,7 +25,7 @@ module OnSystem
return true if [:macos, *MacOSVersions::SYMBOLS.keys].include?(os_name)
end
return Homebrew::SimulateSystem.send("treat_as_#{os_name}?") if BASE_OS_OPTIONS.include?(os_name)
return Homebrew::SimulateSystem.send("simulating_or_running_on_#{os_name}?") if BASE_OS_OPTIONS.include?(os_name)
raise ArgumentError, "Invalid OS condition: #{os_name.inspect}" unless MacOSVersions::SYMBOLS.key?(os_name)
@ -33,7 +33,7 @@ module OnSystem
raise ArgumentError, "Invalid OS `or_*` condition: #{or_condition.inspect}"
end
return false if Homebrew::SimulateSystem.treat_as_linux?
return false if Homebrew::SimulateSystem.simulating_or_running_on_linux?
base_os = MacOS::Version.from_symbol(os_name)
current_os = MacOS::Version.from_symbol(Homebrew::SimulateSystem.current_os)

View File

@ -3215,7 +3215,7 @@ class Formula
# Permit links to certain libraries that don't exist. Available on Linux only.
def ignore_missing_libraries(*libs)
unless Homebrew::SimulateSystem.treat_as_linux?
unless Homebrew::SimulateSystem.simulating_or_running_on_linux?
raise FormulaSpecificationError, "#{__method__} is available on Linux only"
end

View File

@ -32,14 +32,14 @@ module Homebrew
end
sig { returns(T::Boolean) }
def treat_as_macos?
def simulating_or_running_on_macos?
return OS.mac? if @os.blank?
[:macos, *MacOSVersions::SYMBOLS.keys].include?(@os)
end
sig { returns(T::Boolean) }
def treat_as_linux?
def simulating_or_running_on_linux?
return OS.linux? if @os.blank?
@os == :linux

View File

@ -174,7 +174,7 @@ class SoftwareSpec
return if Homebrew::EnvConfig.simulate_macos_on_linux? && !bounds.key?(:since)
# macOS new enough for dependency to not be required.
if Homebrew::SimulateSystem.treat_as_macos?
if Homebrew::SimulateSystem.simulating_or_running_on_macos?
current_os = MacOS::Version.from_symbol(Homebrew::SimulateSystem.current_os)
since_os = MacOS::Version.from_symbol(bounds[:since]) if bounds.key?(:since)
return if current_os >= since_os

View File

@ -8,63 +8,63 @@ describe Homebrew::SimulateSystem do
described_class.clear
end
describe "::treat_as_macos?" do
describe "::simulating_or_running_on_macos?" do
it "returns true on macOS", :needs_macos do
described_class.clear
expect(described_class.treat_as_macos?).to be true
expect(described_class.simulating_or_running_on_macos?).to be true
end
it "returns false on Linux", :needs_linux do
described_class.clear
expect(described_class.treat_as_macos?).to be false
expect(described_class.simulating_or_running_on_macos?).to be false
end
it "returns false on macOS when simulating Linux", :needs_macos do
described_class.clear
described_class.os = :linux
expect(described_class.treat_as_macos?).to be false
expect(described_class.simulating_or_running_on_macos?).to be false
end
it "returns true on Linux when simulating a generic macOS version", :needs_linux do
described_class.clear
described_class.os = :macos
expect(described_class.treat_as_macos?).to be true
expect(described_class.simulating_or_running_on_macos?).to be true
end
it "returns true on Linux when simulating a specific macOS version", :needs_linux do
described_class.clear
described_class.os = :monterey
expect(described_class.treat_as_macos?).to be true
expect(described_class.simulating_or_running_on_macos?).to be true
end
end
describe "::treat_as_linux?" do
describe "::simulating_or_running_on_linux?" do
it "returns true on Linux", :needs_linux do
described_class.clear
expect(described_class.treat_as_linux?).to be true
expect(described_class.simulating_or_running_on_linux?).to be true
end
it "returns false on macOS", :needs_macos do
described_class.clear
expect(described_class.treat_as_linux?).to be false
expect(described_class.simulating_or_running_on_linux?).to be false
end
it "returns true on macOS when simulating Linux", :needs_macos do
described_class.clear
described_class.os = :linux
expect(described_class.treat_as_linux?).to be true
expect(described_class.simulating_or_running_on_linux?).to be true
end
it "returns false on Linux when simulating a generic macOS version", :needs_linux do
described_class.clear
described_class.os = :macos
expect(described_class.treat_as_linux?).to be false
expect(described_class.simulating_or_running_on_linux?).to be false
end
it "returns false on Linux when simulating a specific macOS version", :needs_linux do
described_class.clear
described_class.os = :monterey
expect(described_class.treat_as_linux?).to be false
expect(described_class.simulating_or_running_on_linux?).to be false
end
end