Merge pull request #3422 from MikeMcQuaid/null-versions

mac/xcode: compare with existing Version class.

3 files changed, 7 insertions, 17 deletions

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index be0ce9351..86abfab87 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -50,7 +50,6 @@ module Homebrew
       end
 
       def check_xcode_up_to_date
-        return unless MacOS::Xcode.installed?
         return unless MacOS::Xcode.outdated?
 
         # Travis CI images are going to end up outdated so don't complain when
@@ -78,7 +77,6 @@ module Homebrew
       end
 
       def check_clt_up_to_date
-        return unless MacOS::CLT.installed?
         return unless MacOS::CLT.outdated?
 
         # Travis CI images are going to end up outdated so don't complain when
@@ -108,7 +106,6 @@ module Homebrew
       end
 
       def check_xcode_minimum_version
-        return unless MacOS::Xcode.installed?
         return unless MacOS::Xcode.below_minimum_version?
 
         <<~EOS
@@ -119,7 +116,6 @@ module Homebrew
       end
 
       def check_clt_minimum_version
-        return unless MacOS::CLT.installed?
         return unless MacOS::CLT.below_minimum_version?
 
         <<~EOS
@@ -281,13 +277,8 @@ module Homebrew
         EOS
       end
 
-      def check_for_latest_xquartz
-        return unless MacOS::XQuartz.version
-        return if MacOS::XQuartz.provided_by_apple?
-
-        installed_version = Version.create(MacOS::XQuartz.version)
-        latest_version = Version.create(MacOS::XQuartz.latest_version)
-        return if installed_version >= latest_version
+      def check_xquartz_up_to_date
+        return unless MacOS::XQuartz.outdated?
 
         <<~EOS
           Your XQuartz (#{installed_version}) is outdated.
@@ -298,8 +289,7 @@ module Homebrew
       end
 
       def check_for_beta_xquartz
-        return unless MacOS::XQuartz.version
-        return unless MacOS::XQuartz.version.include? "beta"
+        return unless MacOS::XQuartz.version.to_s.include?("beta")
 
         <<~EOS
           The following beta release of XQuartz is installed: #{MacOS::XQuartz.version}
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
index 5872c2264..ee0d2343c 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@@ -91,18 +91,18 @@ module Superenv
     generic_setup_build_environment(formula)
     self["HOMEBREW_SDKROOT"] = effective_sysroot
 
-    if MacOS::Xcode.without_clt? || (MacOS::Xcode.installed? && MacOS::Xcode.version.to_i >= 7)
+    if MacOS::Xcode.without_clt? || MacOS::Xcode.version.to_i >= 7
       self["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version.to_s
       self["SDKROOT"] = MacOS.sdk_path
     end
 
     # Filter out symbols known not to be defined since GNU Autotools can't
     # reliably figure this out with Xcode 8 and above.
-    if MacOS.version == "10.12" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "9.0"
+    if MacOS.version == "10.12" && MacOS::Xcode.version >= "9.0"
       %w[fmemopen futimens open_memstream utimensat].each do |s|
         ENV["ac_cv_func_#{s}"] = "no"
       end
-    elsif MacOS.version == "10.11" && MacOS::Xcode.installed? && MacOS::Xcode.version >= "8.0"
+    elsif MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0"
       %w[basename_r clock_getres clock_gettime clock_settime dirname_r
          getentropy mkostemp mkostemps timingsafe_bcmp].each do |s|
         ENV["ac_cv_func_#{s}"] = "no"
diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb
index acee50ad0..796134781 100644
--- a/Library/Homebrew/extend/os/mac/system_config.rb
+++ b/Library/Homebrew/extend/os/mac/system_config.rb
@@ -4,7 +4,7 @@ class SystemConfig
       if instance_variable_defined?(:@xcode)
         @xcode
       elsif MacOS::Xcode.installed?
-        @xcode = MacOS::Xcode.version
+        @xcode = MacOS::Xcode.version.to_s
         @xcode += " => #{MacOS::Xcode.prefix}" unless MacOS::Xcode.default_prefix?
         @xcode
       end