rubygems-update 1.3.5 → 1.3.6

data/test/test_gem_source_index.rb

@@ -1,10 +1,4 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/source_index'
 require 'rubygems/config_file'
 
@@ -31,7 +25,7 @@ class TestGemSourceIndex < RubyGemTestCase
 
     a1 = quick_gem 'a', '1' do |spec| spec.author = 'author 1' end
 
-    spec_file = File.join spec_dir, "#{a1.full_name}.gemspec"
+    spec_file = File.join spec_dir, a1.spec_name
 
     File.open spec_file, 'w' do |fp|
       fp.write a1.to_ruby
@@ -52,7 +46,7 @@ class TestGemSourceIndex < RubyGemTestCase
 
     a1 = quick_gem 'a', '1' do |spec| spec.author = 'author 1' end
 
-    spec_file = File.join spec_dir, "#{a1.full_name}.gemspec"
+    spec_file = File.join spec_dir, a1.spec_name
 
     File.open spec_file, 'w' do |fp|
       fp.write a1.to_ruby
@@ -298,11 +292,11 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     a1 = quick_gem 'a', '1' do |spec| spec.author = 'author 1' end
     a2 = quick_gem 'a', '1' do |spec| spec.author = 'author 2' end
 
-    File.open File.join(spec_dir1, "#{a1.full_name}.gemspec"), 'w' do |fp|
+    File.open File.join(spec_dir1, a1.spec_name), 'w' do |fp|
       fp.write a1.to_ruby
     end
 
-    File.open File.join(spec_dir2, "#{a2.full_name}.gemspec"), 'w' do |fp|
+    File.open File.join(spec_dir2, a2.spec_name), 'w' do |fp|
       fp.write a2.to_ruby
     end
 
@@ -340,7 +334,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
   end
 
   def test_refresh_bang
-    a1_spec = File.join @gemhome, "specifications", "#{@a1.full_name}.gemspec" 
+    a1_spec = File.join @gemhome, "specifications", @a1.spec_name 
 
     FileUtils.mv a1_spec, @tempdir
 
@@ -348,7 +342,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     refute source_index.gems.include?(@a1.full_name)
 
-    FileUtils.mv File.join(@tempdir, "#{@a1.full_name}.gemspec"), a1_spec
+    FileUtils.mv File.join(@tempdir, @a1.spec_name), a1_spec
 
     source_index.refresh!
 

data/test/test_gem_spec_fetcher.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/spec_fetcher'
 
 class TestGemSpecFetcher < RubyGemTestCase
@@ -39,16 +39,17 @@ class TestGemSpecFetcher < RubyGemTestCase
   end
 
   def test_fetch_all
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}.rz"] =
       util_zip(Marshal.dump(@a1))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a2.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a2.spec_name}.rz"] =
       util_zip(Marshal.dump(@a2))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.spec_name}.rz"] =
       util_zip(Marshal.dump(@a_pre))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a3a.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a3a.spec_name}.rz"] =
       util_zip(Marshal.dump(@a3a))
 
     dep = Gem::Dependency.new 'a', 1
+
     specs_and_sources = @sf.fetch dep, true
 
     spec_names = specs_and_sources.map do |spec, source_uri|
@@ -63,11 +64,11 @@ class TestGemSpecFetcher < RubyGemTestCase
   end
 
   def test_fetch_latest
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}.rz"] =
       util_zip(Marshal.dump(@a1))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a2.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a2.spec_name}.rz"] =
       util_zip(Marshal.dump(@a2))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.spec_name}.rz"] =
       util_zip(Marshal.dump(@a_pre))
 
     dep = Gem::Dependency.new 'a', 1
@@ -81,11 +82,11 @@ class TestGemSpecFetcher < RubyGemTestCase
   end
 
   def test_fetch_prerelease
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}.rz"] =
       util_zip(Marshal.dump(@a1))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a2.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a2.spec_name}.rz"] =
       util_zip(Marshal.dump(@a2))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.spec_name}.rz"] =
       util_zip(Marshal.dump(@a_pre))
 
     dep = Gem::Dependency.new 'a', '1.a'
@@ -98,37 +99,6 @@ class TestGemSpecFetcher < RubyGemTestCase
     assert_equal [[@a_pre.full_name, @gem_repo]], spec_names
   end
 
