rubygems-update 2.7.11 → 3.0.0

data/test/rubygems/test_gem_request.rb

@@ -4,7 +4,7 @@ require 'rubygems/request'
 require 'ostruct'
 require 'base64'
 
-unless defined?(OpenSSL::SSL) then
+unless defined?(OpenSSL::SSL)
   warn 'Skipping Gem::Request tests.  openssl not found.'
 end
 
@@ -17,7 +17,7 @@ class TestGemRequest < Gem::TestCase
   PUBLIC_CERT_FILE = cert_path 'public'
   SSL_CERT         = load_cert 'ssl'
 
-  def make_request uri, request_class, last_modified, proxy
+  def make_request(uri, request_class, last_modified, proxy)
     Gem::Request.create_with_proxy uri, request_class, last_modified, proxy
   end
 
@@ -442,7 +442,7 @@ ERROR:  Certificate  is an invalid CA certificate
     message =
       Gem::Request.verify_certificate_message error_number, EXPIRED_CERT
 
-    assert_equal "You must add #{EXPIRED_CERT.issuer} to your local trusted store",
+    assert_equal "Cannot verify certificate issued by #{EXPIRED_CERT.issuer}",
                  message
   end
 
@@ -465,7 +465,7 @@ ERROR:  Certificate  is an invalid CA certificate
     @orig_RUBY_REVISION   = RUBY_REVISION if defined? RUBY_REVISION
   end
 
-  def util_stub_net_http hash
+  def util_stub_net_http(hash)
     old_client = Gem::Request::ConnectionPools.client
     conn = Conn.new OpenStruct.new(hash)
     Gem::Request::ConnectionPools.client = conn
@@ -477,7 +477,7 @@ ERROR:  Certificate  is an invalid CA certificate
   class Conn
     attr_accessor :payload
 
-    def new *args; self; end
+    def new(*args); self; end
     def use_ssl=(bool); end
     def verify_callback=(setting); end
     def verify_mode=(setting); end

data/test/rubygems/test_gem_request_connection_pools.rb

@@ -5,7 +5,7 @@ require 'timeout'
 
 class TestGemRequestConnectionPool < Gem::TestCase
   class FakeHttp
-    def initialize *args
+    def initialize(*args)
     end
 
     def start
@@ -25,6 +25,28 @@ class TestGemRequestConnectionPool < Gem::TestCase
     super
   end
 
+  def test_to_proxy_substring
+    pools = Gem::Request::ConnectionPools.new nil, []
+
+    env_no_proxy = %w[
+      ems.example
+    ]
+
+    no_proxy = pools.send :no_proxy?, 'rubygems.example', env_no_proxy
+
+    refute no_proxy, 'mismatch'
+  end
+
+  def test_to_proxy_empty_string
+    pools = Gem::Request::ConnectionPools.new nil, []
+
+    env_no_proxy = [""]
+
+    no_proxy = pools.send :no_proxy?, 'ems.example', env_no_proxy
+
+    refute no_proxy, 'mismatch'
+  end
+
   def test_checkout_same_connection
     uri = URI.parse('http://example/some_endpoint')
 
@@ -86,8 +108,7 @@ class TestGemRequestConnectionPool < Gem::TestCase
 
     net_http_args = pools.send :net_http_args, URI('http://[::1]'), nil
 
-    expected_host = RUBY_VERSION >= "1.9.3" ? "::1" : "[::1]"
-    assert_equal [expected_host, 80], net_http_args
+    assert_equal ["::1", 80], net_http_args
   end
 
   def test_net_http_args_proxy

data/test/rubygems/test_gem_request_set.rb

@@ -218,7 +218,7 @@ ruby "0"
       assert_kind_of Gem::RequestSet::GemDependencyAPI, gem_deps
       io
     end
-    tf.close! if tf.respond_to? :close!
+    tf.close!
 
     assert_equal [dep('a')], rs.dependencies
 
@@ -239,7 +239,7 @@ ruby "0"
       assert_kind_of Gem::RequestSet::GemDependencyAPI, gem_deps
       io
     end
-    tf.close! if tf.respond_to? :close!
+    tf.close!
 
     assert_equal [dep('a')], rs.dependencies
   end
@@ -254,7 +254,7 @@ ruby "0"
       rs.load_gemdeps io.path, [:test]
       io
     end
-    tf.close! if tf.respond_to? :close!
+    tf.close!
 
     assert_empty rs.dependencies
   end
@@ -346,7 +346,7 @@ ruby "0"
       rs.load_gemdeps io.path
       io
     end
-    tf.close! if tf.respond_to? :close!
+    tf.close!
 
     res = rs.resolve
     assert_equal 1, res.size
@@ -410,7 +410,7 @@ ruby "0"
       rs.load_gemdeps io.path
       io
     end
-    tf.close! if tf.respond_to? :close!
+    tf.close!
 
     res = rs.resolve
     assert_equal 2, res.size

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -19,7 +19,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     @gda.instance_variable_set :@vendor_set, @vendor_set
   end
 
