rubygems-update 3.1.4 → 3.2.14

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverComposedSet < Gem::TestCase
-
   def test_errors
     index_set   = Gem::Resolver::IndexSet.new
     current_set = Gem::Resolver::CurrentSet.new
@@ -41,5 +40,4 @@ class TestGemResolverComposedSet < Gem::TestCase
     refute best_set.remote?
     refute current_set.remote?
   end
-
 end

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverConflict < Gem::TestCase
-
   def test_explanation
     root  =
       dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
@@ -74,10 +73,9 @@ class TestGemResolverConflict < Gem::TestCase
 
     expected = [
       'net-ssh (>= 2.0.13), 2.2.2 activated',
-      'rye (= 0.9.8), 0.9.8 activated'
+      'rye (= 0.9.8), 0.9.8 activated',
     ]
 
     assert_equal expected, conflict.request_path(child.requester)
   end
-
 end

data/test/rubygems/test_gem_resolver_dependency_request.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverDependencyRequest < Gem::TestCase
-
   def setup
     super
 
@@ -80,5 +79,4 @@ class TestGemResolverDependencyRequest < Gem::TestCase
 
     assert_equal dependency, dr.dependency
   end
-
 end

data/test/rubygems/test_gem_resolver_git_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverGitSet < Gem::TestCase
-
   def setup
     super
 
@@ -185,5 +184,4 @@ class TestGemResolverGitSet < Gem::TestCase
 
     assert_equal "#{@gemhome}2", spec.source.root_dir
   end
-
 end

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/installer'
 
 class TestGemResolverGitSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -110,5 +109,4 @@ class TestGemResolverGitSpecification < Gem::TestCase
 
     assert called
   end
-
 end

data/test/rubygems/test_gem_resolver_index_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverIndexSet < Gem::TestCase
-
   def setup
     super
 
@@ -42,7 +41,7 @@ class TestGemResolverIndexSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map { |s| s.full_name }
+    assert_equal %w[a-1], found.map {|s| s.full_name }
   end
 
   def test_find_all_local
@@ -83,7 +82,6 @@ class TestGemResolverIndexSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1.a], found.map { |s| s.full_name }
+    assert_equal %w[a-1.a], found.map {|s| s.full_name }
   end
-
 end

data/test/rubygems/test_gem_resolver_index_specification.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/available_set'
 
 class TestGemResolverIndexSpecification < Gem::TestCase
-
   def test_initialize
     set     = Gem::Resolver::IndexSet.new
     source  = Gem::Source.new @gem_repo
@@ -90,5 +89,4 @@ class TestGemResolverIndexSpecification < Gem::TestCase
 
     assert_equal a_2_p.full_name, spec.full_name
   end
-
 end

data/test/rubygems/test_gem_resolver_installed_specification.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverInstalledSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -44,5 +43,4 @@ class TestGemResolverInstalledSpecification < Gem::TestCase
 
     assert b_spec.installable_platform?
   end
-
 end

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverInstallerSet < Gem::TestCase
-
   def test_add_always_install
     spec_fetcher do |fetcher|
       fetcher.download 'a', 1
@@ -15,7 +14,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep('a')
 
-    assert_equal %w[a-2], set.always_install.map { |s| s.full_name }
+    assert_equal %w[a-2], set.always_install.map {|s| s.full_name }
 
     e = assert_raises Gem::UnsatisfiableDependencyError do
       set.add_always_install dep('b')
@@ -49,7 +48,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep('a')
 
-    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
   end
 
   def test_add_always_install_prerelease
@@ -62,7 +61,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep('a')
 
-    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
   end
 
   def test_add_always_install_prerelease_only
@@ -93,7 +92,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep('a'), nil
 
-    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
   end
 
   def test_consider_local_eh
@@ -149,7 +148,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep('a'), nil
 
-    assert_equal %w[a-2], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-2], set.find_all(req).map {|spec| spec.full_name }
   end
 
   def test_find_all_prerelease
@@ -162,12 +161,12 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep('a'), nil
 
-    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
 
     req = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
 
     assert_equal %w[a-1 a-1.a],
-                 set.find_all(req).map { |spec| spec.full_name }.sort
+                 set.find_all(req).map {|spec| spec.full_name }.sort
   end
 
   def test_load_spec
@@ -255,5 +254,4 @@ class TestGemResolverInstallerSet < Gem::TestCase
     refute set.consider_local?
     refute set.consider_remote?
   end
-
 end

data/test/rubygems/test_gem_resolver_local_specification.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/available_set'
 
 class TestGemResolverLocalSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -41,5 +40,4 @@ class TestGemResolverLocalSpecification < Gem::TestCase
 
     assert b_spec.installable_platform?
   end
-
 end

data/test/rubygems/test_gem_resolver_lock_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverLockSet < Gem::TestCase
-
   def setup
     super
 
@@ -16,7 +15,7 @@ class TestGemResolverLockSet < Gem::TestCase
     specs = @set.add 'a', '2', Gem::Platform::RUBY
     spec = specs.first
 
-    assert_equal %w[a-2], @set.specs.map { |t| t.full_name }
+    assert_equal %w[a-2], @set.specs.map {|t| t.full_name }
 
     assert_kind_of Gem::Resolver::LockSpecification, spec
 
@@ -34,11 +33,11 @@ class TestGemResolverLockSet < Gem::TestCase
 
     found = @set.find_all dep 'a'
 
