rubygems-update 2.4.8 → 2.5.0

data/test/rubygems/test_gem_indexer.rb

@@ -48,11 +48,11 @@ class TestGemIndexer < Gem::TestCase
     assert indexer.build_modern
   end
 
-  def test_build_indicies
+  def test_build_indices
     @indexer.make_temp_directories
 
     use_ui @ui do
-      @indexer.build_indicies
+      @indexer.build_indices
     end
 
     specs_path = File.join @indexer.directory, "specs.#{@marshal_version}"
@@ -198,7 +198,7 @@ class TestGemIndexer < Gem::TestCase
     assert_match %r%^Generating latest specs index$%, @ui.output
     assert_match %r%^Generating prerelease specs index$%, @ui.output
     assert_match %r%^Complete$%, @ui.output
-    assert_match %r%^Compressing indicies$%, @ui.output
+    assert_match %r%^Compressing indices$%, @ui.output
 
     assert_equal '', @ui.error
   end
@@ -294,7 +294,7 @@ class TestGemIndexer < Gem::TestCase
 
     sys_gem = util_spec 'systemgem', '1.0'
     util_build_gem sys_gem
-    Gem::Specification.add_spec sys_gem
+    install_default_gems sys_gem
     yield
     util_remove_gem sys_gem
   end

data/test/rubygems/test_gem_install_update_options.rb

@@ -129,7 +129,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
     assert @cmd.options[:user_install]
 
-    @installer = Gem::Installer.new @gem, @cmd.options
+    @installer = Gem::Installer.at @gem, @cmd.options
     @installer.install
     assert_path_exists File.join(Gem.user_dir, 'gems')
     assert_path_exists File.join(Gem.user_dir, 'gems', @spec.full_name)
@@ -149,7 +149,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
       Gem.use_paths @gemhome, @userhome
 
       assert_raises(Gem::FilePermissionError) do
-        Gem::Installer.new(@gem, @cmd.options).install
+        Gem::Installer.at(@gem, @cmd.options).install
       end
     end
   ensure

data/test/rubygems/test_gem_installer.rb

@@ -36,7 +36,7 @@ class TestGemInstaller < Gem::InstallerTestCase
 
 require 'rubygems'
 
-version = \">= 0\"
+version = \">= 0.a\"
 
 if ARGV.first
   str = ARGV.first
@@ -257,7 +257,7 @@ gem 'other', version
       s.add_dependency 'garbage ~> 5'
     end
 
-    installer = Gem::Installer.new a_gem
+    installer = Gem::Installer.at a_gem
 
     e = assert_raises Gem::InstallError do
       installer.ensure_loadable_spec
@@ -275,7 +275,7 @@ gem 'other', version
     end
 
     policy = Gem::Security::HighSecurity
-    installer = Gem::Installer.new a_gem, :security_policy => policy
+    installer = Gem::Installer.at a_gem, :security_policy => policy
 
     assert_raises Gem::Security::Exception do
       installer.ensure_loadable_spec
@@ -322,7 +322,7 @@ gem 'other', version
       :install_dir => "/non/existent"
     }
 
-    inst = Gem::Installer.new '', options
+    inst = Gem::Installer.at '', options
 
     Gem::Installer.path_warning = false
 
@@ -575,8 +575,8 @@ gem 'other', version
     util_make_exec
     one = @spec.dup
     one.version = 1
+    @installer = Gem::Installer.for_spec spec
     @installer.gem_dir = util_gem_dir one
-    @installer.spec = spec
 
     @installer.generate_bin
 
@@ -672,14 +672,14 @@ gem 'other', version
     util_build_gem spec
     FileUtils.mv spec.cache_file, @tempdir
 
-    installer = Gem::Installer.new gem
+    installer = Gem::Installer.at gem
 
     assert_equal File.join(@gemhome, 'gems', spec.full_name), installer.gem_dir
     assert_equal File.join(@gemhome, 'bin'), installer.bin_dir
   end
 
   def test_initialize_user_install