-  def test_fetch_legacy_repo
-    @fetcher.data.delete "#{@gem_repo}specs.#{Gem.marshal_version}.gz"
-    @fetcher.data["#{@gem_repo}yaml"] = ''
-    util_setup_source_info_cache @a1, @a2
-
-    dep = Gem::Dependency.new 'a', 1
-    specs = nil
-
-    use_ui @ui do
-      specs = @sf.fetch dep, true
-    end
-
-    expected = <<-EOF
-WARNING:  RubyGems 1.2+ index not found for:
-\thttp://gems.example.com/
-
-RubyGems will revert to legacy indexes degrading performance.
-    EOF
-
-    assert_equal expected, @ui.error
-
-    specs = specs.map { |spec, source_uri| [spec.full_name, source_uri] }
-
-    expected = [
-      [@a1.full_name, @gem_repo],
-      [@a2.full_name, @gem_repo],
-    ]
-
-    assert_equal expected, specs
-  end
-
   def test_fetch_platform
     util_set_arch 'i386-linux'
 
@@ -146,7 +116,7 @@ RubyGems will revert to legacy indexes degrading performance.
   end
 
   def test_fetch_spec
-    spec_uri = "#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.full_name}.gemspec"
+    spec_uri = "#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}"
     @fetcher.data["#{spec_uri}.rz"] = util_zip(Marshal.dump(@a1))
 
     spec = @sf.fetch_spec ['a', Gem::Version.new(1), 'ruby'], @uri
@@ -154,19 +124,19 @@ RubyGems will revert to legacy indexes degrading performance.
 
     cache_dir = @sf.cache_dir URI.parse(spec_uri)
 
-    cache_file = File.join cache_dir, "#{@a1.full_name}.gemspec"
+    cache_file = File.join cache_dir, @a1.spec_name
 
     assert File.exist?(cache_file)
   end
 
   def test_fetch_spec_cached
-    spec_uri = "#{@gem_repo}/#{Gem::MARSHAL_SPEC_DIR}#{@a1.full_name}.gemspec"
+    spec_uri = "#{@gem_repo}/#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}"
     @fetcher.data["#{spec_uri}.rz"] = nil
 
     cache_dir = @sf.cache_dir URI.parse(spec_uri)
     FileUtils.mkdir_p cache_dir
 
-    cache_file = File.join cache_dir, "#{@a1.full_name}.gemspec"
+    cache_file = File.join cache_dir, @a1.spec_name
 
     open cache_file, 'wb' do |io|
       Marshal.dump @a1, io
@@ -186,7 +156,7 @@ RubyGems will revert to legacy indexes degrading performance.
   end
 
   def test_fetch_spec_platform_ruby
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.full_name}.gemspec.rz"] =
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}.rz"] =
       util_zip(Marshal.dump(@a1))
 
     spec = @sf.fetch_spec ['a', Gem::Version.new(1), nil], @uri

data/test/test_gem_specification.rb

@@ -1,11 +1,5 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
+require File.expand_path('../gemutilities', __FILE__)
 require 'stringio'
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/specification'
 
 class TestGemSpecification < RubyGemTestCase
@@ -129,7 +123,7 @@ end
   end
 
   def test_self_load
-    spec = File.join @gemhome, 'specifications', "#{@a2.full_name}.gemspec"
+    spec = File.join @gemhome, 'specifications', @a2.spec_name
     gs = Gem::Specification.load spec
 
     assert_equal @a2, gs
@@ -145,16 +139,6 @@ end
     assert_equal false, spec.has_unit_tests?
   end
 
-  def test_self_load_legacy_yaml
-    s = YAML.load StringIO.new(LEGACY_YAML_SPEC)
-    assert_equal 'keyedlist', s.name
-    assert_equal '0.4.0', s.version.to_s
-    assert_equal true, s.has_rdoc?
-    #assert_equal Date.today, s.date
-    #assert s.required_ruby_version.satisfied_by?(Gem::Version.new('1'))
-    assert_equal false, s.has_unit_tests?
-  end
-
   def test_self_normalize_yaml_input_with_183_yaml
     input = "!ruby/object:Gem::Specification "
     assert_equal "--- #{input}", Gem::Specification.normalize_yaml_input(input)
