rubygems-update 3.0.0 → 3.0.9

data/test/rubygems/test_gem_text.rb

@@ -89,4 +89,9 @@ Without the wrapping, the text might not look good in the RSS feed.
     s = "ab" * 500_001
     assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000)
   end
+
+  def test_clean_text
+    assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a")
+  end
+
 end

data/test/rubygems/test_gem_uninstaller.rb

@@ -22,9 +22,10 @@ class TestGemUninstaller < Gem::InstallerTestCase
   end
 
   def test_initialize_expand_path
-    uninstaller = Gem::Uninstaller.new nil, :install_dir => '/foo//bar'
+    FileUtils.mkdir_p 'foo/bar'
+    uninstaller = Gem::Uninstaller.new nil, :install_dir => 'foo//bar'
 
-    assert_match %r|/foo/bar$|, uninstaller.instance_variable_get(:@gem_home)
+    assert_match %r|foo/bar$|, uninstaller.instance_variable_get(:@gem_home)
   end
 
   def test_ask_if_ok
@@ -133,6 +134,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
   end
 
   def test_remove_not_in_home
+    Dir.mkdir "#{@gemhome}2"
     uninstaller = Gem::Uninstaller.new nil, :install_dir => "#{@gemhome}2"
 
     e = assert_raises Gem::GemNotInHomeException do
@@ -149,6 +151,22 @@ class TestGemUninstaller < Gem::InstallerTestCase
     assert_path_exists @spec.gem_dir
   end
 
+  def test_remove_symlinked_gem_home
+    Dir.mktmpdir("gem_home") do |dir|
+      symlinked_gem_home = "#{dir}/#{File.basename(@gemhome)}"
+
+      FileUtils.ln_s(@gemhome, dir)
+
+      uninstaller = Gem::Uninstaller.new nil, :install_dir => symlinked_gem_home
+
+      use_ui ui do
+        uninstaller.remove @spec
+      end
+
+      refute_path_exists @spec.gem_dir
+    end
+  end
+
   def test_path_ok_eh
     uninstaller = Gem::Uninstaller.new nil
 
@@ -313,6 +331,7 @@ create_makefile '#{@spec.name}'
   end
 
   def test_uninstall_wrong_repo
+    Dir.mkdir "#{@gemhome}2"
     Gem.use_paths "#{@gemhome}2", [@gemhome]
 
     uninstaller = Gem::Uninstaller.new @spec.name, :executables => true

data/test/rubygems/test_gem_util.rb

@@ -58,4 +58,29 @@ class TestGemUtil < Gem::TestCase
     assert_equal 4, list.find { |x| x == 4 }
   end
 
+  def test_glob_files_in_dir
+    FileUtils.mkdir_p 'g'
+    FileUtils.touch File.join('g', 'h.rb')
+    FileUtils.touch File.join('g', 'i.rb')
+
+    expected_paths = [
+      File.join(@tempdir, 'g/h.rb'),
+      File.join(@tempdir, 'g/i.rb'),
+    ]
+
+    files_with_absolute_base = Gem::Util.glob_files_in_dir('*.rb', File.join(@tempdir, 'g'))
+    assert_equal expected_paths.to_set, files_with_absolute_base.to_set
+
+    files_with_relative_base = Gem::Util.glob_files_in_dir('*.rb', 'g')
+    assert_equal expected_paths.to_set, files_with_relative_base.to_set
+  end
+
+  def test_correct_for_windows_path
+    path = "/C:/WINDOWS/Temp/gems"
+    assert_equal "C:/WINDOWS/Temp/gems", Gem::Util.correct_for_windows_path(path)
+
+    path = "/home/skillet"
+    assert_equal "/home/skillet", Gem::Util.correct_for_windows_path(path)
+  end
+
 end

data/util/ci

@@ -47,7 +47,7 @@ end
 case ARGV
 when %w(before_script)
   if TOOL.rubygems?
