Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add depends_on :linux and :macos #3270

Merged
merged 2 commits into from
Oct 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Library/Homebrew/compat/requirements.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
TuntapDependency = TuntapRequirement
X11Dependency = X11Requirement
ConflictsWithBinaryOsxfuse = NonBinaryOsxfuseRequirement
MinimumMacOSRequirement = MacOSRequirement
3 changes: 2 additions & 1 deletion Library/Homebrew/dependency_collector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ def parse_symbol_spec(spec, tags)
case spec
when :x11 then X11Requirement.new(spec.to_s, tags)
when :xcode then XcodeRequirement.new(tags)
when :macos then MinimumMacOSRequirement.new(tags)
when :linux then LinuxRequirement.new(tags)
when :macos then MacOSRequirement.new(tags)
when :mysql then MysqlRequirement.new(tags)
when :postgresql then PostgresqlRequirement.new(tags)
when :gpg then GPG2Requirement.new(tags)
Expand Down
3 changes: 2 additions & 1 deletion Library/Homebrew/requirements.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
require "requirements/fortran_requirement"
require "requirements/gpg2_requirement"
require "requirements/language_module_requirement"
require "requirements/minimum_macos_requirement"
require "requirements/linux_requirement"
require "requirements/macos_requirement"
require "requirements/maximum_macos_requirement"
require "requirements/mpi_requirement"
require "requirements/osxfuse_requirement"
Expand Down
9 changes: 9 additions & 0 deletions Library/Homebrew/requirements/linux_requirement.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class LinuxRequirement < Requirement
fatal true

satisfy(build_env: false) { OS.linux? }

def message
"Linux is required."
end
end
31 changes: 31 additions & 0 deletions Library/Homebrew/requirements/macos_requirement.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
require "requirement"

class MacOSRequirement < Requirement
fatal true

def initialize(tags = [])
@version = MacOS::Version.from_symbol(tags.first) unless tags.empty?
super
end

def minimum_version_specified?
OS.mac? && @version
end

satisfy(build_env: false) do
next MacOS.version >= @version if minimum_version_specified?
next true if OS.mac?
next true if @version
false
end

def message
return "macOS is required." unless minimum_version_specified?
"macOS #{@version.pretty_name} or newer is required."
end

def display_s
return "macOS is required" unless minimum_version_specified?
"macOS >= #{@version}"
end
end
20 changes: 0 additions & 20 deletions Library/Homebrew/requirements/minimum_macos_requirement.rb

This file was deleted.

18 changes: 18 additions & 0 deletions Library/Homebrew/test/os_requirement_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
require "requirements/linux_requirement"
require "requirements/macos_requirement"

describe LinuxRequirement do
describe "#satisfied?" do
it "returns true if OS is Linux" do
expect(subject.satisfied?).to eq(OS.linux?)
end
end
end

describe MacOSRequirement do
describe "#satisfied?" do
it "returns true if OS is macOS" do
expect(subject.satisfied?).to eq(OS.mac?)
end
end
end