rubygems-update 1.7.2 → 1.8.0

data/test/rubygems/test_gem_spec_fetcher.rb

@@ -10,43 +10,43 @@ class TestGemSpecFetcher < Gem::TestCase
 
     util_setup_fake_fetcher
 
-    @a_pre = quick_spec 'a', '1.a'
-    @source_index.add_spec @pl1
-    @source_index.add_spec @a_pre
+    @a_pre = new_spec 'a', '1.a'
 
-    @specs = @source_index.gems.sort.map do |name, spec|
-      [spec.name, spec.version, spec.original_platform]
-    end.sort
+    install_specs @a_pre
 
-    @latest_specs = @source_index.latest_specs.sort.map do |spec|
-      [spec.name, spec.version, spec.original_platform]
-    end
+    Gem::Specification.remove_spec @b2
 
-    @prerelease_specs = @source_index.prerelease_gems.sort.map do |name, spec|
+    @specs = Gem::Specification.map { |spec|
       [spec.name, spec.version, spec.original_platform]
-    end.sort
+    }.sort
 
-    @fetcher.data["#{@gem_repo}specs.#{Gem.marshal_version}.gz"] =
-      util_gzip(Marshal.dump(@specs))
+    # TODO: couldn't all of this come from the fake spec fetcher?
+    @latest_specs = Gem::Specification.latest_specs.sort.map { |spec|
+      [spec.name, spec.version, spec.original_platform]
+    }
 
-    @fetcher.data["#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"] =
-      util_gzip(Marshal.dump(@latest_specs))
+    prerelease = Gem::Specification.find_all { |s| s.version.prerelease? }
+    @prerelease_specs = prerelease.map { |spec|
+      [spec.name, spec.version, spec.original_platform]
+    }.sort
 
-    @fetcher.data["#{@gem_repo}prerelease_specs.#{Gem.marshal_version}.gz"] =
-      util_gzip(Marshal.dump(@prerelease_specs))
+    v = Gem.marshal_version
+    s_zip = util_gzip(Marshal.dump(@specs))
+    l_zip = util_gzip(Marshal.dump(@latest_specs))
+    p_zip = util_gzip(Marshal.dump(@prerelease_specs))
+    @fetcher.data["#{@gem_repo}specs.#{v}.gz"]            = s_zip
+    @fetcher.data["#{@gem_repo}latest_specs.#{v}.gz"]     = l_zip
+    @fetcher.data["#{@gem_repo}prerelease_specs.#{v}.gz"] = p_zip
 
     @sf = Gem::SpecFetcher.new
   end
 
   def test_fetch_all
-    @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.spec_name}.rz"] =
-      util_zip(Marshal.dump(@a2))
-    @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.spec_name}.rz"] =
-      util_zip(Marshal.dump(@a3a))
+    d = "#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}"
+    @fetcher.data["#{d}#{@a1.spec_name}.rz"]    = util_zip(Marshal.dump(@a1))
+    @fetcher.data["#{d}#{@a2.spec_name}.rz"]    = util_zip(Marshal.dump(@a2))
+    @fetcher.data["#{d}#{@a_pre.spec_name}.rz"] = util_zip(Marshal.dump(@a_pre))
+    @fetcher.data["#{d}#{@a3a.spec_name}.rz"]   = util_zip(Marshal.dump(@a3a))
 
     dep = Gem::Dependency.new 'a', 1
 
@@ -64,12 +64,10 @@ class TestGemSpecFetcher < Gem::TestCase
   end
 
   def test_fetch_latest
-    @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.spec_name}.rz"] =
-      util_zip(Marshal.dump(@a2))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.spec_name}.rz"] =
-      util_zip(Marshal.dump(@a_pre))
+    d = "#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}"
+    @fetcher.data["#{d}#{@a1.spec_name}.rz"]    = util_zip(Marshal.dump(@a1))
+    @fetcher.data["#{d}#{@a2.spec_name}.rz"]    = util_zip(Marshal.dump(@a2))
+    @fetcher.data["#{d}#{@a_pre.spec_name}.rz"] = util_zip(Marshal.dump(@a_pre))
 
     dep = Gem::Dependency.new 'a', 1
     specs_and_sources = @sf.fetch dep
@@ -82,15 +80,12 @@ class TestGemSpecFetcher < Gem::TestCase
   end
 
   def test_fetch_prerelease
-    @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.spec_name}.rz"] =
-      util_zip(Marshal.dump(@a2))
-    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a_pre.spec_name}.rz"] =
-      util_zip(Marshal.dump(@a_pre))
+    d = "#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}"
+    @fetcher.data["#{d}#{@a1.spec_name}.rz"]    = util_zip(Marshal.dump(@a1))
+    @fetcher.data["#{d}#{@a2.spec_name}.rz"]    = util_zip(Marshal.dump(@a2))
+    @fetcher.data["#{d}#{@a_pre.spec_name}.rz"] = util_zip(Marshal.dump(@a_pre))
 
