rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_path_support.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'fileutils'
 
 class TestGemPathSupport < Gem::TestCase
+
   def setup
     super
 
@@ -39,17 +40,19 @@ class TestGemPathSupport < Gem::TestCase
   end
 
   def test_initialize_path
-    ps = Gem::PathSupport.new ENV.to_hash.merge("GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
+    Gem.stub(:path_separator, File::PATH_SEPARATOR) do
+      ps = Gem::PathSupport.new ENV.to_hash.merge("GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
 
-    assert_equal ENV["GEM_HOME"], ps.home
+      assert_equal ENV["GEM_HOME"], ps.home
 
-    expected = [
-      File.join(@tempdir, 'foo'),
-      File.join(@tempdir, 'bar'),
-      ENV["GEM_HOME"],
-    ]
+      expected = [
+        File.join(@tempdir, 'foo'),
+        File.join(@tempdir, 'bar'),
+        ENV["GEM_HOME"],
+      ]
 
-    assert_equal expected, ps.path
+      assert_equal expected, ps.path
+    end
   end
 
   def test_initialize_regexp_path_separator
@@ -89,13 +92,15 @@ class TestGemPathSupport < Gem::TestCase
   end
 
   def test_initialize_home_path
-    ps = Gem::PathSupport.new("GEM_HOME" => "#{@tempdir}/foo",
-                              "GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
+    Gem.stub(:path_separator, File::PATH_SEPARATOR) do
+      ps = Gem::PathSupport.new("GEM_HOME" => "#{@tempdir}/foo",
+                                "GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
 
-    assert_equal File.join(@tempdir, "foo"), ps.home
+      assert_equal File.join(@tempdir, "foo"), ps.home
 
-    expected = [File.join(@tempdir, 'foo'), File.join(@tempdir, 'bar')]
-    assert_equal expected, ps.path
+      expected = [File.join(@tempdir, 'foo'), File.join(@tempdir, 'bar')]
+      assert_equal expected, ps.path
+    end
   end
 
   def util_path
@@ -135,4 +140,5 @@ class TestGemPathSupport < Gem::TestCase
     assert_equal dir, ps.home
     assert_equal [dir, not_existing], ps.path
   end
+
 end

data/test/rubygems/test_gem_platform.rb

@@ -76,6 +76,7 @@ class TestGemPlatform < Gem::TestCase
       'i386-solaris2.8'        => ['x86',       'solaris',   '2.8'],
       'mswin32'                => ['x86',       'mswin32',   nil],
       'x86_64-linux'           => ['x86_64',    'linux',     nil],
+      'x86_64-linux-musl'      => ['x86_64',    'linux',     'musl'],
       'x86_64-openbsd3.9'      => ['x86_64',    'openbsd',   '3.9'],
       'x86_64-openbsd4.0'      => ['x86_64',    'openbsd',   '4.0'],
       'x86_64-openbsd'         => ['x86_64',    'openbsd',   nil],
@@ -211,13 +212,13 @@ class TestGemPlatform < Gem::TestCase
     assert((arm   === Gem::Platform.local), 'arm   === armv5')
     assert((armv5 === Gem::Platform.local), 'armv5 === armv5')
     refute((armv7 === Gem::Platform.local), 'armv7 === armv5')
-    refute((Gem::Platform.local ===   arm), 'armv5 === arm')
+    refute((Gem::Platform.local === arm), 'armv5 === arm')
 
     util_set_arch 'armv7-linux'
     assert((arm   === Gem::Platform.local), 'arm   === armv7')
     refute((armv5 === Gem::Platform.local), 'armv5 === armv7')
     assert((armv7 === Gem::Platform.local), 'armv7 === armv7')
-    refute((Gem::Platform.local ===   arm), 'armv7 === arm')
+    refute((Gem::Platform.local === arm), 'armv7 === arm')
   end
 
   def test_equals3_version
@@ -304,4 +305,5 @@ class TestGemPlatform < Gem::TestCase
   def refute_local_match(name)
     refute_match Gem::Platform.local, name
   end
+
 end

data/test/rubygems/test_gem_rdoc.rb

@@ -4,6 +4,7 @@ require 'rubygems/test_case'
 require 'rubygems/rdoc'
 
 class TestGemRDoc < Gem::TestCase
+
   Gem::RDoc.load_rdoc
 
   def setup

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -53,7 +53,6 @@ gems:
     homepage: http://rake.rubyforge.org
     description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
     autorequire:
-    default_executable: rake
     bindir: bin
     has_rdoc: true
     required_ruby_version: !ruby/object:Gem::Version::Requirement
@@ -84,7 +83,7 @@ gems:
   # Generated via:
   #   x = OpenSSL::PKey::DH.new(2048) # wait a while...
   #   x.to_s => pem
-  TEST_KEY_DH2048 =  OpenSSL::PKey::DH.new <<-_end_of_pem_
+  TEST_KEY_DH2048 = OpenSSL::PKey::DH.new <<-_end_of_pem_
 -----BEGIN DH PARAMETERS-----
 MIIBCAKCAQEA3Ze2EHSfYkZLUn557torAmjBgPsqzbodaRaGZtgK1gEU+9nNJaFV
 G1JKhmGUiEDyIW7idsBpe4sX/Wqjnp48Lr8IeI/SlEzLdoGpf05iRYXC8Cm9o8aM
@@ -117,7 +116,10 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     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
+    @a1, @a1_gem = util_gem 'a', '1' do |s|
+      s.executables << 'a_bin'
+    end
+
     @a1.loaded_from = File.join(@gemhome, 'specifications', @a1.full_name)
 
     Gem::RemoteFetcher.fetcher = nil
@@ -156,7 +158,9 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     @fetcher = fetcher
 
     e = assert_raises ArgumentError do
-      fetcher.fetch_size 'gems.example.com/yaml'
+      Gem::Deprecate.skip_during do
+        fetcher.fetch_size 'gems.example.com/yaml'
+      end
     end
 
     assert_equal 'uri scheme is invalid: nil', e.message
@@ -171,7 +175,9 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     uri = 'http://gems.example.com/yaml'
     e = assert_raises Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_size uri
+      Gem::Deprecate.skip_during do
+        fetcher.fetch_size uri
+      end
     end
 
     assert_equal "SocketError: oops (#{uri})", e.message
@@ -180,7 +186,9 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   def test_no_proxy
     use_ui @stub_ui do
       assert_data_from_server @fetcher.fetch_path(@server_uri)
-      assert_equal SERVER_DATA.size, @fetcher.fetch_size(@server_uri)
+      Gem::Deprecate.skip_during do
+        assert_equal SERVER_DATA.size, @fetcher.fetch_size(@server_uri)
+      end
     end
   end
 
@@ -910,10 +918,11 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
   def test_ssl_client_cert_auth_connection
     skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    skip 'openssl in jruby fails' if java_platform?
 
     ssl_server = self.class.start_ssl_server({
       :SSLVerifyClient =>
-        OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT})
+        OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT})
 
     temp_ca_cert = File.join(DIR, 'ca_cert.pem')
     temp_client_cert = File.join(DIR, 'client.pem')
@@ -930,7 +939,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
     ssl_server = self.class.start_ssl_server({
       :SSLVerifyClient =>
-        OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT})
+        OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT})
 
     temp_ca_cert = File.join(DIR, 'ca_cert.pem')
     temp_client_cert = File.join(DIR, 'invalid_client.pem')
