rubygems-update 2.7.11 → 3.0.9

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,36 +19,29 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     @gda.instance_variable_set :@vendor_set, @vendor_set
   end
 
-  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
+  def with_engine_version(name, version)
+    engine = RUBY_ENGINE
+    engine_version = RUBY_ENGINE_VERSION
 
-    Object.send :remove_const, :RUBY_ENGINE         if engine
-    Object.send :remove_const, engine_version_const if name == 'ruby' and
-      Object.const_defined? engine_version_const
+    Object.send :remove_const, :RUBY_ENGINE
+    Object.send :remove_const, :RUBY_ENGINE_VERSION
 
-    new_engine_version_const = "#{name.upcase}_VERSION"
-    Object.const_set :RUBY_ENGINE,             name    if name
-    Object.const_set new_engine_version_const, version if version
+    Object.const_set :RUBY_ENGINE, name if name
+    Object.const_set :RUBY_ENGINE_VERSION, version if version
 
     Gem.instance_variable_set :@ruby_version, Gem::Version.new(version)
 
-    yield
+    begin
+      yield
+    ensure
+      Object.send :remove_const, :RUBY_ENGINE if name
+      Object.send :remove_const, :RUBY_ENGINE_VERSION if version
 
-  ensure
-    Object.send :remove_const, :RUBY_ENGINE             if name
-    Object.send :remove_const, new_engine_version_const if version
-
-    Object.send :remove_const, engine_version_const     if name == 'ruby' and
-      Object.const_defined? engine_version_const
-
-    Object.const_set :RUBY_ENGINE,         engine         if engine
-    Object.const_set engine_version_const, engine_version unless
-      Object.const_defined? engine_version_const
+      Object.const_set :RUBY_ENGINE, engine
+      Object.const_set :RUBY_ENGINE_VERSION, engine_version
 
-    Gem.send :remove_instance_variable, :@ruby_version if
-      Gem.instance_variables.include? :@ruby_version
+      Gem.send :remove_instance_variable, :@ruby_version
+    end
   end
 
   def test_gempspec_with_multiple_runtime_deps
@@ -283,6 +276,14 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
       refute_empty set.dependencies
     end
 
+    with_engine_version 'truffleruby', '2.0.0' do
+      set = Gem::RequestSet.new
+      gda = @GDA.new set, 'gem.deps.rb'
+      gda.gem 'a', :platforms => :ruby
+
+      refute_empty set.dependencies
+    end
+
     with_engine_version 'jruby', '1.7.6' do
       set = Gem::RequestSet.new
       gda = @GDA.new set, 'gem.deps.rb'
@@ -310,6 +311,12 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
       assert_empty @set.dependencies
     end
+
+    with_engine_version 'truffleruby', '1.2.3' do
+      @gda.gem 'a', :platforms => :mri
+
+      assert_empty @set.dependencies
+    end
   end
 
   def test_gem_platforms_maglev
@@ -332,6 +339,22 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     Gem.win_platform = win_platform
   end
 
+  def test_gem_platforms_truffleruby
+    with_engine_version 'truffleruby', '1.0.0' do
+      set = Gem::RequestSet.new
+      gda = @GDA.new set, 'gem.deps.rb'
+      gda.gem 'a', :platforms => :truffleruby
+
+      refute_empty set.dependencies
+
+      set = Gem::RequestSet.new
+      gda = @GDA.new set, 'gem.deps.rb'
+      gda.gem 'a', :platforms => :maglev
+
+      assert_empty set.dependencies
+    end
+  end
+
   def test_gem_platforms_multiple
     win_platform, Gem.win_platform = Gem.win_platform?, false
 
@@ -627,11 +650,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
@@ -656,20 +675,23 @@ end
   end
 
   def test_platform_mswin
-    util_set_arch 'i686-darwin8.10.1' do
-      @gda.platform :mswin do
-        @gda.gem 'a'
+    if win_platform?
+      util_set_arch 'x86-mswin32-60' do
+        @gda.platform :mswin do
+          @gda.gem 'a'
+        end
+
+        assert_equal [dep('a')], @set.dependencies
+        refute_empty @set.dependencies
       end
+    else
+      util_set_arch 'i686-darwin8.10.1' do
+        @gda.platform :mswin do
+          @gda.gem 'a'
+        end
 
-      assert_empty @set.dependencies
-    end
-
-    util_set_arch 'x86-mswin32-60' do
-      @gda.platform :mswin do
-        @gda.gem 'a'
+        assert_empty @set.dependencies
       end
-
-      refute_empty @set.dependencies
     end
   end
 
@@ -712,26 +734,20 @@ end
   end
 
   def test_platforms
-    util_set_arch 'i686-darwin8.10.1' do
-      @gda.platforms :ruby do
-        @gda.gem 'a'
-      end
-
-      assert_equal [dep('a')], @set.dependencies
+    unless win_platform?
+      util_set_arch 'i686-darwin8.10.1' do
+        @gda.platforms :ruby do
+          @gda.gem 'a'
+        end
 
