X11Dependency: use Version objects

1 files changed, 8 insertions, 13 deletions

diff --git a/Library/Homebrew/requirements/x11_dependency.rb b/Library/Homebrew/requirements/x11_dependency.rb
index c493d4521..7adc2a7cb 100644
--- a/Library/Homebrew/requirements/x11_dependency.rb
+++ b/Library/Homebrew/requirements/x11_dependency.rb
@@ -11,12 +11,16 @@ class X11Dependency < Requirement
 
   def initialize(name="x11", tags=[])
     @name = name
-    @min_version = tags.shift if /(\d\.)+\d/ === tags.first
+    if /(\d\.)+\d/ === tags.first
+      @min_version = Version.new(tags.shift)
+    else
+      @min_version = Version.new("0.0.0")
+    end
     super(tags)
   end
 
   satisfy :build_env => false do
-    MacOS::XQuartz.installed? && (@min_version.nil? || @min_version <= MacOS::XQuartz.version)
+    MacOS::XQuartz.installed? && min_version <= Version.new(MacOS::Quartz.version)
   end
 
   def message; <<-EOS.undent
@@ -27,16 +31,7 @@ class X11Dependency < Requirement
   end
 
   def <=> other
-    return nil unless X11Dependency === other
-
-    if min_version.nil? && other.min_version.nil?
-      0
-    elsif other.min_version.nil?
-      1
-    elsif min_version.nil?
-      -1
-    else
-      min_version <=> other.min_version
-    end
+    return unless X11Dependency === other
+    min_version <=> other.min_version
   end
 end