@@ -538,8 +522,7 @@ end
 
   def test_full_gem_path_double_slash
     gemhome = @gemhome.sub(/\w\//, '\&/')
-    @a1.loaded_from = File.join gemhome, 'specifications',
-                                "#{@a1.full_name}.gemspec"
+    @a1.loaded_from = File.join gemhome, 'specifications', @a1.spec_name
 
     assert_equal File.join(@gemhome, 'gems', @a1.full_name),
                  @a1.full_gem_path
@@ -730,6 +713,10 @@ end
     assert_equal(  1, (s2 <=> s1))
   end
 
+  def test_spec_name
+    assert_equal 'a-1.gemspec', @a1.spec_name
+  end
+
   def test_summary
     assert_equal 'this is a summary', @a1.summary
   end

data/test/test_gem_stream_ui.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/user_interaction'
 
 class TestGemStreamUI < RubyGemTestCase
@@ -46,6 +46,26 @@ class TestGemStreamUI < RubyGemTestCase
     end
   end
 
+  def test_ask_for_password
+    skip 'Always uses $stdin on windows' if Gem.win_platform?
+
+    timeout(1) do
+      expected_answer = "Arthur, King of the Britons"
+      @in.string = "#{expected_answer}\n"
+      actual_answer = @sui.ask_for_password("What is your name?")
+      assert_equal expected_answer, actual_answer
+    end
+  end
+
+  def test_ask_for_password_no_tty
+    @in.tty = false
+
+    timeout(0.1) do
+      answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?")
+      assert_equal nil, answer
+    end
+  end
+
   def test_ask_yes_no_no_tty_with_default
     @in.tty = false
 

data/test/test_gem_uninstaller.rb

@@ -1,5 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)),
-                  'gem_installer_test_case')
+require File.expand_path('../gem_installer_test_case', __FILE__)
 require 'rubygems/uninstaller'
 
 class TestGemUninstaller < GemInstallerTestCase

data/test/test_gem_validator.rb

@@ -1,11 +1,5 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-require File.join(File.expand_path(File.dirname(__FILE__)), 'simple_gem')
+require File.expand_path('../gemutilities', __FILE__)
+require File.expand_path('../simple_gem', __FILE__)
 require 'rubygems/validator'
 
 class TestGemValidator < RubyGemTestCase

data/test/test_gem_version.rb

@@ -1,316 +1,172 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-require 'rubygems/version'
+require File.expand_path('../gemutilities', __FILE__)
+require "rubygems/version"
 
 class TestGemVersion < RubyGemTestCase
 
-  def setup
-    super
-
-    version = Object.new
-    def version.to_s() '1.4.0' end
-
-    @v1_0 = Gem::Version.new '1.0'
-    @v1_2 = Gem::Version.new '1.2'
-    @v1_3 = Gem::Version.new '1.3'
-    @v1_4_0 = Gem::Version.new version
-  end
-
-  def test_class_create
-    assert_version Gem::Version.create('1.0')
-    assert_version Gem::Version.create("1.0 ")
-    assert_version Gem::Version.create(" 1.0 ")
-    assert_version Gem::Version.create("1.0\n")
-    assert_version Gem::Version.create("\n1.0\n")
-
-    assert_equal Gem::Version.create('1'), Gem::Version.create(1)
-  end
-
-  def test_class_create_malformed
-    e = assert_raises ArgumentError do Gem::Version.create("junk") end
-    assert_equal "Malformed version number string junk", e.message
-
-    e = assert_raises ArgumentError do Gem::Version.create("1.0\n2.0") end
-    assert_equal "Malformed version number string 1.0\n2.0", e.message
+  def test_bump
+    assert_bumped_version_equal "5.3", "5.2.4"
   end
 
-  def test_bad
-    assert_inadequate( "",            "> 0.1")
-    assert_inadequate( "1.2.3",       "!= 1.2.3")
-    assert_inadequate( "1.2.003.0.0", "!= 1.02.3")
-    assert_inadequate( "4.5.6",       "< 1.2.3")
-    assert_inadequate( "1.0",         "> 1.1")
-    assert_inadequate( "0",           ">")
-    assert_inadequate( "0",           "<")
-    assert_inadequate( "",            "= 0.1")
-    assert_inadequate( "1.1.1",       "> 1.1.1")
-    assert_inadequate( "1.2",         "= 1.1")
-    assert_inadequate( "1.40",        "= 1.1")
-    assert_inadequate( "1.3",         "= 1.40")
-    assert_inadequate( "9.3.3",       "<= 9.3.2")
-    assert_inadequate( "9.3.1",       ">= 9.3.2")
-    assert_inadequate( "9.3.03",      "<= 9.3.2")
-    assert_inadequate( "1.0.0.1",     "= 1.0")
+  def test_bump_alpha
+    assert_bumped_version_equal "5.3", "5.2.4.a"
   end
 
   def test_bump_trailing_zeros