@@ -1022,11 +1031,14 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   end
 
   class NilLog < WEBrick::Log
+
     def log(level, data) #Do nothing
     end
+
   end
 
   class << self
+
     attr_reader :normal_server, :proxy_server
     attr_accessor :enable_zip, :enable_yaml
 
@@ -1086,12 +1098,12 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
         :SSLVerifyClient => nil,
         :SSLCertName => nil
       }.merge(config))
-      server.mount_proc("/yaml") { |req, res|
+      server.mount_proc("/yaml") do |req, res|
         res.body = "--- true\n"
-      }
-      server.mount_proc("/insecure_redirect") { |req, res|
+      end
+      server.mount_proc("/insecure_redirect") do |req, res|
         res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, req.query['to'])
-      }
+      end
       server.ssl_context.tmp_dh_callback = proc { TEST_KEY_DH2048 }
       t = Thread.new do
         begin
@@ -1126,7 +1138,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
         :AccessLog       => null_logger
       )
       s.mount_proc("/kill") { |req, res| s.shutdown }
-      s.mount_proc("/yaml") { |req, res|
+      s.mount_proc("/yaml") do |req, res|
         if req["X-Captain"]
           res.body = req["X-Captain"]
         elsif @enable_yaml
@@ -1138,8 +1150,8 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
           res.body = "<h1>NOT FOUND</h1>"
           res['Content-Type'] = 'text/html'
         end
-      }
-      s.mount_proc("/yaml.Z") { |req, res|
+      end
+      s.mount_proc("/yaml.Z") do |req, res|
         if @enable_zip
           res.body = Zlib::Deflate.deflate(data)
           res['Content-Type'] = 'text/plain'
@@ -1148,7 +1160,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
           res.body = "<h1>NOT FOUND</h1>"
           res['Content-Type'] = 'text/html'
         end
-      }
+      end
       th = Thread.new do
         begin
           s.start
