rubygems-update 3.0.3 → 3.0.9

data/test/rubygems/test_gem_security_policy.rb

@@ -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

data/test/rubygems/test_gem_specification.rb

@@ -2419,6 +2419,35 @@ end
     assert_equal @a2, same_spec
   end
 
+  def test_to_ruby_with_rsa_key
+    rsa_key = OpenSSL::PKey::RSA.new(2048)
+    @a2.signing_key = rsa_key
+    ruby_code = @a2.to_ruby
+
+    expected = <<-SPEC
+# -*- encoding: utf-8 -*-
+# stub: a 2 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "a".freeze
+  s.version = "2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["A User".freeze]
+  s.date = "#{Gem::Specification::TODAY.strftime "%Y-%m-%d"}"
+  s.description = "This is a test description".freeze
+  s.email = "example@example.com".freeze
+  s.files = ["lib/code.rb".freeze]
+  s.homepage = "http://example.com".freeze
+  s.rubygems_version = "#{Gem::VERSION}".freeze
+  s.summary = "this is a summary".freeze
+end
+    SPEC
+
+    assert_equal expected, ruby_code
+  end
+
   def test_to_ruby_for_cache
     @a2.add_runtime_dependency 'b', '1'
     @a2.dependencies.first.instance_variable_set :@type, nil

data/test/rubygems/test_gem_stream_ui.rb

@@ -37,7 +37,7 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask
-    Timeout.timeout(1) do
+    Timeout.timeout(5) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask("What is your name?")
@@ -55,7 +55,7 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_for_password
-    Timeout.timeout(1) do
+    Timeout.timeout(5) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask_for_password("What is your name?")

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

@@ -75,4 +75,12 @@ class TestGemUtil < Gem::TestCase
     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.3
+  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: 2019-03-04 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -139,30 +139,6 @@ extra_rdoc_files:
 - bundler/LICENSE.md
 - bundler/README.md
 - hide_lib_for_update/note.txt
-- bundler/man/bundle-platform.1
-- bundler/man/bundle-update.1
-- bundler/man/bundle-info.1
-- bundler/man/bundle-init.1
-- bundler/man/bundle.1
-- bundler/man/bundle-exec.1
-- bundler/man/bundle-install.1
-- bundler/man/bundle-list.1
-- bundler/man/bundle-outdated.1
-- bundler/man/bundle-check.1
-- bundler/man/bundle-show.1
-- bundler/man/bundle-gem.1
-- bundler/man/bundle-open.1
-- bundler/man/bundle-lock.1
-- bundler/man/bundle-pristine.1
-- bundler/man/bundle-remove.1
-- bundler/man/bundle-doctor.1
-- bundler/man/bundle-binstubs.1
-- bundler/man/bundle-viz.1
-- bundler/man/bundle-package.1
-- bundler/man/bundle-add.1
-- bundler/man/bundle-config.1
-- bundler/man/bundle-clean.1
-- bundler/man/bundle-inject.1
 files:
 - ".rubocop.yml"
 - ".travis.yml"
@@ -406,53 +382,29 @@ files:
 - bundler/lib/bundler/vlad.rb
 - bundler/lib/bundler/worker.rb
 - bundler/lib/bundler/yaml_serializer.rb
-- bundler/man/bundle-add.1
 - bundler/man/bundle-add.ronn
-- bundler/man/bundle-binstubs.1
 - bundler/man/bundle-binstubs.ronn
-- bundler/man/bundle-check.1
 - bundler/man/bundle-check.ronn
-- bundler/man/bundle-clean.1
 - bundler/man/bundle-clean.ronn
-- bundler/man/bundle-config.1
 - bundler/man/bundle-config.ronn
-- bundler/man/bundle-doctor.1
 - bundler/man/bundle-doctor.ronn
-- bundler/man/bundle-exec.1
 - bundler/man/bundle-exec.ronn
-- bundler/man/bundle-gem.1
 - bundler/man/bundle-gem.ronn
-- bundler/man/bundle-info.1
 - bundler/man/bundle-info.ronn
-- bundler/man/bundle-init.1
 - bundler/man/bundle-init.ronn
-- bundler/man/bundle-inject.1
 - bundler/man/bundle-inject.ronn
-- bundler/man/bundle-install.1
 - bundler/man/bundle-install.ronn
-- bundler/man/bundle-list.1
 - bundler/man/bundle-list.ronn
-- bundler/man/bundle-lock.1
 - bundler/man/bundle-lock.ronn
-- bundler/man/bundle-open.1
 - bundler/man/bundle-open.ronn
-- bundler/man/bundle-outdated.1
 - bundler/man/bundle-outdated.ronn
-- bundler/man/bundle-package.1
 - bundler/man/bundle-package.ronn
-- bundler/man/bundle-platform.1
 - bundler/man/bundle-platform.ronn
-- bundler/man/bundle-pristine.1
 - bundler/man/bundle-pristine.ronn
-- bundler/man/bundle-remove.1
 - bundler/man/bundle-remove.ronn
-- bundler/man/bundle-show.1
 - bundler/man/bundle-show.ronn
-- bundler/man/bundle-update.1
 - bundler/man/bundle-update.ronn
-- bundler/man/bundle-viz.1
 - bundler/man/bundle-viz.ronn
-- bundler/man/bundle.1
 - bundler/man/bundle.ronn
 - bundler/man/gemfile.5.ronn
 - hide_lib_for_update/note.txt
@@ -603,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
@@ -625,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
@@ -829,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
@@ -841,7 +795,7 @@ licenses:
 - Ruby
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -859,8 +813,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.0.pre1
-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/bundler/man/bundle-add.1

@@ -1,58 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "BUNDLE\-ADD" "1" "November 2018" "" ""
-.
-.SH "NAME"
-\fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
-.
-.SH "SYNOPSIS"
-\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-skip\-install] [\-\-strict] [\-\-optimistic]
-.
-.SH "DESCRIPTION"
-Adds the named gem to the Gemfile and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
-.
-.P
-Example:
-.
-.P
-bundle add rails
-.
-.P
-bundle add rails \-\-version "< 3\.0, > 1\.1"
-.
-.P
-bundle add rails \-\-version "~> 5\.0\.0" \-\-source "https://gems\.example\.com" \-\-group "development"
-.
-.P
-bundle add rails \-\-skip\-install
-.
-.P
-bundle add rails \-\-group "development, test"
-.
-.SH "OPTIONS"
-.
-.TP
-\fB\-\-version\fR, \fB\-v\fR
-Specify version requirements(s) for the added gem\.
-.
-.TP
-\fB\-\-group\fR, \fB\-g\fR
-Specify the group(s) for the added gem\. Multiple groups should be separated by commas\.
-.
-.TP
-\fB\-\-source\fR, , \fB\-s\fR
-Specify the source for the added gem\.
-.
-.TP
-\fB\-\-skip\-install\fR
-Adds the gem to the Gemfile but does not install it\.
-.
-.TP
-\fB\-\-optimistic\fR
-Adds optimistic declaration of version
-.
-.TP
-\fB\-\-strict\fR
-Adds strict declaration of version
-