rubygems-update 1.5.3 → 1.6.0

data/test/rubygems/test_gem_package_tar_output.rb

@@ -49,6 +49,9 @@ class TestGemPackageTarOutput < Gem::Package::TarTestCase
 
   if defined? OpenSSL then
     def test_self_open_signed
+      @private_key = File.expand_path('test/rubygems/private_key.pem', @@project_dir)
+      @public_cert = File.expand_path('test/rubygems/public_cert.pem', @@project_dir)
+
       signer = Gem::Security::Signer.new @private_key, [@public_cert]
 
       open @file, 'wb' do |tar_io|

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -93,9 +93,10 @@ gems:
 
     # REFACTOR: copied from test_gem_dependency_installer.rb
     @gems_dir = File.join @tempdir, 'gems'
-    @cache_dir = File.join @gemhome, 'cache'
+    @cache_dir = Gem.cache_dir(@gemhome)
     FileUtils.mkdir @gems_dir
 
+    # TODO: why does the remote fetcher need it written to disk?
     @a1, @a1_gem = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
 
     Gem::RemoteFetcher.fetcher = nil
@@ -202,7 +203,7 @@ gems:
 
     fetcher = util_fuck_with_fetcher a1_data
 
-    a1_cache_gem = File.join(@gemhome, 'cache', @a1.file_name)
+    a1_cache_gem = Gem.cache_gem(@a1.file_name, @gemhome)
     assert_equal a1_cache_gem, fetcher.download(@a1, 'http://gems.example.com')
     assert_equal("http://gems.example.com/gems/a-1.gem",
                  fetcher.instance_variable_get(:@test_arg).to_s)
@@ -214,7 +215,7 @@ gems:
 
     inst = Gem::RemoteFetcher.fetcher
 
-    assert_equal File.join(@gemhome, 'cache', @a1.file_name),
+    assert_equal Gem.cache_gem(@a1.file_name, @gemhome),
                  inst.download(@a1, 'http://gems.example.com')
   end
 
@@ -227,7 +228,7 @@ gems:
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    assert_equal File.join(@gemhome, 'cache', @a1.file_name),
+    assert_equal Gem.cache_gem(@a1.file_name, @gemhome),
                  inst.download(@a1, local_path)
   end
 
@@ -242,7 +243,7 @@ gems:
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    assert_equal File.join(@gemhome, 'cache', @a1.file_name),
+    assert_equal Gem.cache_gem(@a1.file_name, @gemhome),
                  inst.download(@a1, local_path)
   end
 
@@ -256,7 +257,7 @@ gems:
 
     install_dir = File.join @tempdir, 'more_gems'
 
-    a1_cache_gem = File.join install_dir, 'cache', @a1.file_name
+    a1_cache_gem = Gem.cache_gem(@a1.file_name, install_dir)
     FileUtils.mkdir_p(File.dirname(a1_cache_gem))
     actual = fetcher.download(@a1, 'http://gems.example.com', install_dir)
 
@@ -272,7 +273,7 @@ gems:
       FileUtils.mv @a1_gem, @tempdir
       local_path = File.join @tempdir, @a1.file_name
       inst = nil
-      File.chmod 0555, File.join(@gemhome, 'cache')
+      File.chmod 0555, Gem.cache_dir(@gemhome)
 
       Dir.chdir @tempdir do
         inst = Gem::RemoteFetcher.fetcher
@@ -281,19 +282,19 @@ gems:
       assert_equal File.join(@tempdir, @a1.file_name),
         inst.download(@a1, local_path)
     ensure
-      File.chmod 0755, File.join(@gemhome, 'cache')
+      File.chmod 0755, Gem.cache_dir(@gemhome)
     end
 
     def test_download_read_only
-      File.chmod 0555, File.join(@gemhome, 'cache')
+      File.chmod 0555, Gem.cache_dir(@gemhome)
       File.chmod 0555, File.join(@gemhome)
 
       fetcher = util_fuck_with_fetcher File.read(@a1_gem)
       fetcher.download(@a1, 'http://gems.example.com')