-    assert_equal %w[a-2], found.map { |s| s.full_name }
+    assert_equal %w[a-2], found.map {|s| s.full_name }
 
     found = @set.find_all dep 'a', '>= 0.a'
 
-    assert_equal %w[a-1.a a-2], found.map { |s| s.full_name }
+    assert_equal %w[a-1.a a-2], found.map {|s| s.full_name }
   end
 
   def test_load_spec
@@ -59,5 +58,4 @@ class TestGemResolverLockSet < Gem::TestCase
   def test_prefetch
     assert_respond_to @set, :prefetch
   end
-
 end

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -4,7 +4,6 @@ require 'rubygems/installer'
 require 'rubygems/resolver'
 
 class TestGemResolverLockSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -95,5 +94,4 @@ class TestGemResolverLockSpecification < Gem::TestCase
 
     assert_same real_spec, l_spec.spec
   end
-
 end

data/test/rubygems/test_gem_resolver_requirement_list.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverRequirementList < Gem::TestCase
-
   def setup
     super
 
@@ -16,5 +15,4 @@ class TestGemResolverRequirementList < Gem::TestCase
 
     assert_equal [req], @list.each.to_a
   end
-
 end

data/test/rubygems/test_gem_resolver_specification.rb

@@ -2,9 +2,7 @@
 require 'rubygems/test_case'
 
 class TestGemResolverSpecification < Gem::TestCase
-
   class TestSpec < Gem::Resolver::Specification
-
     attr_writer :source
     attr_reader :spec
 
@@ -13,7 +11,6 @@ class TestGemResolverSpecification < Gem::TestCase
 
       @spec = spec
     end
-
   end
 
   def test_install
@@ -62,5 +59,4 @@ class TestGemResolverSpecification < Gem::TestCase
 
     assert_equal source, a_spec.source
   end
-
 end

data/test/rubygems/test_gem_resolver_vendor_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverVendorSet < Gem::TestCase
-
   def setup
     super
 
@@ -52,7 +51,7 @@ class TestGemResolverVendorSet < Gem::TestCase
     source = Gem::Source::Vendor.new directory
 
     expected = [
-      Gem::Resolver::VendorSpecification.new(@set, spec, source)
+      Gem::Resolver::VendorSpecification.new(@set, spec, source),
     ]
 
     assert_equal expected, found
@@ -79,5 +78,4 @@ class TestGemResolverVendorSet < Gem::TestCase
       @set.load_spec 'b', v(1), Gem::Platform::RUBY, nil
     end
   end
-
 end

data/test/rubygems/test_gem_resolver_vendor_specification.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverVendorSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -79,5 +78,4 @@ class TestGemResolverVendorSpecification < Gem::TestCase
 
     assert_equal v(1), v_spec.version
   end
-
 end

data/test/rubygems/test_gem_security.rb

@@ -2,7 +2,7 @@
 require 'rubygems/test_case'
 require 'rubygems/security'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security tests.  openssl not found.'
 end
 
@@ -11,7 +11,6 @@ if Gem.java_platform?
 end
 
 class TestGemSecurity < Gem::TestCase
-
   CHILD_KEY = load_key 'child'
 
   ALTERNATE_CERT = load_cert 'child'
@@ -40,16 +39,16 @@ class TestGemSecurity < Gem::TestCase
     assert_equal    name.to_s,             cert.subject.to_s
 
     assert_equal 3, cert.extensions.length,
-                 cert.extensions.map { |e| e.to_a.first }
+                 cert.extensions.map {|e| e.to_a.first }
 
-    constraints = cert.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = cert.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = cert.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = cert.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
-    key_ident = cert.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    key_ident = cert.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -85,19 +84,19 @@ class TestGemSecurity < Gem::TestCase
     assert_equal    name.to_s,             cert.issuer.to_s
 
     assert_equal 5, cert.extensions.length,
-                 cert.extensions.map { |e| e.to_a.first }
+                 cert.extensions.map {|e| e.to_a.first }
 
-    constraints = cert.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    constraints = cert.extensions.find {|ext| ext.oid == 'subjectAltName' }
     assert_equal 'email:nobody@example', constraints.value
 
-    constraints = cert.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = cert.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = cert.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = cert.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
-    key_ident = cert.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    key_ident = cert.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -188,20 +187,20 @@ class TestGemSecurity < Gem::TestCase
     assert_in_delta Time.now + 60,         signed.not_after, 10
 
     assert_equal 4, signed.extensions.length,
-                 signed.extensions.map { |e| e.to_a.first }
+                 signed.extensions.map {|e| e.to_a.first }
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'issuerAltName' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'issuerAltName' }
     assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = signed.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = signed.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
     key_ident =
-      signed.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+      signed.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -227,23 +226,23 @@ class TestGemSecurity < Gem::TestCase
     assert_equal "sha256WithRSAEncryption", signed.signature_algorithm
 
     assert_equal 5, signed.extensions.length,
-                 signed.extensions.map { |e| e.to_a.first }
+                 signed.extensions.map {|e| e.to_a.first }
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'issuerAltName' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'issuerAltName' }
     assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'subjectAltName' }
     assert_equal 'email:signee@example', constraints.value, 'subjectAltName'
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = signed.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = signed.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
     key_ident =
-      signed.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+      signed.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -310,5 +309,4 @@ class TestGemSecurity < Gem::TestCase
 
     assert_equal key.to_pem, key_from_file.to_pem
   end
-
-end if defined?(OpenSSL::SSL) && !Gem.java_platform?
+end if Gem::HAVE_OPENSSL && !Gem.java_platform?