-      @gda.platforms :mswin do
-        @gda.gem 'b'
-      end
+        assert_equal [dep('a')], @set.dependencies
 
-      assert_equal [dep('a')], @set.dependencies
-    end
+        @gda.platforms :mswin do
+          @gda.gem 'b'
+        end
 
-    util_set_arch 'x86-mswin32-60' do
-      @gda.platforms :mswin do
-        @gda.gem 'c'
+        assert_equal [dep('a')], @set.dependencies
       end
-
-      assert_equal [dep('a'), dep('c')], @set.dependencies
     end
   end
 
@@ -745,6 +761,12 @@ end
                :engine => 'jruby', :engine_version => '1.7.6'
 
     end
+
+    with_engine_version 'truffleruby', '1.0.0-rc11' do
+      assert @gda.ruby RUBY_VERSION,
+               :engine => 'truffleruby', :engine_version => '1.0.0-rc11'
+
+    end
   end
 
   def test_ruby_engine_mismatch_engine
@@ -808,24 +830,20 @@ end
 
   def test_with_engine_version
     version = RUBY_VERSION
-    engine  = Gem.ruby_engine
-
-    engine_version_const = "#{Gem.ruby_engine.upcase}_VERSION"
-    engine_version       = Object.const_get engine_version_const
+    engine = Gem.ruby_engine
+    engine_version = RUBY_ENGINE_VERSION
 
     with_engine_version 'other', '1.2.3' do
       assert_equal 'other', Gem.ruby_engine
-      assert_equal '1.2.3', OTHER_VERSION
+      assert_equal '1.2.3', RUBY_ENGINE_VERSION
 
-      assert_equal version, RUBY_VERSION if engine
+      assert_equal version, RUBY_VERSION
     end
 
     assert_equal version, RUBY_VERSION
     assert_equal engine,  Gem.ruby_engine
 
-    assert_equal engine_version, Object.const_get(engine_version_const) if
-      engine
+    assert_equal engine_version, RUBY_ENGINE_VERSION if engine
   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

@@ -20,6 +20,12 @@ class TestGemRequirement < Gem::TestCase
     refute_requirement_equal "= 1.2", "= 1.3"
     refute_requirement_equal "= 1.3", "= 1.2"
 
+    refute_requirement_equal "~> 1.3", "~> 1.3.0"
+    refute_requirement_equal "~> 1.3.0", "~> 1.3"
+
+    assert_requirement_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
+    assert_requirement_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]
+
     refute_equal Object.new, req("= 1.2")
     refute_equal req("= 1.2"), Object.new
   end
@@ -330,6 +336,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 +393,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
-

data/test/rubygems/test_gem_resolver_specification.rb

@@ -7,7 +7,7 @@ class TestGemResolverSpecification < Gem::TestCase
     attr_writer :source
     attr_reader :spec
 
-    def initialize spec
+    def initialize(spec)
       super()
 
       @spec = spec
@@ -62,4 +62,3 @@ class TestGemResolverSpecification < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_vendor_set.rb

@@ -81,4 +81,3 @@ class TestGemResolverVendorSet < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_vendor_specification.rb

@@ -81,4 +81,3 @@ class TestGemResolverVendorSpecification < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_security.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/security'
-require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9"
 
-unless defined?(OpenSSL::SSL) then
+unless defined?(OpenSSL::SSL)
   warn 'Skipping Gem::Security tests.  openssl not found.'
 end
 
@@ -309,4 +308,3 @@ class TestGemSecurity < Gem::TestCase
   end
 
 end if defined?(OpenSSL::SSL)
-

data/test/rubygems/test_gem_security_policy.rb

@@ -3,7 +3,7 @@
 
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL) then
+unless defined?(OpenSSL::SSL)
   warn 'Skipping Gem::Security::Policy tests.  openssl not found.'
 end
 
@@ -293,7 +293,7 @@ class TestGemSecurityPolicy < Gem::TestCase
 
   def test_subject
     assert_equal 'email:nobody@example', @no.subject(PUBLIC_CERT)
-    assert_equal '/C=JP/O=JIN.GR.JP/OU=RRR/CN=CA', @no.subject(CA_CERT)
+    assert_equal '/C=JP/ST=Tokyo/O=RubyGemsTest/CN=CA', @no.subject(CA_CERT)
   end
 
   def test_verify
@@ -518,17 +518,17 @@ class TestGemSecurityPolicy < Gem::TestCase
     end
   end
 
-  def digest data
+  def digest(data)
     digester = @digest.new
     digester << data
     digester
   end
 
-  def sign data, key = PRIVATE_KEY
+  def sign(data, key = PRIVATE_KEY)
     key.sign @digest.new, data.digest
   end
 
-  def dummy_signatures key = PRIVATE_KEY
+  def dummy_signatures(key = PRIVATE_KEY)
     data = digest 'hello'
 
     digests    = { Gem::Security::DIGEST_NAME => { 0 => data } }
@@ -538,4 +538,3 @@ class TestGemSecurityPolicy < Gem::TestCase
   end
 
 end if defined?(OpenSSL::SSL)
-