Unify Version.create usage

Substitue each Version.new and HeadVersion.new with Version.create
to unify Version and HeadVersion instantiation among core code.

Note that this does not relate to Mac::OS::Version class.

4 files changed, 30 insertions, 30 deletions

diff --git a/Library/Homebrew/test/test_pkg_version.rb b/Library/Homebrew/test/test_pkg_version.rb
index ac0a9f24c..ff7896f8b 100644
--- a/Library/Homebrew/test/test_pkg_version.rb
+++ b/Library/Homebrew/test/test_pkg_version.rb
@@ -7,12 +7,12 @@ class PkgVersionTests < Homebrew::TestCase
   end
 
   def test_parse
-    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("1.0.1e"), 1), PkgVersion.parse("1.0.1e_1")
+    assert_equal PkgVersion.new(Version.create("1.0"), 1), PkgVersion.parse("1.0_1")
+    assert_equal PkgVersion.new(Version.create("1.0"), 1), PkgVersion.parse("1.0_1")
+    assert_equal PkgVersion.new(Version.create("1.0"), 0), PkgVersion.parse("1.0")
+    assert_equal PkgVersion.new(Version.create("1.0"), 0), PkgVersion.parse("1.0_0")
+    assert_equal PkgVersion.new(Version.create("2.1.4"), 0), PkgVersion.parse("2.1.4_0")
+    assert_equal PkgVersion.new(Version.create("1.0.1e"), 1), PkgVersion.parse("1.0.1e_1")
   end
 
   def test_comparison
@@ -24,26 +24,26 @@ class PkgVersionTests < Homebrew::TestCase
     assert_operator v("HEAD"), :>, v("1.0")
     assert_operator v("1.0"), :<, v("HEAD")
 
-    v = PkgVersion.new(Version.new("1.0"), 0)
+    v = PkgVersion.new(Version.create("1.0"), 0)
     assert_nil v <=> Object.new
     assert_raises(ArgumentError) { v > Object.new }
-    assert_raises(ArgumentError) { v > Version.new("1.0") }
+    assert_raises(ArgumentError) { v > Version.create("1.0") }
   end
 
   def test_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 "1.0", PkgVersion.new(Version.create("1.0"), 0).to_s
+    assert_equal "1.0_1", PkgVersion.new(Version.create("1.0"), 1).to_s
+    assert_equal "1.0", PkgVersion.new(Version.create("1.0"), 0).to_s
+    assert_equal "1.0", PkgVersion.new(Version.create("1.0"), 0).to_s
     assert_equal "HEAD_1", PkgVersion.new(Version.create("HEAD"), 1).to_s
     assert_equal "HEAD-ffffff_1", PkgVersion.new(Version.create("HEAD-ffffff"), 1).to_s
   end
 
   def test_hash
-    p1 = PkgVersion.new(Version.new("1.0"), 1)
-    p2 = PkgVersion.new(Version.new("1.0"), 1)
-    p3 = PkgVersion.new(Version.new("1.1"), 1)
-    p4 = PkgVersion.new(Version.new("1.0"), 0)
+    p1 = PkgVersion.new(Version.create("1.0"), 1)
+    p2 = PkgVersion.new(Version.create("1.0"), 1)
+    p3 = PkgVersion.new(Version.create("1.1"), 1)
+    p4 = PkgVersion.new(Version.create("1.0"), 0)
     assert_equal p1.hash, p2.hash
     refute_equal p1.hash, p3.hash
     refute_equal p1.hash, p4.hash
diff --git a/Library/Homebrew/test/test_version_subclasses.rb b/Library/Homebrew/test/test_version_subclasses.rb
index b2f226efa..5b38268b5 100644
--- a/Library/Homebrew/test/test_version_subclasses.rb
+++ b/Library/Homebrew/test/test_version_subclasses.rb
@@ -34,10 +34,10 @@ class MacOSVersionTests < Homebrew::TestCase
   end
 
   def test_compare_with_version
-    assert_operator @v, :>, Version.new("10.6")
-    assert_operator @v, :==, Version.new("10.7")
-    assert_operator @v, :===, Version.new("10.7")
-    assert_operator @v, :<, Version.new("10.8")
+    assert_operator @v, :>, Version.create("10.6")
+    assert_operator @v, :==, Version.create("10.7")
+    assert_operator @v, :===, Version.create("10.7")
+    assert_operator @v, :<, Version.create("10.8")
   end
 
   def test_from_symbol
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index bdcc16f6f..a7cb1dc2b 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -4,17 +4,17 @@ require "version"
 class VersionTests < Homebrew::TestCase
   def test_accepts_objects_responding_to_to_str
     value = stub(:to_str => "0.1")
-    assert_equal "0.1", Version.new(value).to_s
+    assert_equal "0.1", Version.create(value).to_s
   end
 
   def test_raises_for_non_string_objects
-    assert_raises(TypeError) { Version.new(1.1) }
-    assert_raises(TypeError) { Version.new(1) }
-    assert_raises(TypeError) { Version.new(:symbol) }
+    assert_raises(TypeError) { Version.create(1.1) }
+    assert_raises(TypeError) { Version.create(1) }
+    assert_raises(TypeError) { Version.create(:symbol) }
   end
 
   def test_detected_from_url?
-    refute Version.new("1.0").detected_from_url?
+    refute Version.create("1.0").detected_from_url?
     assert Version::FromURL.new("1.0").detected_from_url?
   end
 end
@@ -462,20 +462,20 @@ class HeadVersionTests < Homebrew::TestCase
   end
 
   def test_commit_assigned
-    v = HeadVersion.new("HEAD-abcdef")
+    v = Version.create("HEAD-abcdef")
     assert_equal "abcdef", v.commit
     assert_equal "HEAD-abcdef", v.to_str
   end
 
   def test_no_commit
-    v = HeadVersion.new("HEAD")
+    v = Version.create("HEAD")
     assert_nil v.commit
     assert_equal "HEAD", v.to_str
   end
 
   def test_update_commit
-    v1 = HeadVersion.new("HEAD-abcdef")
-    v2 = HeadVersion.new("HEAD")
+    v1 = Version.create("HEAD-abcdef")
+    v2 = Version.create("HEAD")
 
     v1.update_commit("ffffff")
     assert_equal "ffffff", v1.commit
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 35aa00b23..887cb2dbb 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -27,7 +27,7 @@ module Homebrew
     end
 
     def assert_version_equal(expected, actual)
-      assert_equal Version.new(expected), actual
+      assert_equal Version.create(expected), actual
     end
 
     def assert_version_detected(expected, url, specs={})