-    installer = Gem::Installer.new @gem, :user_install => true
+    installer = Gem::Installer.at @gem, :user_install => true
 
     assert_equal File.join(Gem.user_dir, 'gems', @spec.full_name),
                  installer.gem_dir
@@ -688,7 +688,7 @@ gem 'other', version
 
   def test_initialize_user_install_bin_dir
     installer =
-      Gem::Installer.new @gem, :user_install => true, :bin_dir => @tempdir
+      Gem::Installer.at @gem, :user_install => true, :bin_dir => @tempdir
 
     assert_equal File.join(Gem.user_dir, 'gems', @spec.full_name),
                  installer.gem_dir
@@ -870,7 +870,7 @@ gem 'other', version
         Gem::Package.build @spec
       end
     end
-    @installer = Gem::Installer.new @gem
+    @installer = Gem::Installer.at @gem
     build_rake_in do
       use_ui @ui do
         assert_equal @spec, @installer.install
@@ -884,7 +884,7 @@ gem 'other', version
 
   def test_install_force
     use_ui @ui do
-      installer = Gem::Installer.new old_ruby_required, :force => true
+      installer = Gem::Installer.at old_ruby_required, :force => true
       installer.install
     end
 
@@ -993,7 +993,7 @@ gem 'other', version
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      @installer = Gem::Installer.new path
+      @installer = Gem::Installer.at path
       @installer.install
     end
 
@@ -1016,7 +1016,7 @@ gem 'other', version
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.new path, :install_dir => gemhome2
+      installer = Gem::Installer.at path, :install_dir => gemhome2
       installer.install
     end
 
@@ -1056,7 +1056,7 @@ gem 'other', version
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      @installer = Gem::Installer.new path
+      @installer = Gem::Installer.at path
       @installer.install
     end
     assert_path_exists File.join @spec.gem_dir, rb
@@ -1097,7 +1097,7 @@ gem 'other', version
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      @installer = Gem::Installer.new path
+      @installer = Gem::Installer.at path
       @installer.install
     end
     assert_path_exists so
@@ -1175,7 +1175,7 @@ gem 'other', version
     # that it work everything out on it's own.
     Gem::Specification.reset
 
-    installer = Gem::Installer.new gem, :install_dir => gemhome2
+    installer = Gem::Installer.at gem, :install_dir => gemhome2
 
     build_rake_in do
       use_ui @ui do
@@ -1186,7 +1186,7 @@ gem 'other', version
 
   def test_pre_install_checks_ruby_version
     use_ui @ui do
-      installer = Gem::Installer.new old_ruby_required
+      installer = Gem::Installer.at old_ruby_required
       e = assert_raises Gem::InstallError do
         installer.pre_install_checks
       end
@@ -1205,7 +1205,7 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.new gem
+      @installer = Gem::Installer.at gem
       e = assert_raises Gem::InstallError do
         @installer.pre_install_checks
       end
@@ -1231,7 +1231,7 @@ gem 'other', version
   def test_process_options_build_root
     build_root = File.join @tempdir, 'build_root'
 
-    @installer = Gem::Installer.new @gem, :build_root => build_root
+    @installer = Gem::Installer.at @gem, :build_root => build_root
 
     assert_equal Pathname(build_root), @installer.build_root
     assert_equal File.join(build_root, @gemhome, 'bin'), @installer.bin_dir
@@ -1406,7 +1406,7 @@ gem 'other', version
   end
 
   def test_write_build_info_file_install_dir
