From 230c87aff006e36bd65bb6dcc8a3877aad2c9290 Mon Sep 17 00:00:00 2001
From: Shaun Jackman
Date: Fri, 6 Oct 2017 10:12:09 -0700
Subject: Rename MinimumMacOSRequirement to MacOSRequirement

Move MinimumMacOSRequirement to compat.
---
 Library/Homebrew/compat/requirements.rb            |  1 +
 Library/Homebrew/dependency_collector.rb           |  2 +-
 Library/Homebrew/requirements.rb                   |  2 +-
 Library/Homebrew/requirements/macos_requirement.rb | 31 ++++++++++++++++++++++
 .../requirements/minimum_macos_requirement.rb      | 31 ----------------------
 Library/Homebrew/test/os_requirement_spec.rb       |  4 +--
 6 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 Library/Homebrew/requirements/macos_requirement.rb
 delete mode 100644 Library/Homebrew/requirements/minimum_macos_requirement.rb

(limited to 'Library/Homebrew')

diff --git a/Library/Homebrew/compat/requirements.rb b/Library/Homebrew/compat/requirements.rb
index 77760d1dc..3886cd7c7 100644
--- a/Library/Homebrew/compat/requirements.rb
+++ b/Library/Homebrew/compat/requirements.rb
@@ -17,3 +17,4 @@ PythonDependency           = PythonRequirement
 TuntapDependency           = TuntapRequirement
 X11Dependency              = X11Requirement
 ConflictsWithBinaryOsxfuse = NonBinaryOsxfuseRequirement
+MinimumMacOSRequirement    = MacOSRequirement
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 09718d1f2..bc0246dd2 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -106,7 +106,7 @@ class DependencyCollector
     when :x11        then X11Requirement.new(spec.to_s, tags)
     when :xcode      then XcodeRequirement.new(tags)
     when :linux      then LinuxRequirement.new(tags)
-    when :macos      then MinimumMacOSRequirement.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)
diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb
index bf677feee..bac7d5790 100644
--- a/Library/Homebrew/requirements.rb
+++ b/Library/Homebrew/requirements.rb
@@ -3,7 +3,7 @@ require "requirements/fortran_requirement"
 require "requirements/gpg2_requirement"
 require "requirements/language_module_requirement"
 require "requirements/linux_requirement"
-require "requirements/minimum_macos_requirement"
+require "requirements/macos_requirement"
 require "requirements/maximum_macos_requirement"
 require "requirements/mpi_requirement"
 require "requirements/osxfuse_requirement"
diff --git a/Library/Homebrew/requirements/macos_requirement.rb b/Library/Homebrew/requirements/macos_requirement.rb
new file mode 100644
index 000000000..c89144d2c
--- /dev/null
+++ b/Library/Homebrew/requirements/macos_requirement.rb
@@ -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
diff --git a/Library/Homebrew/requirements/minimum_macos_requirement.rb b/Library/Homebrew/requirements/minimum_macos_requirement.rb
deleted file mode 100644
index ffe1d8f4d..000000000
--- a/Library/Homebrew/requirements/minimum_macos_requirement.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "requirement"
-
-class MinimumMacOSRequirement < 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
diff --git a/Library/Homebrew/test/os_requirement_spec.rb b/Library/Homebrew/test/os_requirement_spec.rb
index 15c1cbb6a..87f86231c 100644
--- a/Library/Homebrew/test/os_requirement_spec.rb
+++ b/Library/Homebrew/test/os_requirement_spec.rb
@@ -1,5 +1,5 @@
 require "requirements/linux_requirement"
-require "requirements/minimum_macos_requirement"
+require "requirements/macos_requirement"
 
 describe LinuxRequirement do
   describe "#satisfied?" do
@@ -9,7 +9,7 @@ describe LinuxRequirement do
   end
 end
 
-describe MinimumMacOSRequirement do
+describe MacOSRequirement do
   describe "#satisfied?" do
     it "returns true if OS is macOS" do
       expect(subject.satisfied?).to eq(OS.mac?)
-- 
cgit v1.2.3