test_gem_indexer.rb in rubygems-update-1.3.6

- old
+ new

@@ -1,13 +1,6 @@
-#--
-# 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/indexer'
 
 unless ''.respond_to? :to_xs then
   warn "Gem::Indexer tests are being skipped.  Install builder gem."
 end
@@ -143,23 +136,23 @@
 pl-1-i386-linux
     EOF
 
     assert_equal expected, latest_quick_index
 
-    assert_indexed quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@a2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@b2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@c1_2.full_name}.gemspec.rz"
+    assert_indexed quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed quickdir, "#{@a2.spec_name}.rz"
+    assert_indexed quickdir, "#{@b2.spec_name}.rz"
+    assert_indexed quickdir, "#{@c1_2.spec_name}.rz"
 
     assert_indexed quickdir, "#{@pl1.original_name}.gemspec.rz"
-    refute_indexed quickdir, "#{@pl1.full_name}.gemspec.rz"
+    refute_indexed quickdir, "#{@pl1.spec_name}.rz"
 
-    assert_indexed marshal_quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed marshal_quickdir, "#{@a2.full_name}.gemspec.rz"
+    assert_indexed marshal_quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed marshal_quickdir, "#{@a2.spec_name}.rz"
 
-    refute_indexed quickdir, "#{@c1_2.full_name}.gemspec"
-    refute_indexed marshal_quickdir, "#{@c1_2.full_name}.gemspec"
+    refute_indexed quickdir, @c1_2.spec_name
+    refute_indexed marshal_quickdir, @c1_2.spec_name
 
     assert_indexed @tempdir, "specs.#{@marshal_version}"
     assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
 
     assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
@@ -170,11 +163,11 @@
 <rss version=\"2.0\">
   <channel>
     <title>ExampleForge gems</title>
     <link>http://example.com</link>
     <description>Recently released gems from http://example.com</description>
-    <generator>RubyGems v1.3.4</generator>
+    <generator>RubyGems v#{Gem::RubyGemsVersion}</generator>
     <docs>http://cyber.law.harvard.edu/rss/rss.html</docs>
     <item>
       <title>a-2</title>
       <description>
 &lt;pre&gt;This is a test description&lt;/pre&gt;
@@ -323,23 +316,23 @@
     assert_indexed quickdir, "index.rz"
 
     assert_indexed quickdir, "latest_index"
     assert_indexed quickdir, "latest_index.rz"
 
-    assert_indexed quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@a2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@b2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@c1_2.full_name}.gemspec.rz"
+    assert_indexed quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed quickdir, "#{@a2.spec_name}.rz"
+    assert_indexed quickdir, "#{@b2.spec_name}.rz"
+    assert_indexed quickdir, "#{@c1_2.spec_name}.rz"
 
     assert_indexed quickdir, "#{@pl1.original_name}.gemspec.rz"
-    refute_indexed quickdir, "#{@pl1.full_name}.gemspec.rz"
+    refute_indexed quickdir, "#{@pl1.spec_name}.rz"
 
-    assert_indexed marshal_quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed marshal_quickdir, "#{@a2.full_name}.gemspec.rz"
+    assert_indexed marshal_quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed marshal_quickdir, "#{@a2.spec_name}.rz"
 
-    refute_indexed quickdir, "#{@c1_2.full_name}.gemspec"
-    refute_indexed marshal_quickdir, "#{@c1_2.full_name}.gemspec"
+    refute_indexed quickdir, "#{@c1_2.spec_name}"
+    refute_indexed marshal_quickdir, "#{@c1_2.spec_name}"
 
     refute_indexed @tempdir, "specs.#{@marshal_version}"
     refute_indexed @tempdir, "specs.#{@marshal_version}.gz"
 
     refute_indexed @tempdir, "latest_specs.#{@marshal_version}"
@@ -377,19 +370,19 @@
     assert_indexed quickdir, "index.rz"
 
     assert_indexed quickdir, "latest_index"
     assert_indexed quickdir, "latest_index.rz"
 
-    assert_indexed quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@a2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@b2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@c1_2.full_name}.gemspec.rz"
+    assert_indexed quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed quickdir, "#{@a2.spec_name}.rz"
+    assert_indexed quickdir, "#{@b2.spec_name}.rz"
+    assert_indexed quickdir, "#{@c1_2.spec_name}.rz"
 
     assert_indexed quickdir, "#{@pl1.original_name}.gemspec.rz"
 