-    installer = Gem::Installer.new @gem, :install_dir => "#{@gemhome}2"
+    installer = Gem::Installer.at @gem, :install_dir => "#{@gemhome}2"
 
     installer.build_args = %w[
       --with-libyaml-dir /usr/local/Cellar/libyaml/0.1.4
@@ -1426,8 +1426,7 @@ gem 'other', version
     FileUtils.mv cache_file, gem
     refute_path_exists cache_file
 
-    installer = Gem::Installer.new gem
-    installer.spec = @spec
+    installer = Gem::Installer.at gem
     installer.gem_home = @gemhome
 
     installer.write_cache_file
@@ -1439,7 +1438,7 @@ gem 'other', version
     FileUtils.rm @spec.spec_file
     refute_path_exists @spec.spec_file
 
-    @installer.spec = @spec
+    @installer = Gem::Installer.for_spec @spec
     @installer.gem_home = @gemhome
 
     @installer.write_spec
@@ -1459,7 +1458,7 @@ gem 'other', version
 
     @spec.files = %w[a.rb b.rb c.rb]
 
-    @installer.spec = @spec
+    @installer = Gem::Installer.for_spec @spec
     @installer.gem_home = @gemhome
 
     @installer.write_spec
@@ -1474,6 +1473,13 @@ gem 'other', version
     assert_match %r!/gemhome/gems/a-2$!, @installer.dir
   end
 
+  def test_default_gem_loaded_from
+    spec = util_spec 'a'
+    installer = Gem::Installer.for_spec spec, :install_as_default => true
+    installer.install
+    assert_predicate spec, :default_gem?
+  end
+
   def test_default_gem
     FileUtils.rm_f File.join(Gem.dir, 'specifications')
 
@@ -1490,10 +1496,10 @@ gem 'other', version
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
 
-    assert File.directory? File.join(Gem.dir, 'specifications')
-    assert File.directory? File.join(Gem.dir, 'specifications', 'default')
+    assert File.directory? File.join(Gem.default_dir, 'specifications')
+    assert File.directory? File.join(Gem.default_dir, 'specifications', 'default')
 
-    default_spec = eval File.read File.join(Gem.dir, 'specifications', 'default', 'a-2.gemspec')
+    default_spec = eval File.read File.join(Gem.default_dir, 'specifications', 'default', 'a-2.gemspec')
     assert_equal Gem::Version.new("2"), default_spec.version
     assert_equal ['bin/executable'], default_spec.files
   end

data/test/rubygems/test_gem_package.rb

@@ -132,6 +132,37 @@ class TestGemPackage < Gem::Package::TarTestCase
     assert_equal %w[lib/code.rb], files
   end
 
+  def test_add_files_symlink
+    skip 'symlink not supported' if Gem.win_platform?
+
+    spec = Gem::Specification.new
+    spec.files = %w[lib/code.rb lib/code_sym.rb]
+
+    FileUtils.mkdir_p 'lib'
+    open 'lib/code.rb',  'w' do |io| io.write '# lib/code.rb'  end
+    File.symlink('lib/code.rb', 'lib/code_sym.rb')
+
+    package = Gem::Package.new 'bogus.gem'
+    package.spec = spec
+
+    tar = util_tar do |tar_io|
+      package.add_files tar_io
+    end
+
+    tar.rewind
+
+    files, symlinks = [], []
+
+    Gem::Package::TarReader.new tar do |tar_io|
+      tar_io.each_entry do |entry|
+        (entry.symlink? ? symlinks : files) << entry.full_name
+      end
+    end
+
+    assert_equal %w[lib/code.rb], files
+    assert_equal %w[lib/code_sym.rb], symlinks
+  end
+
   def test_build
     spec = Gem::Specification.new 'build', '1'
     spec.summary = 'build'
@@ -396,6 +427,21 @@ class TestGemPackage < Gem::Package::TarTestCase
                  "#{@destination} is not allowed", e.message)
   end
 