-      assert File.exist?(File.join(Gem.user_dir, 'cache', @a1.file_name))
+      assert File.exist?(Gem.cache_gem(@a1.file_name, Gem.user_dir))
     ensure
-      File.chmod 0755, File.join(@gemhome)
-      File.chmod 0755, File.join(@gemhome, 'cache')
+      File.chmod 0755, @gemhome
+      File.chmod 0755, Gem.cache_dir(@gemhome)
     end
   end
 
@@ -312,7 +313,7 @@ gems:
 
     fetcher = util_fuck_with_fetcher e1_data, :blow_chunks
 
-    e1_cache_gem = File.join(@gemhome, 'cache', e1.file_name)
+    e1_cache_gem = Gem.cache_gem(e1.file_name, @gemhome)
 
     assert_equal e1_cache_gem, fetcher.download(e1, 'http://gems.example.com')
 
@@ -330,7 +331,7 @@ gems:
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    cache_path = File.join @gemhome, 'cache', @a1.file_name
+    cache_path = Gem.cache_gem(@a1.file_name, @gemhome)
     FileUtils.mv local_path, cache_path
 
     gem = Gem::Format.from_file_by_path cache_path
@@ -738,5 +739,13 @@ gems:
     end
   end
 
+  def test_correct_for_windows_path
+    path = "/C:/WINDOWS/Temp/gems"
+    assert_equal "C:/WINDOWS/Temp/gems", @fetcher.correct_for_windows_path(path)
+
+    path = "/home/skillet"
+    assert_equal "/home/skillet", @fetcher.correct_for_windows_path(path)
+  end
+
 end
 

data/test/rubygems/test_gem_requirement.rb

@@ -187,11 +187,15 @@ class TestGemRequirement < Gem::TestCase
     assert_satisfied_by "  ",          "> 0.a "
     assert_satisfied_by "",            " >  0.a"
     assert_satisfied_by "3.1",         "< 3.2.rc1"
+
     assert_satisfied_by "3.2.0",       "> 3.2.0.rc1"
     assert_satisfied_by "3.2.0.rc2",   "> 3.2.0.rc1"
+
     assert_satisfied_by "3.0.rc2",     "< 3.0"
     assert_satisfied_by "3.0.rc2",     "< 3.0.0"
     assert_satisfied_by "3.0.rc2",     "< 3.0.1"
+
+    assert_satisfied_by "3.0.rc2",     "> 0"
   end
 
   def test_illformed_requirements

data/test/rubygems/test_gem_security.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems/security'
+require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9"
 
 class TestGemSecurity < Gem::TestCase
 

data/test/rubygems/test_gem_source_index.rb

@@ -17,7 +17,7 @@ class TestGemSourceIndex < Gem::TestCase
 
     FileUtils.mkdir_p spec_dir
 
-    a1 = quick_gem 'a', '1' do |spec| spec.author = 'author 1' end
+    a1 = quick_spec 'a', '1' do |spec| spec.author = 'author 1' end
 
     spec_file = File.join spec_dir, a1.spec_name
 
@@ -38,7 +38,7 @@ class TestGemSourceIndex < Gem::TestCase
 
     FileUtils.mkdir_p spec_dir
 
-    a1 = quick_gem 'a', '1' do |spec| spec.author = 'author 1' end
+    a1 = quick_spec 'a', '1' do |spec| spec.author = 'author 1' end
 
     spec_file = File.join spec_dir, a1.spec_name
 
@@ -208,24 +208,24 @@ end
   end
 
   def test_latest_specs
-    p1_ruby = quick_gem 'p', '1'
-    p1_platform = quick_gem 'p', '1' do |spec|
+    p1_ruby = quick_spec 'p', '1'
+    p1_platform = quick_spec 'p', '1' do |spec|
       spec.platform = Gem::Platform::CURRENT
     end
 