-    assert_indexed marshal_quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed marshal_quickdir, "#{@a2.full_name}.gemspec.rz"
+    assert_indexed marshal_quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed marshal_quickdir, "#{@a2.spec_name}.rz"
 
     assert_indexed @tempdir, "specs.#{@marshal_version}"
     assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
 
     assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
@@ -419,23 +412,23 @@
     refute_indexed quickdir, "index.rz"
 
     refute_indexed quickdir, "latest_index"
     refute_indexed quickdir, "latest_index.rz"
 
-    refute_indexed quickdir, "#{@a1.full_name}.gemspec.rz"
-    refute_indexed quickdir, "#{@a2.full_name}.gemspec.rz"
-    refute_indexed quickdir, "#{@b2.full_name}.gemspec.rz"
-    refute_indexed quickdir, "#{@c1_2.full_name}.gemspec.rz"
+    refute_indexed quickdir, "#{@a1.spec_name}.rz"
+    refute_indexed quickdir, "#{@a2.spec_name}.rz"
+    refute_indexed quickdir, "#{@b2.spec_name}.rz"
+    refute_indexed quickdir, "#{@c1_2.spec_name}.rz"
 
     refute_indexed quickdir, "#{@pl1.original_name}.gemspec.rz"
-    refute_indexed quickdir, "#{@pl1.full_name}.gemspec.rz"
+    refute_indexed quickdir, "#{@pl1.spec_name}.rz"
 
-    assert_indexed marshal_quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed marshal_quickdir, "#{@a2.full_name}.gemspec.rz"
+    assert_indexed marshal_quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed marshal_quickdir, "#{@a2.spec_name}.rz"
 
-    refute_indexed quickdir, "#{@c1_2.full_name}.gemspec"
-    refute_indexed marshal_quickdir, "#{@c1_2.full_name}.gemspec"
+    refute_indexed quickdir, "#{@c1_2.spec_name}"
+    refute_indexed marshal_quickdir, "#{@c1_2.spec_name}"
 
     assert_indexed @tempdir, "specs.#{@marshal_version}"
     assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
 
     assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
@@ -473,19 +466,19 @@
     assert_indexed quickdir, "index.rz"
 
     assert_indexed quickdir, "latest_index"
     assert_indexed quickdir, "latest_index.rz"
 
-    assert_indexed quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@a2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@b2.full_name}.gemspec.rz"
-    assert_indexed quickdir, "#{@c1_2.full_name}.gemspec.rz"
+    assert_indexed quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed quickdir, "#{@a2.spec_name}.rz"
+    assert_indexed quickdir, "#{@b2.spec_name}.rz"
+    assert_indexed quickdir, "#{@c1_2.spec_name}.rz"
 
     assert_indexed quickdir, "#{@pl1.original_name}.gemspec.rz"
 
-    assert_indexed marshal_quickdir, "#{@a1.full_name}.gemspec.rz"
-    assert_indexed marshal_quickdir, "#{@a2.full_name}.gemspec.rz"
+    assert_indexed marshal_quickdir, "#{@a1.spec_name}.rz"
+    assert_indexed marshal_quickdir, "#{@a2.spec_name}.rz"
 
     assert_indexed @tempdir, "specs.#{@marshal_version}"
     assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
 
     assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
@@ -635,17 +628,17 @@
     @d2_1_a = quick_gem 'd', '2.2.a'
     util_build_gem @d2_1_a
     @d2_1_a_tuple = [@d2_1_a.name, @d2_1_a.version, @d2_1_a.original_platform]
 
     gems = File.join @tempdir, 'gems'
-    FileUtils.mv File.join(@gemhome, 'cache', "#{@d2_1.full_name}.gem"), gems
-    FileUtils.mv File.join(@gemhome, 'cache', "#{@d2_1_a.full_name}.gem"), gems
+    FileUtils.mv File.join(@gemhome, 'cache', @d2_1.file_name), gems
+    FileUtils.mv File.join(@gemhome, 'cache', @d2_1_a.file_name), gems
 
     use_ui @ui do
       @indexer.update_index
     end
 
-    assert_indexed marshal_quickdir, "#{@d2_1.full_name}.gemspec.rz"
+    assert_indexed marshal_quickdir, "#{@d2_1.spec_name}.rz"
 
     specs_index = Marshal.load Gem.read_binary(@indexer.dest_specs_index)
 
     assert_includes specs_index, @d2_1_tuple
     refute_includes specs_index, @d2_1_a_tuple