+  def test_extract_tar_gz_symlink_absolute
+    package = Gem::Package.new @gem
+
+    tgz_io = util_tar_gz do |tar|
+      tar.add_symlink 'code.rb', '/absolute.rb', 0644
+    end
+
+    e = assert_raises Gem::Package::PathError do
+      package.extract_tar_gz tgz_io, @destination
+    end
+
+    assert_equal("installing into parent path /absolute.rb of " +
+                 "#{@destination} is not allowed", e.message)
+  end
+
   def test_extract_tar_gz_directory
     package = Gem::Package.new @gem
 
@@ -821,4 +867,3 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
 end
-

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -92,6 +92,14 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     close_util_entry(dir_ent) if dir_ent
   end
 
+  def test_symlink_eh
+    assert_equal false, @entry.symlink?
+    symlink_ent = util_symlink_entry
+    assert_equal true, symlink_ent.symlink?
+  ensure
+    close_util_entry(symlink_ent) if symlink_ent
+  end
+
   def test_file_eh
     assert_equal true, @entry.file?
     dir_ent = util_dir_entry
@@ -131,4 +139,3 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   end
 
 end
-

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -30,6 +30,16 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     assert_equal 1024, @io.pos
   end
 
+  def test_add_symlink
+    Time.stub :now, Time.at(1458518157) do
+      @tar_writer.add_symlink 'x', 'y', 0644
+
+      assert_headers_equal(tar_symlink_header('x', '', 0644, Time.now, 'y'),
+                         @io.string[0, 512])
+    end
+    assert_equal 512, @io.pos
+  end
+
   def test_add_file_digest
     digest_algorithms = Digest::SHA1, Digest::SHA512
 
@@ -251,4 +261,3 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
 end
-

data/test/rubygems/test_gem_package_task.rb

@@ -1,6 +1,9 @@
 require 'rubygems/test_case'
 require 'rubygems'
-require 'rubygems/package_task'
+begin
+  require 'rubygems/package_task'
+rescue LoadError
+end
 
 class TestGemPackageTask < Gem::TestCase
 
@@ -76,5 +79,5 @@ class TestGemPackageTask < Gem::TestCase
     assert_equal 'pkg/nokogiri-1.5.0-java', pkg.package_dir_path
   end
 
-end
+end if defined?(Rake::PackageTask)
 

data/test/rubygems/test_gem_platform.rb

@@ -190,6 +190,17 @@ class TestGemPlatform < Gem::TestCase
     assert((x86_darwin8 === Gem::Platform.local), 'universal =~ x86')
   end
 
+  def test_nil_cpu_arch_is_treated_as_universal
+    with_nil_arch = Gem::Platform.new [nil, 'mingw32']
+    with_uni_arch = Gem::Platform.new ['universal', 'mingw32']
+    with_x86_arch = Gem::Platform.new ['x86', 'mingw32']
+
+    assert((with_nil_arch === with_uni_arch), 'nil =~ universal')
+    assert((with_uni_arch === with_nil_arch), 'universal =~ nil')
+    assert((with_nil_arch === with_x86_arch), 'nil =~ x86')
+    assert((with_x86_arch === with_nil_arch), 'x86 =~ nil')
+  end
+
   def test_equals3_cpu_arm
     arm   = Gem::Platform.new 'arm-linux'
     armv5 = Gem::Platform.new 'armv5-linux'

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -77,8 +77,34 @@ gems:
 
   DIR = File.expand_path(File.dirname(__FILE__))
 