@@ -1169,6 +1181,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     def key(filename)
       OpenSSL::PKey::RSA.new(File.read(File.join(DIR, filename)))
     end
+
   end
 
 end if defined?(OpenSSL::SSL)

data/test/rubygems/test_gem_request.rb

@@ -79,14 +79,25 @@ class TestGemRequest < Gem::TestCase
     assert_equal URI(@proxy_uri), proxy
   end
 
+  def test_proxy_ENV
+    ENV['http_proxy'] = "http://proxy"
+    ENV['https_proxy'] = ""
+
+    request = make_request URI('https://example'), nil, nil, nil
+
+    proxy = request.proxy_uri
+
+    assert_nil proxy
+  end
+
   def test_configure_connection_for_https
     connection = Net::HTTP.new 'localhost', 443
 
-    request = Class.new(Gem::Request) {
+    request = Class.new(Gem::Request) do
       def self.get_cert_files
         [TestGemRequest::PUBLIC_CERT_FILE]
       end
-    }.create_with_proxy URI('https://example'), nil, nil, nil
+    end.create_with_proxy URI('https://example'), nil, nil, nil
 
     Gem::Request.configure_connection_for_https connection, request.cert_files
 
@@ -101,11 +112,11 @@ class TestGemRequest < Gem::TestCase
 
     connection = Net::HTTP.new 'localhost', 443
 
-    request = Class.new(Gem::Request) {
+    request = Class.new(Gem::Request) do
       def self.get_cert_files
         [TestGemRequest::PUBLIC_CERT_FILE]
       end
-    }.create_with_proxy URI('https://example'), nil, nil, nil
+    end.create_with_proxy URI('https://example'), nil, nil, nil
 
     Gem::Request.configure_connection_for_https connection, request.cert_files
 
@@ -317,6 +328,7 @@ class TestGemRequest < Gem::TestCase
   end
 
   def test_verify_certificate
+    skip if Gem.java_platform?
     store = OpenSSL::X509::Store.new
     context = OpenSSL::X509::StoreContext.new store
     context.error = OpenSSL::X509::V_ERR_OUT_OF_MEM
@@ -330,6 +342,7 @@ class TestGemRequest < Gem::TestCase
   end
 
   def test_verify_certificate_extra_message
+    skip if Gem.java_platform?
     store = OpenSSL::X509::Store.new
     context = OpenSSL::X509::StoreContext.new store
     context.error = OpenSSL::X509::V_ERR_INVALID_CA
@@ -475,6 +488,7 @@ ERROR:  Certificate  is an invalid CA certificate
   end
 
   class Conn
+
     attr_accessor :payload
 
     def new(*args); self; end
@@ -493,6 +507,7 @@ ERROR:  Certificate  is an invalid CA certificate
       self.payload = req
       @response
     end
+
   end
 
 end if defined?(OpenSSL::SSL)

data/test/rubygems/test_gem_request_connection_pools.rb

@@ -4,12 +4,15 @@ require 'rubygems/request'
 require 'timeout'
 
 class TestGemRequestConnectionPool < Gem::TestCase
+
   class FakeHttp