-    v = Gem::Version.new("5.0.0")
-    assert_equal "5.1", v.bump.to_s
-  end
-
-  def test_bump
-    v = Gem::Version.new("5.2.4")
-    assert_equal "5.3", v.bump.to_s
-  end
-
-  def test_bump_alpha
-    v = Gem::Version.new("5.2.4.a")
-    assert_equal "5.3", v.bump.to_s
+    assert_bumped_version_equal "5.1", "5.0.0"
   end
 
   def test_bump_one_level
-    v = Gem::Version.new("5")
-    assert_equal "6", v.bump.to_s
+    assert_bumped_version_equal "6", "5"
   end
 
-  def test_eql_eh
-    v1_2   = Gem::Version.new '1.2'
-    v1_2_0 = Gem::Version.new '1.2.0'
+  # FIX: For "legacy reasons," any object that responds to +version+
+  # is returned unchanged. I'm not certain why.
 
-    assert_equal true, v1_2.eql?(@v1_2)
-    assert_equal true, @v1_2.eql?(v1_2)
-
-    assert_equal false, v1_2_0.eql?(@v1_2)
-    assert_equal false, @v1_2.eql?(v1_2_0)
+  def test_class_create
+    fake = Object.new
+    def fake.version; "1.0" end
 
-    assert_equal false, @v1_2.eql?(@v1_3)
-    assert_equal false, @v1_3.eql?(@v1_2)
+    assert_same  fake, Gem::Version.create(fake)
+    assert_nil   Gem::Version.create(nil)
+    assert_equal v("5.1"), Gem::Version.create("5.1")
   end
 
-  def test_eql_eh4
-    v1_4   = Gem::Version.new '1.4'
-    v1_4_0 = Gem::Version.new "1.4.0"
-
-    assert_equal true, v1_4_0.eql?(@v1_4_0)
-    assert_equal true, @v1_4_0.eql?(v1_4_0)
-
-    assert_equal false, v1_4.eql?(@v1_4_0)
-    assert_equal false, @v1_4_0.eql?(v1_4)
-
-    assert_equal false, @v1_4_0.eql?(@v1_3)
-    assert_equal false, @v1_3.eql?(@v1_4_0)
+  def test_eql_eh
+    assert_version_eql "1.2", "1.2"
+    refute_version_eql "1.2", "1.2.0"
+    refute_version_eql "1.2", "1.3"
   end
 
-  def test_equals2
-    v = Gem::Version.new("1.2")
-
-    assert_equal v, @v1_2
-    assert_equal @v1_2, v
-
-    refute_equal @v1_2, @v1_3
-    refute_equal @v1_3, @v1_2
+  def test_equals
+    assert_version_equal "1.2", "1.2"
+    refute_version_equal "1.2", "1.3"
   end
 
+  # REVISIT: consider removing as too impl-bound
   def test_hash
-    v1_2   = Gem::Version.new "1.2"
-    v1_2_0 = Gem::Version.new "1.2.0"
-    v1_4_0 = Gem::Version.new "1.4.0"
-
-    assert_equal v1_2.hash, @v1_2.hash
-
-    refute_equal v1_2_0.hash, @v1_2.hash
-
-    assert_equal v1_4_0.hash, @v1_4_0.hash
-
-    refute_equal @v1_2.hash, @v1_3.hash
-
-    refute_equal @v1_2.hash, @v1_4_0.hash
+    assert_equal v("1.2").hash, v("1.2").hash
+    refute_equal v("1.2").hash, v("1.3").hash
+    refute_equal v("1.2").hash, v("1.2.0").hash
   end
 
-  def test_illformed_requirements
-    [ ">>> 1.3.5", "> blah" ].each do |rq|
-      assert_raises ArgumentError, "req [#{rq}] should fail" do
-        Gem::Version::Requirement.new rq
-      end
+  def test_initialize
+    ["1.0", "1.0 ", " 1.0 ", "1.0\n", "\n1.0\n"].each do |good|
+      assert_version_equal "1.0", good
     end