-  def with_engine_version name, version
+  def with_engine_version(name, version)
     engine               = RUBY_ENGINE if Object.const_defined? :RUBY_ENGINE
     engine_version_const = "#{Gem.ruby_engine.upcase}_VERSION"
     engine_version       = Object.const_get engine_version_const
@@ -627,11 +627,7 @@ end
       assert_equal [dep('a'), dep('b')], @set.dependencies
       io
     end
-    tf.close! if tf.respond_to? :close!
-  end
-
-  def test_name_typo
-    assert_same @GDA, Gem::RequestSet::GemDepedencyAPI
+    tf.close!
   end
 
   def test_pin_gem_source
@@ -828,4 +824,3 @@ end
   end
 
 end
-

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -21,14 +21,13 @@ class TestGemRequestSetLockfile < Gem::TestCase
     @set.instance_variable_set :@vendor_set, @vendor_set
 
     @gem_deps_file = 'gem.deps.rb'
-
   end
 
   def lockfile
     Gem::RequestSet::Lockfile.build @set, @gem_deps_file
   end
 
-  def write_lockfile lockfile
+  def write_lockfile(lockfile)
     @lock_file = File.expand_path "#{@gem_deps_file}.lock"
 
     File.open @lock_file, 'w' do |io|

data/test/rubygems/test_gem_request_set_lockfile_parser.rb

@@ -248,13 +248,8 @@ DEPENDENCIES
 
     assert_equal %w[a-2], lockfile_set.specs.map { |s| s.full_name }
 