-    a1_platform = quick_gem @a1.name, (@a1.version) do |s|
+    a1_platform = quick_spec @a1.name, (@a1.version) do |s|
       s.platform = Gem::Platform.new 'x86-my_platform1'
     end
 
-    a2_platform = quick_gem @a2.name, (@a2.version) do |s|
+    a2_platform = quick_spec @a2.name, (@a2.version) do |s|
       s.platform = Gem::Platform.new 'x86-my_platform1'
     end
 
-    a2_platform_other = quick_gem @a2.name, (@a2.version) do |s|
+    a2_platform_other = quick_spec @a2.name, (@a2.version) do |s|
       s.platform = Gem::Platform.new 'x86-other_platform1'
     end
 
-    a3_platform_other = quick_gem @a2.name, (@a2.version.bump) do |s|
+    a3_platform_other = quick_spec @a2.name, (@a2.version.bump) do |s|
       s.platform = Gem::Platform.new 'x86-other_platform1'
     end
 
@@ -260,8 +260,8 @@ end
     FileUtils.mkdir_p spec_dir1
     FileUtils.mkdir_p spec_dir2
 
-    a1 = quick_gem 'a', '1' do |spec| spec.author = 'author 1' end
-    a2 = quick_gem 'a', '1' do |spec| spec.author = 'author 2' end
+    a1 = quick_spec 'a', '1' do |spec| spec.author = 'author 1' end
+    a2 = quick_spec 'a', '1' do |spec| spec.author = 'author 2' end
 
     File.open File.join(spec_dir1, a1.spec_name), 'w' do |fp|
       fp.write a1.to_ruby
@@ -281,12 +281,12 @@ end
 
     assert_equal [], @source_index.outdated
 
-    updated = quick_gem @a2.name, (@a2.version.bump)
+    updated = quick_spec @a2.name, (@a2.version.bump)
     util_setup_spec_fetcher updated
 
     assert_equal [updated.name], @source_index.outdated
 
-    updated_platform = quick_gem @a2.name, (updated.version.bump) do |s|
+    updated_platform = quick_spec @a2.name, (updated.version.bump) do |s|
       s.platform = Gem::Platform.new 'x86-other_platform1'
     end
 
@@ -296,10 +296,11 @@ end
   end
 
   def test_prerelease_specs_kept_in_right_place
-    gem_a1_alpha = quick_gem 'abba', '1.a'
+    gem_a1_alpha = quick_spec 'abba', '1.a'
     @source_index.add_spec gem_a1_alpha
 
     refute @source_index.latest_specs.include?(gem_a1_alpha)
+    assert @source_index.latest_specs(true).include?(gem_a1_alpha)
     assert @source_index.find_name(gem_a1_alpha.full_name).empty?
     assert @source_index.prerelease_specs.include?(gem_a1_alpha)
   end
@@ -357,11 +358,11 @@ end
   def test_search_platform
     util_set_arch 'x86-my_platform1'
 
-    a1 = quick_gem 'a', '1'
-    a1_mine = quick_gem 'a', '1' do |s|
+    a1 = quick_spec 'a', '1'
+    a1_mine = quick_spec 'a', '1' do |s|
       s.platform = Gem::Platform.new 'x86-my_platform1'
     end
-    a1_other = quick_gem 'a', '1' do |s|
+    a1_other = quick_spec 'a', '1' do |s|
       s.platform = Gem::Platform.new 'x86-other_platform1'
     end
 

data/test/rubygems/test_gem_spec_fetcher.rb

@@ -10,7 +10,7 @@ class TestGemSpecFetcher < Gem::TestCase
 
     util_setup_fake_fetcher
 
-    @a_pre = quick_gem 'a', '1.a'
+    @a_pre = quick_spec 'a', '1.a'
     @source_index.add_spec @pl1
     @source_index.add_spec @a_pre
 