-  end
 
-  def test_normalize
-    assert_equal [0],         Gem::Version.new("").normalize.map { |part| part.value }
-    assert_equal [0],         Gem::Version.new("0").normalize.map { |part| part.value }
-    assert_equal [1],         Gem::Version.new("1").normalize.map { |part| part.value }
-    assert_equal [1],         Gem::Version.new("1.0").normalize.map { |part| part.value }
-    assert_equal [1, 1],      Gem::Version.new("1.1").normalize.map { |part| part.value }
-    assert_equal [1, 1, "a"], Gem::Version.new("1.1.a").normalize.map { |part| part.value }
+    assert_version_equal "1", 1
   end
 
-  def test_ok
-    assert_adequate( "0.2.33",      "= 0.2.33")
-    assert_adequate( "0.2.34",      "> 0.2.33")
-    assert_adequate( "1.0",         "= 1.0")
-    assert_adequate( "1.0",         "1.0")
-    assert_adequate( "1.8.2",       "> 1.8.0")
-    assert_adequate( "1.112",       "> 1.111")
-    assert_adequate( "0.2",         "> 0.0.0")
-    assert_adequate( "0.0.0.0.0.2", "> 0.0.0")
-    assert_adequate( "0.0.1.0",     "> 0.0.0.1")
-    assert_adequate( "10.3.2",      "> 9.3.2")
-    assert_adequate( "1.0.0.0",     "= 1.0")
-    assert_adequate( "10.3.2",      "!= 9.3.4")
-    assert_adequate( "10.3.2",      "> 9.3.2")
-    assert_adequate( "10.3.2",      "> 9.3.2")
-    assert_adequate( " 9.3.2",      ">= 9.3.2")
-    assert_adequate( "9.3.2 ",      ">= 9.3.2")
-    assert_adequate( "",            "= 0")
-    assert_adequate( "",            "< 0.1")
-    assert_adequate( "  ",          "< 0.1 ")
-    assert_adequate( "",            " <  0.1")
-    assert_adequate( "  ",          "> 0.a ")
-    assert_adequate( "",            " >  0.a")
-    assert_adequate( "0",           "=")
-    assert_adequate( "0",           ">=")
-    assert_adequate( "0",           "<=")
-    assert_adequate( "3.1",         "< 3.2.rc1")
-    assert_adequate( "3.2.0",       "> 3.2.0.rc1")
-    assert_adequate( "3.2.0.rc2",   "> 3.2.0.rc1")
-    assert_adequate( "3.0.rc2",     "< 3.0")
-    assert_adequate( "3.0.rc2",     "< 3.0.0")
-    assert_adequate( "3.0.rc2",     "< 3.0.1")
-  end
+  def test_initialize_bad
+    ["junk", "1.0\n2.0"].each do |bad|
+      e = assert_raises ArgumentError do
+        Gem::Version.new bad
+      end
 
-  def test_parse_parts_from_version_string
-    assert_equal [], part_values(Gem::Version.new("").parse_parts_from_version_string)
-    assert_equal [1], part_values(Gem::Version.new("1").parse_parts_from_version_string)
-    assert_equal [1, 0], part_values(Gem::Version.new("1.0").parse_parts_from_version_string)
-    assert_equal [1, 0, "a"], part_values(Gem::Version.new("1.0.a").parse_parts_from_version_string)
+      assert_equal "Malformed version number string #{bad}", e.message
+    end
   end
 
   def test_prerelease
-    assert Gem::Version.new('1.2.0.a').prerelease?
-    assert Gem::Version.new('2.9.b').prerelease?
-    assert Gem::Version.new('22.1.50.0.d').prerelease?
+    assert_prerelease "1.2.0.a"
+    assert_prerelease "2.9.b"
+    assert_prerelease "22.1.50.0.d"
+    assert_prerelease "1.2.d.42"
 