-    dep = Gem::Dependency.new 'a', '1.a'
-    specs_and_sources = @sf.fetch dep, false, true, true
+    specs_and_sources = @sf.fetch dep('a', '1.a'), false, true, true
 
     spec_names = specs_and_sources.map do |spec, source_uri|
       [spec.full_name, source_uri]
@@ -287,11 +282,11 @@ class TestGemSpecFetcher < Gem::TestCase
 
     assert_equal [@uri], specs.keys
 
-    assert_equal([["a", Gem::Version.new("1"), "ruby"],
-                  ["a", Gem::Version.new("2"), "ruby"],
-                  ["a_evil", Gem::Version.new("9"), "ruby"],
-                  ["c", Gem::Version.new("1.2"), "ruby"],
-                  ["pl", Gem::Version.new("1"), "i386-linux"]],
+    assert_equal([["a",      Gem::Version.new("1"),   "ruby"],
+                  ["a",      Gem::Version.new("2"),   "ruby"],
+                  ["a_evil", Gem::Version.new("9"),   "ruby"],
+                  ["c",      Gem::Version.new("1.2"), "ruby"],
+                  ["pl",     Gem::Version.new("1"),   "i386-linux"]],
                  specs[@uri].sort)
   end
 
@@ -341,19 +336,17 @@ class TestGemSpecFetcher < Gem::TestCase
   end
 
   def test_load_specs
-    specs = @sf.load_specs @uri, 'specs'
-
     expected = [
-      ['a',      Gem::Version.new('1.a'),     Gem::Platform::RUBY],
+      ['a',      Gem::Version.new('1.a'), Gem::Platform::RUBY],
       ['a',      Gem::Version.new(1),     Gem::Platform::RUBY],
       ['a',      Gem::Version.new(2),     Gem::Platform::RUBY],
-      ['a',      Gem::Version.new('3.a'),     Gem::Platform::RUBY],
+      ['a',      Gem::Version.new('3.a'), Gem::Platform::RUBY],
       ['a_evil', Gem::Version.new(9),     Gem::Platform::RUBY],
       ['c',      Gem::Version.new('1.2'), Gem::Platform::RUBY],
       ['pl',     Gem::Version.new(1),     'i386-linux'],
     ]
 
-    assert_equal expected, specs
+    assert_equal expected, @sf.load_specs(@uri, 'specs')
 
     cache_dir = File.join Gem.user_home, '.gem', 'specs', 'gems.example.com%80'
     assert File.exist?(cache_dir), "#{cache_dir} does not exist"

data/test/rubygems/test_gem_specification.rb

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   s.version = %q{0.4.0}
   s.has_rdoc = true
   s.summary = %q{A Hash which automatically computes keys.}
-  s.files = ["lib/keyedlist.rb"]
-  s.require_paths = ["lib"]
+  s.files = [%q{lib/keyedlist.rb}]
+  s.require_paths = [%q{lib}]
   s.autorequire = %q{keyedlist}
   s.author = %q{Florian Gross}
   s.email = %q{flgr@ccan.de}
@@ -115,9 +115,8 @@ end
   end
 
   def test_self_load
-    full_path = File.join @gemhome, 'specifications', @a2.spec_name
-    path      = File.join "specifications", @a2.spec_name
-    write_file path do |io|
+    full_path = @a2.spec_file
+    write_file full_path do |io|
       io.write @a2.to_ruby_for_cache
     end
 
@@ -392,51 +391,20 @@ end
   end
 
   def test_eql_eh
-    g1 = quick_spec 'gem'
-    g2 = quick_spec 'gem'
+    g1 = new_spec 'gem', 1
+    g2 = new_spec 'gem', 1
 
     assert_equal g1, g2
     assert_equal g1.hash, g2.hash
     assert_equal true, g1.eql?(g2)
   end
 
-  def test_equals2
-    assert_equal @a1, @a1
-    assert_equal @a1, @a1.dup
-    refute_equal @a1, @a2
-    refute_equal @a1, Object.new
-  end
-
-  # The cgikit specification was reported to be causing trouble in at least
-  # one version of RubyGems, so we test explicitly for it.
-  def test_equals2_cgikit
-    cgikit = Gem::Specification.new do |s|
-      s.name = %q{cgikit}
-      s.version = "1.1.0"
-      s.date = %q{2004-03-13}
-      s.summary = %q{CGIKit is a componented-oriented web application } +
-      %q{framework like Apple Computers WebObjects.  } +
-      %{This framework services Model-View-Controller architecture } +
-      %q{programming by components based on a HTML file, a definition } +
-      %q{file and a Ruby source.  }
-      s.email = %q{info@spice-of-life.net}
-      s.homepage = %q{http://www.spice-of-life.net/download/cgikit/}
-      s.autorequire = %q{cgikit}
-      s.bindir = nil
-      s.required_ruby_version = nil
-      s.platform = nil
-      s.files = ["lib/cgikit", "lib/cgikit.rb", "lib/cgikit/components", "..."]
-    end
-
-    assert_equal cgikit, cgikit
-  end
-
-  def test_equals2_extensions
+  def test_eql_eh_extensions
     spec = @a1.dup
     spec.extensions = 'xx'
 
-    refute_equal @a1, spec
-    refute_equal spec, @a1
+    refute_operator @a1, :eql?, spec
+    refute_operator spec, :eql?, @a1
   end
 
   def test_executables
@@ -562,11 +530,11 @@ end
   end
 
   def test_full_gem_path_double_slash
-    gemhome = @gemhome.sub(/\w\//, '\&/')
-    @a1.loaded_from = File.join gemhome, 'specifications', @a1.spec_name
+    gemhome = @gemhome.to_s.sub(/\w\//, '\&/')
+    @a1.loaded_from = File.join gemhome, "specifications", @a1.spec_name
 
-    assert_equal File.join(@gemhome, 'gems', @a1.full_name),
-                 @a1.full_gem_path
+    expected = File.join @gemhome, "gems", @a1.full_name
+    assert_equal expected, @a1.full_gem_path
   end
 
   def test_full_name
@@ -605,15 +573,14 @@ end
   end
 
   def test_installation_path
-    assert_equal @gemhome, @a1.installation_path
+    Deprecate.skip_during do
+      assert_equal @gemhome, @a1.installation_path
 
-    @a1.instance_variable_set :@loaded_from, nil
+      @a1.instance_variable_set :@loaded_from, nil
+      @a1.instance_variable_set :@loaded, false
 
-    e = assert_raises Gem::Exception do
-      @a1.installation_path
+      assert_nil @a1.installation_path
     end
-
-    assert_equal 'spec a-1 is not from an installed gem', e.message
   end
 
   def test_lib_files
@@ -711,8 +678,8 @@ end
   end
 
   def test_spaceship_name
-    s1 = quick_spec 'a', '1'
-    s2 = quick_spec 'b', '1'
+    s1 = new_spec 'a', '1'
+    s2 = new_spec 'b', '1'
 
     assert_equal(-1, (s1 <=> s2))
     assert_equal( 0, (s1 <=> s1))
@@ -720,8 +687,8 @@ end
   end
 
   def test_spaceship_platform
-    s1 = quick_spec 'a', '1'
-    s2 = quick_spec 'a', '1' do |s|
+    s1 = new_spec 'a', '1'
+    s2 = new_spec 'a', '1' do |s|
       s.platform = Gem::Platform.new 'x86-my_platform1'
     end
 
@@ -731,8 +698,8 @@ end
   end
 
   def test_spaceship_version
-    s1 = quick_spec 'a', '1'
-    s2 = quick_spec 'a', '2'
+    s1 = new_spec 'a', '1'
+    s2 = new_spec 'a', '2'
 
     assert_equal( -1, (s1 <=> s2))
     assert_equal(  0, (s1 <=> s1))
@@ -767,13 +734,13 @@ Gem::Specification.new do |s|
   s.version = \"2\"
 
   s.required_rubygems_version = Gem::Requirement.new(\"> 0\") if s.respond_to? :required_rubygems_version=
-  s.authors = [\"A User\"]
+  s.authors = [%q{A User}]
   s.date = %q{#{Gem::Specification::TODAY.strftime "%Y-%m-%d"}}
   s.description = %q{This is a test description}
   s.email = %q{example@example.com}
-  s.files = [\"lib/code.rb\"]
+  s.files = [%q{lib/code.rb}]
   s.homepage = %q{http://example.com}
-  s.require_paths = [\"lib\"]
+  s.require_paths = [%q{lib}]
   s.rubygems_version = %q{#{Gem::VERSION}}
   s.summary = %q{this is a summary}
 
@@ -814,12 +781,12 @@ Gem::Specification.new do |s|
   s.version = \"2\"
 
   s.required_rubygems_version = Gem::Requirement.new(\"> 0\") if s.respond_to? :required_rubygems_version=
-  s.authors = [\"A User\"]
+  s.authors = [%q{A User}]
   s.date = %q{#{Gem::Specification::TODAY.strftime "%Y-%m-%d"}}
   s.description = %q{This is a test description}
   s.email = %q{example@example.com}
   s.homepage = %q{http://example.com}
-  s.require_paths = [\"lib\"]
+  s.require_paths = [%q{lib}]
   s.rubygems_version = %q{#{Gem::VERSION}}
   s.summary = %q{this is a summary}
 
@@ -862,21 +829,21 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform.new(#{expected_platform})
 
   s.required_rubygems_version = Gem::Requirement.new(\">= 0\") if s.respond_to? :required_rubygems_version=
-  s.authors = [\"A User\"]
+  s.authors = [%q{A User}]
   s.date = %q{#{Gem::Specification::TODAY.strftime "%Y-%m-%d"}}
   s.description = %q{This is a test description}
   s.email = %q{example@example.com}
-  s.executables = [\"exec\"]
-  s.extensions = [\"ext/a/extconf.rb\"]
-  s.files = [\"lib/code.rb\", \"test/suite.rb\", \"bin/exec\", \"ext/a/extconf.rb\"]
+  s.executables = [%q{exec}]
+  s.extensions = [%q{ext/a/extconf.rb}]
+  s.files = [%q{lib/code.rb}, %q{test/suite.rb}, %q{bin/exec}, %q{ext/a/extconf.rb}]
   s.homepage = %q{http://example.com}
-  s.licenses = [\"MIT\"]
-  s.require_paths = [\"lib\"]
-  s.requirements = [\"A working computer\"]
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.requirements = [%q{A working computer}]
   s.rubyforge_project = %q{example}
   s.rubygems_version = %q{#{Gem::VERSION}}
   s.summary = %q{this is a summary}
-  s.test_files = [\"test/suite.rb\"]
+  s.test_files = [%q{test/suite.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -931,7 +898,7 @@ end
 
     refute_match '!!null', yaml_str
 
-    same_spec = YAML.load(yaml_str)
+    same_spec = Gem::Specification.from_yaml(yaml_str)
 
     assert_equal @a1, same_spec
   end
@@ -940,7 +907,7 @@ end
     @a1.platform = Gem::Platform.local
     yaml_str = @a1.to_yaml
 
-    same_spec = YAML.load(yaml_str)
+    same_spec = Gem::Specification.from_yaml(yaml_str)
 
     assert_equal Gem::Platform.local, same_spec.platform
 
@@ -988,7 +955,7 @@ end
     util_setup_validate
 
     Dir.chdir @tempdir do
-      @a1.authors = []
+      @a1.authors = [""]
 
       use_ui @ui do
         @a1.validate
@@ -998,11 +965,13 @@ end
 
       @a1.authors = [Object.new]
 
+      assert_equal [], @a1.authors
+
       e = assert_raises Gem::InvalidSpecificationException do
         @a1.validate
       end
 
-      assert_equal "authors must be an Array of String instances", e.message
+      assert_equal "authors may not be empty", e.message
 
       @a1.authors = ["#{f} (who is writing this software)"]
 
@@ -1328,6 +1297,67 @@ end
     specfile.delete
   end
 
+  ##
+  # KEEP p-1-x86-darwin-8
+  # KEEP p-1
+  # KEEP c-1.2
+  # KEEP a_evil-9
+  #      a-1
+  #      a-1-x86-my_platform-1
+  # KEEP a-2
+  #      a-2-x86-other_platform-1
+  # KEEP a-2-x86-my_platform-1
+  #      a-3.a
+  # KEEP a-3-x86-other_platform-1
+
+  def test_latest_specs
+    util_clear_gems
+    util_setup_fake_fetcher
+
+    quick_spec 'p', '1'
+
+    p1_curr = quick_spec 'p', '1' do |spec|
+      spec.platform = Gem::Platform::CURRENT
+    end
+
+    quick_spec @a1.name, @a1.version do |s|
+      s.platform = Gem::Platform.new 'x86-my_platform1'
+    end
+
+    quick_spec @a1.name, @a1.version do |s|
+      s.platform = Gem::Platform.new 'x86-third_platform1'
+    end
+
+    quick_spec @a2.name, @a2.version do |s|
+      s.platform = Gem::Platform.new 'x86-my_platform1'
+    end
+
+    quick_spec @a2.name, @a2.version do |s|
+      s.platform = Gem::Platform.new 'x86-other_platform1'
+    end
+
+    quick_spec @a2.name, @a2.version.bump do |s|
+      s.platform = Gem::Platform.new 'x86-other_platform1'
+    end
+
+    Gem::Specification.remove_spec @b2
+    Gem::Specification.remove_spec @pl1
+
+    expected = %W[
+                  a-2
+                  a-2-x86-my_platform-1
+                  a-3-x86-other_platform-1
+                  a_evil-9
+                  c-1.2
+                  p-1
+                  #{p1_curr.full_name}
+                 ]
+
+    latest_specs = Gem::Specification.latest_specs.map(&:full_name).sort
+
+    assert_equal expected, latest_specs
+  end
+
   def util_setup_deps
     @gem = quick_spec "awesome", "1.0" do |awesome|
       awesome.add_runtime_dependency "bonobo", []