@@ -406,5 +406,10 @@ class TestGemSpecFetcher < Gem::TestCase
     assert_equal @latest_specs, latest_specs
   end
 
+  def test_cache_dir_escapes_windows_paths
+    uri = URI.parse("file:///C:/WINDOWS/Temp/gem_repo")
+    cache_dir = @sf.cache_dir(uri).gsub(@sf.dir, '')
+    assert cache_dir !~ /:/, "#{cache_dir} should not contain a :"
+  end
 end
 

data/test/rubygems/test_gem_specification.rb

@@ -40,6 +40,7 @@ end
   def setup
     super
 
+    # TODO: there is no reason why the spec tests need to write to disk
     @a1 = quick_gem 'a', '1' do |s|
       s.executable = 'exec'
       s.extensions << 'ext/a/extconf.rb'
@@ -295,7 +296,7 @@ end
   end
 
   def test_add_dependency_with_explicit_type
-    gem = quick_gem "awesome", "1.0" do |awesome|
+    gem = quick_spec "awesome", "1.0" do |awesome|
       awesome.add_development_dependency "monkey"
     end
 
@@ -365,25 +366,18 @@ end
   end
 
   def test_dependencies
-    rake = Gem::Dependency.new 'rake', '> 0.4'
-    jabber = Gem::Dependency.new 'jabber4r', '> 0.0.0'
-    pqa = Gem::Dependency.new 'pqa', ['> 0.4', '<= 0.6']
-
-    assert_equal [rake, jabber, pqa], @a1.dependencies
+    util_setup_deps
+    assert_equal [@bonobo, @monkey], @gem.dependencies
   end
 
-  def test_dependencies_scoped_by_type
-    gem = quick_gem "awesome", "1.0" do |awesome|
-      awesome.add_runtime_dependency "bonobo", []
-      awesome.add_development_dependency "monkey", []
-    end
-
-    bonobo = Gem::Dependency.new("bonobo", [])
-    monkey = Gem::Dependency.new("monkey", [], :development)
+  def test_runtime_dependencies
+    util_setup_deps
+    assert_equal [@bonobo], @gem.runtime_dependencies
+  end
 
-    assert_equal([bonobo, monkey], gem.dependencies)
-    assert_equal([bonobo], gem.runtime_dependencies)
-    assert_equal([monkey], gem.development_dependencies)
+  def test_development_dependencies
+    util_setup_deps
+    assert_equal [@monkey], @gem.development_dependencies
   end
 
   def test_description
@@ -391,8 +385,8 @@ end
   end
 
   def test_eql_eh
-    g1 = quick_gem 'gem'
-    g2 = quick_gem 'gem'
+    g1 = quick_spec 'gem'
+    g2 = quick_spec 'gem'
 
     assert_equal g1, g2
     assert_equal g1.hash, g2.hash
@@ -691,7 +685,7 @@ end
   end
 
   def test_prerelease_spec_adds_required_rubygems_version
-    @prerelease = quick_gem('tardis', '2.2.0.a')
+    @prerelease = quick_spec('tardis', '2.2.0.a')
     refute @prerelease.required_rubygems_version.satisfied_by?(Gem::Version.new('1.3.1'))
     assert @prerelease.required_rubygems_version.satisfied_by?(Gem::Version.new('1.4.0'))
   end
@@ -717,8 +711,8 @@ end
   end
 
   def test_spaceship_name
-    s1 = quick_gem 'a', '1'
-    s2 = quick_gem 'b', '1'
+    s1 = quick_spec 'a', '1'
+    s2 = quick_spec 'b', '1'
 
     assert_equal(-1, (s1 <=> s2))
     assert_equal( 0, (s1 <=> s1))
@@ -726,8 +720,8 @@ end
   end
 
   def test_spaceship_platform