-    refute Gem::Version.new('1.2.0').prerelease?
-    refute Gem::Version.new('2.9').prerelease?
-    refute Gem::Version.new('22.1.50.0').prerelease?
-  end
-  
-  def test_release
-    assert_equal Gem::Version.new('1.2.0'), Gem::Version.new('1.2.0.a').release
-    assert_equal Gem::Version.new('1.1'),   Gem::Version.new('1.1.rc10').release
-    assert_equal Gem::Version.new('1.9.3'), Gem::Version.new('1.9.3.alpha.5').release
-    assert_equal Gem::Version.new('1.9.3'), Gem::Version.new('1.9.3').release
-  end
+    assert_prerelease '1.A'
 
-  def test_satisfied_by_eh_boxed
-    assert_inadequate("1.3", "~> 1.4")
-    assert_adequate(  "1.4", "~> 1.4")
-    assert_adequate(  "1.5", "~> 1.4")
-    assert_inadequate("2.0", "~> 1.4")
-
-    assert_inadequate("1.3",   "~> 1.4.4")
-    assert_inadequate("1.4",   "~> 1.4.4")
-    assert_adequate(  "1.4.4", "~> 1.4.4")
-    assert_adequate(  "1.4.5", "~> 1.4.4")
-    assert_inadequate("1.5",   "~> 1.4.4")
-    assert_inadequate("2.0",   "~> 1.4.4")
-    
-    assert_inadequate("1.1.pre", "~> 1.0.0")
-    assert_adequate(  "1.1.pre", "~> 1.1")
-    assert_inadequate("2.0.a",   "~> 1.0")
-    assert_adequate(  "2.0.a",   "~> 2.0")
+    refute_prerelease "1.2.0"
+    refute_prerelease "2.9"
+    refute_prerelease "22.1.50.0"
   end
 
-  def test_satisfied_by_eh_multiple
-    req = [">= 1.4", "<= 1.6", "!= 1.5"]
-    assert_inadequate("1.3", req)
-    assert_adequate(  "1.4", req)
-    assert_inadequate("1.5", req)
-    assert_adequate(  "1.6", req)
-    assert_inadequate("1.7", req)
-    assert_inadequate("2.0", req)
+  def test_release
+    assert_release_equal "1.2.0", "1.2.0.a"
+    assert_release_equal "1.1",   "1.1.rc10"
+    assert_release_equal "1.9.3", "1.9.3.alpha.5"
+    assert_release_equal "1.9.3", "1.9.3"
   end
 
   def test_spaceship
-    assert_equal 0, Gem::Version.new('1.0') <=> Gem::Version.new('1.0.0')
-    assert_equal 1, Gem::Version.new('1.0') <=> Gem::Version.new('1.0.a')
-    assert_equal 1, Gem::Version.new('1.8.2') <=> Gem::Version.new('0.0.0')
-    assert_equal 1, Gem::Version.new('1.8.2') <=> Gem::Version.new('1.8.2.a')
-    assert_equal 1, Gem::Version.new('1.8.2.b') <=> Gem::Version.new('1.8.2.a')
-    assert_equal 0, Gem::Version.new('') <=> Gem::Version.new('0')
+    assert_equal( 0, v("1.0")     <=> v("1.0.0"))
+    assert_equal( 1, v("1.0")     <=> v("1.0.a"))
+    assert_equal( 1, v("1.8.2")   <=> v("0.0.0"))
+    assert_equal( 1, v("1.8.2")   <=> v("1.8.2.a"))
+    assert_equal( 1, v("1.8.2.b") <=> v("1.8.2.a"))
+    assert_equal(-1, v("1.8.2.a") <=> v("1.8.2"))
+    assert_equal( 0, v("")        <=> v("0"))
   end
 
-  def test_boxed
-    assert_inadequate("1.3", "~> 1.4")
-    assert_adequate(  "1.4", "~> 1.4")
-    assert_adequate(  "1.5", "~> 1.4")
-    assert_inadequate("2.0", "~> 1.4")
-
-    assert_inadequate("1.3",   "~> 1.4.4")
-    assert_inadequate("1.4",   "~> 1.4.4")
-    assert_adequate(  "1.4.4", "~> 1.4.4")
-    assert_adequate(  "1.4.5", "~> 1.4.4")
-    assert_inadequate("1.5",   "~> 1.4.4")
-    assert_inadequate("2.0",   "~> 1.4.4")
+  def test_spermy_recommendation
+    assert_spermy_equal "~> 1.0", "1"
+    assert_spermy_equal "~> 1.0", "1.0"
+    assert_spermy_equal "~> 1.2", "1.2"
+    assert_spermy_equal "~> 1.2", "1.2.0"
+    assert_spermy_equal "~> 1.2", "1.2.3"
+    assert_spermy_equal "~> 1.2", "1.2.3.a.4"
   end
 
   def test_to_s