-    run('gem', %W(uninstall executable-hooks gem-wrappers bundler-unload -x --force -i #{`gem env home`.strip}@global))
+    run('ruby', %W(-I lib bin/gem uninstall executable-hooks gem-wrappers bundler-unload -x --force -i #{`gem env home`.strip}@global))
 
     if RUBY_VERSION >= "2.6.0"
       run('gem', %w(install minitest -v 5.4.3))
@@ -61,6 +61,11 @@ when %w(before_script)
     run('gem', %w(list --details))
     run('gem', %w(env))
   else
+    # Fix incorrect default gem specifications on ruby 2.6.1. Can be removed
+    # when 2.6.2 is released and we start testing against it. See
+    # https://bugs.ruby-lang.org/issues/15582 for more information
+    run('gem', %w(install etc:1.0.1 --default)) if RUBY_VERSION == "2.6.1"
+
     with_retries { run('rake', %w(spec:travis:deps)) }
   end
 when %w(rubocop)

data/util/cops/deprecations.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rubygems
+      # This cop enforces that no outdated deprecations are present on RubyGems
+      # code base.
+      #
+      # @example
+      #
+      #   As of March, 2019
+      #
+      #   # bad
+      #   deprecate :safdfa, nil, 2018, 12
+      #   deprecate :safdfa, nil, 2019, 03
+      #
+      #   # good
+      #   deprecate :safdfa, nil, 2019, 04
+      #
+      class Deprecations < Cop
+
+        MSG = "Remove `deprecate` calls with dates in the past, along with " \
+          "the methods they deprecate, or expand the deprecation horizons to " \
+          "a future date"
+
+        def on_send(node)
+          _receiver, method_name, *args = *node
+          return unless method_name == :deprecate
+
+          scheduled_year = args[2].children.last
+          scheduled_month = args[3].children.last
+
+          current_time = Time.now
+
+          current_year = current_time.year
+          current_month = current_time.month
+
+          if current_year >= scheduled_year || (current_year == scheduled_year && current_month >= scheduled_month)
+            add_offense(node)
+          end
+        end
+
+        private
+
+        def message(node)
+          format(MSG, method: node.method_name)
+        end
+
+      end
+    end
+  end
+end

data/util/create_certs.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# cp /etc/ssl/openssl.cnf . # copied from OpenSSL 1.1.1b source
+
+rm -rf demoCA/ server/ client/ 
+
+mkdir demoCA demoCA/private demoCA/newcerts
+touch demoCA/index.txt
+echo 00 > demoCA/serial
+openssl genrsa -out demoCA/private/cakey.pem 2048
+openssl req -new -key demoCA/private/cakey.pem -out demoCA/careq.pem -subj "/C=JP/ST=Tokyo/O=RubyGemsTest/CN=CA"
+openssl ca -batch -config openssl.cnf -extensions v3_ca -out demoCA/cacert.pem -startdate 090101000000Z -enddate 491231235959Z -batch -keyfile demoCA/private/cakey.pem -selfsign -infiles demoCA/careq.pem
+
+mkdir server
+openssl genrsa -out server/server.key 2048
+openssl req -new -key server/server.key -out server/csr.pem -subj "/C=JP/ST=Tokyo/O=RubyGemsTest/CN=localhost"
+openssl ca -batch -config openssl.cnf -startdate 090101000000Z -enddate 491231235959Z -in server/csr.pem -keyfile demoCA/private/cakey.pem -cert demoCA/cacert.pem -out server/cert.pem
+
+mkdir client
+openssl genrsa -out client/client.key 2048
+openssl req -config openssl.cnf -new -key client/client.key -out client/csr.pem -subj "/C=JP/ST=Tokyo/O=RubyGemsTest/CN=client"
+openssl ca -batch -config openssl.cnf -startdate 090101000000Z -enddate 491231235959Z -in client/csr.pem -keyfile demoCA/private/cakey.pem -cert demoCA/cacert.pem -out client/cert.pem
+
+cp demoCA/cacert.pem $(git rev-parse --show-toplevel)/test/rubygems/ca_cert.pem
+cp server/cert.pem $(git rev-parse --show-toplevel)/test/rubygems/ssl_cert.pem
+cp server/server.key $(git rev-parse --show-toplevel)/test/rubygems/ssl_key.pem
+cat client/cert.pem client/client.key > $(git rev-parse --show-toplevel)/test/rubygems/client.pem

data/util/create_encrypted_key.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 require 'openssl'
 
-private_key_path = '../../test/rubygems/private_key.pem'
-private_key_path = File.expand_path private_key_path, __FILE__
+test_path = File.expand_path('../../test/rubygems', __FILE__)
+
+private_key_path = "#{test_path}/private_key.pem"
 
 key = OpenSSL::PKey::RSA.new File.read private_key_path
 
 cipher = OpenSSL::Cipher.new 'DES-CBC'
 
-encrypted_key_path = '../../test/rubygems/encrypted_private_key.pem'
-encrypted_key_path = File.expand_path encrypted_key_path, __FILE__
+encrypted_key_path = "#{test_path}/encrypted_private_key.pem"
 
 open encrypted_key_path, 'w' do |io|
   io.write key.to_pem cipher, 'Foo bar'

data/util/update_bundled_ca_certificates.rb

@@ -5,14 +5,12 @@ require 'fileutils'
 
 URIS = [
   URI('https://rubygems.org'),
+  URI('https://www.rubygems.org'),
   URI('https://index.rubygems.org'),
   URI('https://staging.rubygems.org'),
-  URI('https://fastly.rubygems.org'),
-  URI('https://rubygems.global.ssl.fastly.net'),
 ].freeze
 
 HOSTNAMES_TO_MAP = [
-  'rubygems.global.ssl.fastly.net',
   'rubygems.org',
   'index.rubygems.org'
 ].freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.9
 platform: ruby
 authors:
 - Jim Weirich
@@ -13,10 +13,10 @@ authors:
 - André Arko
 - Evan Phoenix
 - Hiroshi SHIBATA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -555,6 +555,7 @@ files:
 - lib/rubygems/resolver/stats.rb
 - lib/rubygems/resolver/vendor_set.rb
 - lib/rubygems/resolver/vendor_specification.rb
+- lib/rubygems/s3_uri_signer.rb
 - lib/rubygems/safe_yaml.rb
 - lib/rubygems/security.rb
 - lib/rubygems/security/policies.rb
@@ -577,9 +578,8 @@ files:
 - lib/rubygems/specification.rb
 - lib/rubygems/specification_policy.rb
 - lib/rubygems/ssl_certs/.document
-- lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
-- lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
-- lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
+- lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
+- lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 - lib/rubygems/stub_specification.rb
 - lib/rubygems/syck_hack.rb
 - lib/rubygems/test_case.rb
@@ -781,7 +781,9 @@ files:
 - test/rubygems/wrong_key_cert_32.pem
 - util/CL2notes
 - util/ci
+- util/cops/deprecations.rb
 - util/create_certs.rb
+- util/create_certs.sh
 - util/create_encrypted_key.rb
 - util/generate_spdx_license_list.rb
 - util/patch_with_prs.rb
@@ -793,7 +795,7 @@ licenses:
 - Ruby
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -811,9 +813,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.
 test_files: []

data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem

@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----

data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----