+  # Generated via:
+  #   x = OpenSSL::PKey::DH.new(2048) # wait a while...
+  #   x.to_s => pem
+  #   x.priv_key.to_s => hex for OpenSSL::BN.new
+  TEST_KEY_DH2048 =  OpenSSL::PKey::DH.new <<-_end_of_pem_
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA3Ze2EHSfYkZLUn557torAmjBgPsqzbodaRaGZtgK1gEU+9nNJaFV
+G1JKhmGUiEDyIW7idsBpe4sX/Wqjnp48Lr8IeI/SlEzLdoGpf05iRYXC8Cm9o8aM
+cfmVgoSEAo9YLBpzoji2jHkO7Q5IPt4zxbTdlmmGFLc/GO9q7LGHhC+rcMcNTGsM
+49AnILNn49pq4Y72jSwdmvq4psHZwwFBbPwLdw6bLUDDCN90jfqvYt18muwUxDiN
+NP0fuvVAIB158VnQ0liHSwcl6+9vE1mL0Jo/qEXQxl0+UdKDjaGfTsn6HIrwTnmJ
+PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
+-----END DH PARAMETERS-----
+    _end_of_pem_
+
+  TEST_KEY_DH2048.priv_key = OpenSSL::BN.new("108911488509734781344423639" \
+     "5585749502236089033416160524030987005037540379474123441273555416835" \
+     "4725688238369352738266590757370603937618499698665047757588998555345" \
+     "3446251978586372525530219375408331096098220027413238477359960428372" \
+     "0195464393332338164504352015535549496585792320286513563739305843396" \
+     "9294344974028713065472959376197728193162272314514335882399554394661" \
+     "5306385003430991221886779612878793446851681835397455333989268503748" \
+     "7862488679178398716189205737442996155432191656080664090596502674943" \
+     "7902481557157485795980326766117882761941455140582265347052939604724" \
+     "964857770053363840471912215799994973597613931991572884", 16)
+
   def setup
-    @proxies = %w[http_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
+    @proxies = %w[https_proxy http_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
     @old_proxies = @proxies.map {|k| ENV[k] }
     @proxies.each {|k| ENV[k] = nil }
 
@@ -226,6 +252,31 @@ gems:
     dns.verify
   end
 
+  def test_api_endpoint_timeout_warning
+    uri = URI.parse "http://gems.example.com/foo"
+
+    dns = MiniTest::Mock.new
+    def dns.getresource arg, *rest
+      raise Resolv::ResolvError.new('timeout!')
+    end
+
+    fetch = Gem::RemoteFetcher.new nil, dns
+    begin
+      old_verbose, Gem.configuration.verbose = Gem.configuration.verbose, 1
+      endpoint = use_ui @ui do
+        fetch.api_endpoint(uri)
+      end
+    ensure
+      Gem.configuration.verbose = old_verbose
+    end
+
+    assert_equal uri, endpoint
+
+    assert_equal "Getting SRV record failed: timeout!\n", @ui.output
+
+    dns.verify
+  end
+
   def test_cache_update_path
     uri = URI 'http://example/file'
     path = File.join @tempdir, 'file'
@@ -647,6 +698,14 @@ gems:
     assert_equal "too many redirects (#{url})", e.message
   end
 
+  def test_fetch_http_with_additional_headers
+    ENV["http_proxy"] = @proxy_uri
+    ENV["no_proxy"] = URI::parse(@server_uri).host
+    fetcher = Gem::RemoteFetcher.new nil, nil, {"X-Captain" => "murphy"}
+    @fetcher = fetcher
+    assert_equal "murphy", fetcher.fetch_path(@server_uri)
+  end
+
   def test_fetch_s3
     fetcher = Gem::RemoteFetcher.new nil
     @fetcher = fetcher
@@ -898,7 +957,7 @@ gems:
       server.mount_proc("/insecure_redirect") { |req, res|
         res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, req.query['to'])
       }
-      server.ssl_context.tmp_dh_callback = proc { OpenSSL::PKey::DH.new 128 }
+      server.ssl_context.tmp_dh_callback = proc { TEST_KEY_DH2048 }
       t = Thread.new do
         begin
           server.start
@@ -933,7 +992,9 @@ gems:
         )
       s.mount_proc("/kill") { |req, res| s.shutdown }
       s.mount_proc("/yaml") { |req, res|
-        if @enable_yaml
+        if req["X-Captain"]
+          res.body = req["X-Captain"]
+        elsif @enable_yaml
           res.body = data
           res['Content-Type'] = 'text/plain'
           res['content-length'] = data.size