-    v = Gem::Version.new("5.2.4")
-    assert_equal "5.2.4", v.to_s
+    assert_equal "5.2.4", v("5.2.4").to_s
+  end
+
+  # Asserts that +version+ is a prerelease.
+
+  def assert_prerelease version
+    assert v(version).prerelease?, "#{version} is a prerelease"
   end
 
-  def assert_adequate(version, requirement)
-    ver = Gem::Version.new(version)
-    req = Gem::Requirement.new(requirement)
-    assert req.satisfied_by?(ver),
-      "Version #{version} should be adequate for Requirement #{requirement}"
+  # Assert that +expected+ is the "spermy" recommendation for +version".
+
+  def assert_spermy_equal expected, version
+    assert_equal expected, v(version).spermy_recommendation
   end
 
-  def assert_inadequate(version, requirement)
-    ver = Gem::Version.new(version)
-    req = Gem::Version::Requirement.new(requirement)
-    refute req.satisfied_by?(ver),
-      "Version #{version} should not be adequate for Requirement #{requirement}"
+  # Assert that bumping the +unbumped+ version yields the +expected+.
+
+  def assert_bumped_version_equal expected, unbumped
+    assert_version_equal expected, v(unbumped).bump
   end
 
-  def assert_version(actual)
-    assert_equal @v1_0, actual
-    assert_equal @v1_0.version, actual.version
+  # Assert that +release+ is the correct non-prerelease +version+.
+
+  def assert_release_equal release, version
+    assert_version_equal release, v(version).release
   end
 
-  def part_values(*parts)
-    parts.flatten.map { |part| part.value }
+  # Assert that two versions are equal. Handles strings or
+  # Gem::Version instances.
+
+  def assert_version_equal expected, actual
+    assert_equal v(expected), v(actual)
   end
-end
 
-class TestGemVersionPart < RubyGemTestCase
-  def test_initialize
-    assert_equal 1, Gem::Version::Part.new(1).value
-    assert_equal 1, Gem::Version::Part.new("1").value
-    assert_equal "a", Gem::Version::Part.new("a").value
+  # Assert that two versions are eql?. Checks both directions.
+
+  def assert_version_eql first, second
+    first, second = v(first), v(second)
+    assert first.eql?(second), "#{first} is eql? #{second}"
+    assert second.eql?(first), "#{second} is eql? #{first}"
   end
 
-  def test_spaceship
-    assert_equal(-1, Gem::Version::Part.new(1) <=> Gem::Version::Part.new(2))
-    assert_equal( 0, Gem::Version::Part.new(2) <=> Gem::Version::Part.new(2))
-    assert_equal( 1, Gem::Version::Part.new(2) <=> Gem::Version::Part.new(1))
+  # Refute the assumption that +version+ is a prerelease.
 
-    assert_equal(-1, Gem::Version::Part.new("a") <=> Gem::Version::Part.new("b"))
-    assert_equal( 0, Gem::Version::Part.new("b") <=> Gem::Version::Part.new("b"))
-    assert_equal( 1, Gem::Version::Part.new("b") <=> Gem::Version::Part.new("a"))
+  def refute_prerelease version
+    refute v(version).prerelease?, "#{version} is NOT a prerelease"
+  end
 
-    assert_equal(-1, Gem::Version::Part.new("a") <=> Gem::Version::Part.new(1))
-    assert_equal( 1, Gem::Version::Part.new(1)   <=> Gem::Version::Part.new("a"))
+  # Refute the assumption that two versions are eql?. Checks both
+  # directions.
+
+  def refute_version_eql first, second
+    first, second = v(first), v(second)
+    refute first.eql?(second), "#{first} is NOT eql? #{second}"
+    refute second.eql?(first), "#{second} is NOT eql? #{first}"
   end
 
-  def test_succ
-    assert_equal 2, Gem::Version::Part.new(1).succ.value
-    assert_equal "b", Gem::Version::Part.new("a").succ.value
+  # Refute the assumption that the two versions are equal?.
+
+  def refute_version_equal unexpected, actual
+    refute_equal v(unexpected), v(actual)
   end
 end
-