diff options
| author | Shaun Jackman | 2017-10-06 10:12:09 -0700 |
|---|---|---|
| committer | Shaun Jackman | 2017-10-17 16:16:44 -0700 |
| commit | 230c87aff006e36bd65bb6dcc8a3877aad2c9290 (patch) | |
| tree | 449e5eeba7c54c2335fab3b85b091ef23df57651 | |
| parent | 95e144a1c8ef809307ea0641050a3265882fe36d (diff) | |
| download | brew-230c87aff006e36bd65bb6dcc8a3877aad2c9290.tar.bz2 | |
Rename MinimumMacOSRequirement to MacOSRequirement
Move MinimumMacOSRequirement to compat.
| -rw-r--r-- | Library/Homebrew/compat/requirements.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/dependency_collector.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/requirements.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/requirements/macos_requirement.rb (renamed from Library/Homebrew/requirements/minimum_macos_requirement.rb) | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/os_requirement_spec.rb | 4 |
5 files changed, 6 insertions, 5 deletions
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/minimum_macos_requirement.rb b/Library/Homebrew/requirements/macos_requirement.rb index ffe1d8f4d..c89144d2c 100644 --- a/Library/Homebrew/requirements/minimum_macos_requirement.rb +++ b/Library/Homebrew/requirements/macos_requirement.rb @@ -1,6 +1,6 @@ require "requirement" -class MinimumMacOSRequirement < Requirement +class MacOSRequirement < Requirement fatal true def initialize(tags = []) 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?) |