+
     def initialize(*args)
     end
 
     def start
     end
+
   end
 
   def setup
@@ -139,12 +142,13 @@ class TestGemRequestConnectionPool < Gem::TestCase
 
     pool.checkout
 
-    Thread.new {
+    Thread.new do
       assert_raises(Timeout::Error) do
         Timeout.timeout(1) do
           pool.checkout
         end
       end
-    }.join
+    end.join
   end
+
 end

data/test/rubygems/test_gem_request_set.rb

@@ -3,6 +3,7 @@ require 'rubygems/test_case'
 require 'rubygems/request_set'
 
 class TestGemRequestSet < Gem::TestCase
+
   def setup
     super
 
@@ -311,8 +312,14 @@ ruby "0"
   end
 
   def test_resolve_development_shallow
-    a = util_spec 'a', 1 do |s| s.add_development_dependency 'b' end
-    b = util_spec 'b', 1 do |s| s.add_development_dependency 'c' end
+    a = util_spec 'a', 1 do |s|
+      s.add_development_dependency 'b'
+    end
+
+    b = util_spec 'b', 1 do |s|
+      s.add_development_dependency 'c'
+    end
+
     c = util_spec 'c', 1
 
     a_spec = Gem::Resolver::SpecSpecification.new nil, a
@@ -528,8 +535,14 @@ ruby "0"
   end
 
   def test_sorted_requests_development_shallow
-    a = util_spec 'a', 1 do |s| s.add_development_dependency 'b' end
-    b = util_spec 'b', 1 do |s| s.add_development_dependency 'c' end
+    a = util_spec 'a', 1 do |s|
+      s.add_development_dependency 'b'
+    end
+
+    b = util_spec 'b', 1 do |s|
+      s.add_development_dependency 'c'
+    end
+
     c = util_spec 'c', 1
 
     rs = Gem::RequestSet.new
@@ -547,8 +560,14 @@ ruby "0"
   end
 
   def test_tsort_each_child_development
-    a = util_spec 'a', 1 do |s| s.add_development_dependency 'b' end
-    b = util_spec 'b', 1 do |s| s.add_development_dependency 'c' end
+    a = util_spec 'a', 1 do |s|
+      s.add_development_dependency 'b'
+    end
+
+    b = util_spec 'b', 1 do |s|
+      s.add_development_dependency 'c'
+    end
+
     c = util_spec 'c', 1
 
     rs = Gem::RequestSet.new
@@ -570,8 +589,14 @@ ruby "0"
   end
 
   def test_tsort_each_child_development_shallow
-    a = util_spec 'a', 1 do |s| s.add_development_dependency 'b' end
-    b = util_spec 'b', 1 do |s| s.add_development_dependency 'c' end
+    a = util_spec 'a', 1 do |s|
+      s.add_development_dependency 'b'
+    end
+
+    b = util_spec 'b', 1 do |s|
+      s.add_development_dependency 'c'
+    end
+
     c = util_spec 'c', 1
 
     rs = Gem::RequestSet.new

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -846,4 +846,4 @@ end
     assert_equal engine_version, RUBY_ENGINE_VERSION if engine
   end
 
-end
+end unless Gem.java_platform?

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -466,4 +466,5 @@ DEPENDENCIES
 
     assert_equal 'hello', File.read(gem_deps_lock_file)
   end
+
 end

data/test/rubygems/test_gem_request_set_lockfile_parser.rb

@@ -6,6 +6,7 @@ require 'rubygems/request_set/lockfile/tokenizer'
 require 'rubygems/request_set/lockfile/parser'
 
 class TestGemRequestSetLockfileParser < Gem::TestCase
+
   def setup
     super
     @gem_deps_file = 'gem.deps.rb'
@@ -66,7 +67,6 @@ class TestGemRequestSetLockfileParser < Gem::TestCase
     assert_equal File.expand_path("#{@gem_deps_file}.lock"), e.path
   end
 
-
   def test_parse
     write_lockfile <<-LOCKFILE.strip
 GEM
@@ -541,4 +541,5 @@ DEPENDENCIES
     parser = tokenizer.make_parser set, platforms
     parser.parse
   end
+
 end