Switch PkgVersion to use composition

Comparing PkgVersion and Version objects can produce nonsensical
results. For example, equality is not symmetric:

irb(main):002:0> PkgVersion.new("1.0", 0) == Version.new("1.0")
=> false
irb(main):003:0> Version.new("1.0") == PkgVersion.new("1.0", 0)
=> true

Rather than attempt to deal with subclass-superclass equality, let's use
composition and punt on the problem altogether.

1 files changed, 14 insertions, 13 deletions

diff --git a/Library/Homebrew/test/test_pkg_version.rb b/Library/Homebrew/test/test_pkg_version.rb
index a26a90c30..611c90ee6 100644
--- a/Library/Homebrew/test/test_pkg_version.rb
+++ b/Library/Homebrew/test/test_pkg_version.rb
@@ -7,13 +7,13 @@ class PkgVersionTests < Homebrew::TestCase
   end
 
   def test_parse
-    assert_equal PkgVersion.new("1.0", 1), PkgVersion.parse("1.0_1")
-    assert_equal PkgVersion.new("1.0", 1), PkgVersion.parse("1.0_1")
-    assert_equal PkgVersion.new("1.0", 0), PkgVersion.parse("1.0")
-    assert_equal PkgVersion.new("1.0", 0), PkgVersion.parse("1.0_0")
-    assert_equal PkgVersion.new("2.1.4", 0), PkgVersion.parse("2.1.4_0")
-    assert_equal PkgVersion.new("2.1.4_1", 0), PkgVersion.parse("2.1.4_1_0")
-    assert_equal PkgVersion.new("1.0.1e", 1), PkgVersion.parse("1.0.1e_1")
+    assert_equal PkgVersion.new(Version.new("1.0"), 1), PkgVersion.parse("1.0_1")
+    assert_equal PkgVersion.new(Version.new("1.0"), 1), PkgVersion.parse("1.0_1")
+    assert_equal PkgVersion.new(Version.new("1.0"), 0), PkgVersion.parse("1.0")
+    assert_equal PkgVersion.new(Version.new("1.0"), 0), PkgVersion.parse("1.0_0")
+    assert_equal PkgVersion.new(Version.new("2.1.4"), 0), PkgVersion.parse("2.1.4_0")
+    assert_equal PkgVersion.new(Version.new("2.1.4_1"), 0), PkgVersion.parse("2.1.4_1_0")
+    assert_equal PkgVersion.new(Version.new("1.0.1e"), 1), PkgVersion.parse("1.0.1e_1")
   end
 
   def test_comparison
@@ -25,16 +25,17 @@ class PkgVersionTests < Homebrew::TestCase
     assert_operator v("HEAD"), :>, v("1.0")
     assert_operator v("1.0"), :<, v("HEAD")
 
-    v = PkgVersion.new("1.0", 0)
+    v = PkgVersion.new(Version.new("1.0"), 0)
     assert_nil v <=> Object.new
     assert_raises(ArgumentError) { v > Object.new }
+    assert_raises(ArgumentError) { v > Version.new("1.0") }
   end
 
   def test_to_s
-    assert_equal "1.0", PkgVersion.new("1.0", 0).to_s
-    assert_equal "1.0_1", PkgVersion.new("1.0", 1).to_s
-    assert_equal "1.0", PkgVersion.new("1.0", 0).to_s
-    assert_equal "1.0", PkgVersion.new("1.0", 0).to_s
-    assert_equal "HEAD", PkgVersion.new("HEAD", 1).to_s
+    assert_equal "1.0", PkgVersion.new(Version.new("1.0"), 0).to_s
+    assert_equal "1.0_1", PkgVersion.new(Version.new("1.0"), 1).to_s
+    assert_equal "1.0", PkgVersion.new(Version.new("1.0"), 0).to_s
+    assert_equal "1.0", PkgVersion.new(Version.new("1.0"), 0).to_s
+    assert_equal "HEAD", PkgVersion.new(Version.new("HEAD"), 1).to_s
   end
 end