-    s1 = quick_gem 'a', '1'
-    s2 = quick_gem 'a', '1' do |s|
+    s1 = quick_spec 'a', '1'
+    s2 = quick_spec 'a', '1' do |s|
       s.platform = Gem::Platform.new 'x86-my_platform1'
     end
 
@@ -737,8 +731,8 @@ end
   end
 
   def test_spaceship_version
-    s1 = quick_gem 'a', '1'
-    s2 = quick_gem 'a', '2'
+    s1 = quick_spec 'a', '1'
+    s2 = quick_spec 'a', '2'
 
     assert_equal( -1, (s1 <=> s2))
     assert_equal(  0, (s1 <=> s1))
@@ -804,6 +798,54 @@ end
     assert_equal @a2, same_spec
   end
 
+  def test_to_ruby_for_cache
+    @a2.add_runtime_dependency 'b', '1'
+    @a2.dependencies.first.instance_variable_set :@type, nil
+    @a2.required_rubygems_version = Gem::Requirement.new '> 0'
+
+    # cached specs do not have spec.files populated:
+    ruby_code = @a2.to_ruby_for_cache
+
+    expected = <<-SPEC
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{a}
+  s.version = \"2\"
+
+  s.required_rubygems_version = Gem::Requirement.new(\"> 0\") if s.respond_to? :required_rubygems_version=
+  s.authors = [\"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.rubygems_version = %q{#{Gem::VERSION}}
+  s.summary = %q{this is a summary}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<b>, [\"= 1\"])
+    else
+      s.add_dependency(%q<b>, [\"= 1\"])
+    end
+  else
+    s.add_dependency(%q<b>, [\"= 1\"])
+  end
+end
+    SPEC
+
+    assert_equal expected, ruby_code
+
+    same_spec = eval ruby_code
+
+    # cached specs do not have spec.files populated:
+    @a2.files = []
+    assert_equal @a2, same_spec
+  end
+
   def test_to_ruby_fancy
     @a1.platform = Gem::Platform.local
     ruby_code = @a1.to_ruby
@@ -843,16 +885,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [\"> 0.4\"])
       s.add_runtime_dependency(%q<jabber4r>, [\"> 0.0.0\"])
-      s.add_runtime_dependency(%q<pqa>, [\"> 0.4\", \"<= 0.6\"])
+      s.add_runtime_dependency(%q<pqa>, [\"<= 0.6\", \"> 0.4\"])
     else
       s.add_dependency(%q<rake>, [\"> 0.4\"])
       s.add_dependency(%q<jabber4r>, [\"> 0.0.0\"])
-      s.add_dependency(%q<pqa>, [\"> 0.4\", \"<= 0.6\"])
+      s.add_dependency(%q<pqa>, [\"<= 0.6\", \"> 0.4\"])
     end
   else
     s.add_dependency(%q<rake>, [\"> 0.4\"])
     s.add_dependency(%q<jabber4r>, [\"> 0.0.0\"])
-    s.add_dependency(%q<pqa>, [\"> 0.4\", \"<= 0.6\"])
+    s.add_dependency(%q<pqa>, [\"<= 0.6\", \"> 0.4\"])
   end
 end
     SPEC
@@ -1262,6 +1304,16 @@ end
     specfile.delete
   end
 
+  def util_setup_deps
+    @gem = quick_spec "awesome", "1.0" do |awesome|
+      awesome.add_runtime_dependency "bonobo", []
+      awesome.add_development_dependency "monkey", []
+    end
+
+    @bonobo = Gem::Dependency.new("bonobo", [])
+    @monkey = Gem::Dependency.new("monkey", [], :development)
+  end
+
   def util_setup_validate
     Dir.chdir @tempdir do
       FileUtils.mkdir_p File.join('ext', 'a')
@@ -1273,6 +1325,4 @@ end
       FileUtils.touch File.join('test', 'suite.rb')
     end
   end
-
 end
-