-    if [].respond_to? :flat_map
-      assert_equal %w[https://gems.example/ https://other.example/],
-                   lockfile_set.specs.flat_map { |s| s.sources.map{ |src| src.uri.to_s } }
-    else # FIXME: remove when 1.8 is dropped
-      assert_equal %w[https://gems.example/ https://other.example/],
-                   lockfile_set.specs.map { |s| s.sources.map{ |src| src.uri.to_s } }.flatten(1)
-    end
+    assert_equal %w[https://gems.example/ https://other.example/],
+                 lockfile_set.specs.flat_map { |s| s.sources.map{ |src| src.uri.to_s } }
   end
 
   def test_parse_GIT
@@ -535,13 +530,13 @@ DEPENDENCIES
     refute lockfile_set
   end
 
-  def write_lockfile lockfile
+  def write_lockfile(lockfile)
     File.open @lock_file, 'w' do |io|
       io.write lockfile
     end
   end
 
-  def parse_lockfile set, platforms
+  def parse_lockfile(set, platforms)
     tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file @lock_file
     parser = tokenizer.make_parser set, platforms
     parser.parse

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -294,7 +294,7 @@ GEM
     assert_equal :token, parser.get
   end
 
-  def write_lockfile lockfile
+  def write_lockfile(lockfile)
     File.open @lock_file, 'w' do |io|
       io.write lockfile
     end

data/test/rubygems/test_gem_requirement.rb

@@ -330,6 +330,20 @@ class TestGemRequirement < Gem::TestCase
     refute_satisfied_by "2.0",   "~> 1.4.4"
   end
 
+  def test_satisfied_by_explicitly_bounded
+    req = [">= 1.4.4", "< 1.5"]
+
+    assert_satisfied_by "1.4.5",     req
+    assert_satisfied_by "1.5.0.rc1", req
+    refute_satisfied_by "1.5.0",     req
+
+    req = [">= 1.4.4", "< 1.5.a"]
+
+    assert_satisfied_by "1.4.5",     req
+    refute_satisfied_by "1.5.0.rc1", req
+    refute_satisfied_by "1.5.0",     req
+  end
+
   def test_specific
     refute req('> 1') .specific?
     refute req('>= 1').specific?
@@ -373,26 +387,26 @@ class TestGemRequirement < Gem::TestCase
   # Assert that two requirements are equal. Handles Gem::Requirements,
   # strings, arrays, numbers, and versions.
 
-  def assert_requirement_equal expected, actual
+  def assert_requirement_equal(expected, actual)
     assert_equal req(expected), req(actual)
   end
 
   # Assert that +version+ satisfies +requirement+.
 
-  def assert_satisfied_by version, requirement
+  def assert_satisfied_by(version, requirement)
     assert req(requirement).satisfied_by?(v(version)),
       "#{requirement} is satisfied by #{version}"
   end
 
   # Refute the assumption that two requirements are equal.
 
-  def refute_requirement_equal unexpected, actual
+  def refute_requirement_equal(unexpected, actual)
     refute_equal req(unexpected), req(actual)
   end
 
   # Refute the assumption that +version+ satisfies +requirement+.
 
-  def refute_satisfied_by version, requirement
+  def refute_satisfied_by(version, requirement)
     refute req(requirement).satisfied_by?(v(version)),
       "#{requirement} is not satisfied by #{version}"
   end

data/test/rubygems/test_gem_resolver.rb

@@ -23,7 +23,7 @@ class TestGemResolver < Gem::TestCase
     StaticSet.new(specs)
   end
 
-  def assert_resolves_to expected, resolver
+  def assert_resolves_to(expected, resolver)
     actual = resolver.resolve
 
     exp = expected.sort_by { |s| s.full_name }
@@ -36,10 +36,6 @@ class TestGemResolver < Gem::TestCase
     flunk e.message
   end
 
-  def test_self_compatibility
-    assert_same Gem::Resolver, Gem::DependencyResolver
-  end
-
   def test_self_compose_sets_best_set
     best_set = @DR::BestSet.new
 
@@ -303,7 +299,7 @@ class TestGemResolver < Gem::TestCase
     a2_p1   = a3_p2 = nil
 
     spec_fetcher do |fetcher|
-              fetcher.spec 'a', 2
+      fetcher.spec 'a', 2
       a2_p1 = fetcher.spec 'a', 2 do |s| s.platform = Gem::Platform.local end
       a3_p2 = fetcher.spec 'a', 3 do |s| s.platform = unknown end
     end
@@ -666,12 +662,12 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_second_level_backout
-    b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/b.rb"
-    b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/b.rb"
-    c1 = new_spec "c", "1"
-    c2 = new_spec "c", "2"
-    d1 = new_spec "d", "1", { "c" => "< 2" },  "lib/d.rb"
-    d2 = new_spec "d", "2", { "c" => "< 2" },  "lib/d.rb"
+    b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/b.rb"
+    b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/b.rb"
+    c1 = util_spec "c", "1"
+    c2 = util_spec "c", "2"
+    d1 = util_spec "d", "1", { "c" => "< 2" },  "lib/d.rb"
+    d2 = util_spec "d", "2", { "c" => "< 2" },  "lib/d.rb"
 
     s = set(b1, b2, c1, c2, d1, d2)
 
@@ -688,11 +684,11 @@ class TestGemResolver < Gem::TestCase
     sourceB = Gem::Source.new 'http://example.com/b'
     sourceC = Gem::Source.new 'http://example.com/c'
 
-    spec_A_1 = new_spec 'some-dep', '0.0.1'
-    spec_A_2 = new_spec 'some-dep', '1.0.0'
-    spec_B_1 = new_spec 'some-dep', '0.0.1'
-    spec_B_2 = new_spec 'some-dep', '0.0.2'
-    spec_C_1 = new_spec 'some-dep', '0.1.0'
+    spec_A_1 = util_spec 'some-dep', '0.0.1'
+    spec_A_2 = util_spec 'some-dep', '1.0.0'
+    spec_B_1 = util_spec 'some-dep', '0.0.1'
+    spec_B_2 = util_spec 'some-dep', '0.0.2'
+    spec_C_1 = util_spec 'some-dep', '0.1.0'
 
     set = StaticSet.new [
       Gem::Resolver::SpecSpecification.new(nil, spec_B_1, sourceB),

data/test/rubygems/test_gem_resolver_activation_request.rb

@@ -71,4 +71,3 @@ class TestGemResolverActivationRequest < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -206,4 +206,3 @@ class TestGemResolverAPISet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -166,4 +166,3 @@ class TestGemResolverAPISpecification < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_best_set.rb

@@ -135,4 +135,3 @@ class TestGemResolverBestSet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -43,4 +43,3 @@ class TestGemResolverComposedSet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -85,4 +85,3 @@ class TestGemResolverConflict < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_dependency_request.rb

@@ -82,4 +82,3 @@ class TestGemResolverDependencyRequest < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_git_set.rb

@@ -187,4 +187,3 @@ class TestGemResolverGitSet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -111,4 +111,3 @@ class TestGemResolverGitSpecification < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_index_set.rb

@@ -87,4 +87,3 @@ class TestGemResolverIndexSet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_index_specification.rb

@@ -87,4 +87,3 @@ class TestGemResolverIndexSpecification < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_installed_specification.rb

@@ -47,4 +47,3 @@ class TestGemResolverInstalledSpecification < Gem::TestCase
 
 
 end
-

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -25,8 +25,8 @@ class TestGemResolverInstallerSet < Gem::TestCase
   end
 
   def test_add_always_install_errors
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
+    @stub_fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @stub_fetcher
 
     set = Gem::Resolver::InstallerSet.new :both
 
@@ -255,4 +255,3 @@ class TestGemResolverInstallerSet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_local_specification.rb

@@ -43,4 +43,3 @@ class TestGemResolverLocalSpecification < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_lock_set.rb

@@ -61,4 +61,3 @@ class TestGemResolverLockSet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -97,4 +97,3 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_requirement_list.rb

@@ -18,4 +18,3 @@ class TestGemResolverRequirementList < Gem::TestCase
   end
 
 end
-