rubygems-update 2.7.11 → 3.0.9

data/test/rubygems/test_require.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 
 class TestGemRequire < Gem::TestCase
   class Latch
-    def initialize count = 1
+    def initialize(count = 1)
       @count = count
       @lock  = Monitor.new
       @cv    = @lock.new_cond
@@ -40,10 +40,10 @@ class TestGemRequire < Gem::TestCase
 
   # Providing -I on the commandline should always beat gems
   def test_dash_i_beats_gems
-    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", {"c" => "> 0"}, "lib/b/c.rb"
-    c1 = new_spec "c", "1", nil, "lib/c/c.rb"
-    c2 = new_spec "c", "2", nil, "lib/c/c.rb"
+    a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", {"c" => "> 0"}, "lib/b/c.rb"
+    c1 = util_spec "c", "1", nil, "lib/c/c.rb"
+    c2 = util_spec "c", "2", nil, "lib/c/c.rb"
 
     install_specs c1, c2, b1, a1
 
@@ -80,13 +80,11 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_concurrent_require
-    skip 'deadlock' if /^1\.8\./ =~ RUBY_VERSION
-
     Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
     Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
 
-    a1 = new_spec "a", "1", nil, "lib/a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b.rb"
+    a1 = util_spec "a", "1", nil, "lib/a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b.rb"
 
     install_specs a1, b1
 
@@ -107,9 +105,9 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_not_lazy_with_exact_req
-    a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
-    b2 = new_spec "b", "2", nil, "lib/b/c.rb"
+    a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b/c.rb"
+    b2 = util_spec "b", "2", nil, "lib/b/c.rb"
 
     install_specs b1, b2, a1
 
@@ -122,9 +120,9 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_lazy_with_inexact_req
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
-    b2 = new_spec "b", "2", nil, "lib/b/c.rb"
+    a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b/c.rb"
+    b2 = util_spec "b", "2", nil, "lib/b/c.rb"
 
     install_specs b1, b2, a1
 
@@ -137,8 +135,8 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_is_not_lazy_with_one_possible
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
+    a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/b/c.rb"
 
     install_specs b1, a1
 
@@ -151,7 +149,7 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_can_use_a_pathname_object
-    a1 = new_spec "a", "1", nil, "lib/test_gem_require_a.rb"
+    a1 = util_spec "a", "1", nil, "lib/test_gem_require_a.rb"
 
     install_specs a1
 
@@ -161,9 +159,9 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_activate_via_require_respects_loaded_files
-    a1 = new_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
-    b1 = new_spec "b", "1", nil, "lib/benchmark.rb"
-    b2 = new_spec "b", "2", nil, "lib/benchmark.rb"
+    a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
+    b1 = util_spec "b", "1", nil, "lib/benchmark.rb"
+    b2 = util_spec "b", "2", nil, "lib/benchmark.rb"
 
     install_specs b1, b2, a1
 
@@ -181,11 +179,11 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_already_activated_direct_conflict
-    a1 = new_spec "a", "1", { "b" => "> 0" }
-    b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
-    b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
-    c1 = new_spec "c", "1", nil, "lib/d.rb"
-    c2 = new_spec("c", "2", nil, "lib/d.rb")
+    a1 = util_spec "a", "1", { "b" => "> 0" }
+    b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
+    b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
+    c1 = util_spec "c", "1", nil, "lib/d.rb"
+    c2 = util_spec("c", "2", nil, "lib/d.rb")
 
     install_specs c1, c2, b1, b2, a1
 
@@ -201,13 +199,13 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_multiple_gems_with_the_same_path
-    a1 = new_spec "a", "1", { "b" => "> 0", "x" => "> 0" }
-    b1 = new_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
-    b2 = new_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
-    x1 = new_spec "x", "1", nil, "lib/ib.rb"
-    x2 = new_spec "x", "2", nil, "lib/ib.rb"
-    c1 = new_spec "c", "1", nil, "lib/d.rb"
-    c2 = new_spec("c", "2", nil, "lib/d.rb")
+    a1 = util_spec "a", "1", { "b" => "> 0", "x" => "> 0" }
+    b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/ib.rb"
+    b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/ib.rb"
+    x1 = util_spec "x", "1", nil, "lib/ib.rb"
+    x2 = util_spec "x", "2", nil, "lib/ib.rb"
+    c1 = util_spec "c", "1", nil, "lib/d.rb"
+    c2 = util_spec("c", "2", nil, "lib/d.rb")
 
     install_specs c1, c2, x1, x2, b1, b2, a1
 
@@ -224,13 +222,13 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_unable_to_find_good_unresolved_version
-    a1 = new_spec "a", "1", { "b" => "> 0" }
-    b1 = new_spec "b", "1", { "c" => ">= 2" }, "lib/ib.rb"
-    b2 = new_spec "b", "2", { "c" => ">= 3" }, "lib/ib.rb"
+    a1 = util_spec "a", "1", { "b" => "> 0" }
+    b1 = util_spec "b", "1", { "c" => ">= 2" }, "lib/ib.rb"
+    b2 = util_spec "b", "2", { "c" => ">= 3" }, "lib/ib.rb"
 
-    c1 = new_spec "c", "1", nil, "lib/d.rb"
-    c2 = new_spec "c", "2", nil, "lib/d.rb"
-    c3 = new_spec "c", "3", nil, "lib/d.rb"
+    c1 = util_spec "c", "1", nil, "lib/d.rb"
+    c2 = util_spec "c", "2", nil, "lib/d.rb"
+    c3 = util_spec "c", "3", nil, "lib/d.rb"
 
     install_specs c1, c2, c3, b1, b2, a1
 
@@ -273,10 +271,10 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_doesnt_traverse_development_dependencies
-    a = new_spec("a", "1", nil, "lib/a.rb")
-    z = new_spec("z", "1", "w" => "> 0")
-    w1 = new_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
-    w2 = new_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
+    a = util_spec("a", "1", nil, "lib/a.rb")
+    z = util_spec("z", "1", "w" => "> 0")
+    w1 = util_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
+    w2 = util_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
 
     install_specs a, w1, w2, z
 
@@ -296,7 +294,6 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_realworld_default_gem
-    skip "no default gems on ruby < 2.0" unless RUBY_VERSION >= "2"
     begin
       gem 'json'
     rescue Gem::MissingSpecError
@@ -316,7 +313,7 @@ class TestGemRequire < Gem::TestCase
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
     install_default_specs(default_gem_spec)
-    normal_gem_spec = new_spec("default", "3.0", nil,
+    normal_gem_spec = util_spec("default", "3.0", nil,
                                "lib/default/gem.rb")
     install_specs(normal_gem_spec)
     assert_require "default/gem"
@@ -366,7 +363,7 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_default_when_gem_defined
-    a = new_spec("a", "1", nil, "lib/a.rb")
+    a = util_spec("a", "1", nil, "lib/a.rb")
     install_specs a
     c = Class.new do
       def self.gem(*args)
@@ -379,8 +376,8 @@ class TestGemRequire < Gem::TestCase
 
 
   def test_require_bundler
-    b1 = new_spec('bundler', '1', nil, "lib/bundler/setup.rb")
-    b2a = new_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
+    b1 = util_spec('bundler', '1', nil, "lib/bundler/setup.rb")
+    b2a = util_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
     install_specs b1, b2a
 
     require "rubygems/bundler_version_finder"
@@ -392,8 +389,8 @@ class TestGemRequire < Gem::TestCase
 
   def test_require_bundler_missing_bundler_version
     Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["55", "reason"]) do
-      b1 = new_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
-      b2a = new_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
+      b1 = util_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
+      b2a = util_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
       install_specs b1, b2a
 
       e = assert_raises Gem::MissingSpecVersionError do
@@ -405,8 +402,8 @@ class TestGemRequire < Gem::TestCase
 
   def test_require_bundler_with_bundler_version
     Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["1", "reason"]) do
-      b1 = new_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
-      b2 = new_spec('bundler', '2', nil, "lib/bundler/setup.rb")
+      b1 = util_spec('bundler', '1.999999999', nil, "lib/bundler/setup.rb")
+      b2 = util_spec('bundler', '2', nil, "lib/bundler/setup.rb")
       install_specs b1, b2
 
       $:.clear
@@ -415,6 +412,24 @@ class TestGemRequire < Gem::TestCase
     end
   end
 
+  if RUBY_VERSION >= "2.5"
+    def test_no_kernel_require_in_warn_with_uplevel
+      lib = File.realpath("../../../lib", __FILE__)
+      Dir.mktmpdir("warn_test") do |dir|
+        File.write(dir + "/sub.rb", "warn 'uplevel', 'test', uplevel: 1\n")
+        File.write(dir + "/main.rb", "require 'sub'\n")
+        _, err = capture_subprocess_io do
+          system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+        end
+        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
+        _, err = capture_subprocess_io do
+          system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+        end
+        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
+      end
+    end
+  end
+
   def silence_warnings
     old_verbose, $VERBOSE = $VERBOSE, false
     yield

data/util/CL2notes

@@ -9,7 +9,7 @@ def format_text(text, wrap, indent=0)
   work = text.dup
 
   while work.length > wrap
-    if work =~ /^(.{0,#{wrap}})[ \n]/o then
+    if work =~ /^(.{0,#{wrap}})[ \n]/o
       result << $1
       work.slice!(0, $&.length)
     else
@@ -53,4 +53,3 @@ entries.sort_by { |file, | file }.each do |file, file_entries|
     puts file_entry
   end
 end
-

data/util/ci

@@ -47,25 +47,33 @@ end
 case ARGV
 when %w(before_script)
   if TOOL.rubygems?
-    run('gem', %W(uninstall executable-hooks gem-wrappers -x --force -i #{`gem env home`.strip}@global))
-    run('gem', %W(install rake -v #{'~> 10.5'} --no-document))
-    run('gem', %W(install bundler -v #{'1.16.6'} --no-document))
-    run('gem', %W(install hoe -v #{'3.15.0'} --no-document))
-    run('gem', %w(install hoe-travis --no-document))
-    run('gem', %W(install minitest -v #{'~> 4.7'} --no-document))
-    run('rake', %w(_10.5.0_ travis:before -t))
+    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))
+    end
+
+    # 2.5 images of Travis was broken about bundler installation.
+    if RUBY_VERSION >= "2.5.0" && RUBY_VERSION < "2.6.0"
+      run('gem', %w(install bundler -v 1.16.2))
+    end
+
     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(after_script)
-  if TOOL.rubygems?
-    run('rake', %w(_10.5.0_ travis:after -t))
-  end
+when %w(rubocop)
+  run('gem', %w(install rubocop -v ~>0.60.0))
+  run('util/rubocop')
 when %w(script)
   if TOOL.rubygems?
-    run('rake', %w(_10.5.0_ travis))
+    run('rake test')
   else
     run('rake', %w(spec:travis -t))
   end

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.rb

@@ -6,7 +6,7 @@ class CertificateBuilder
 
   attr_reader :start
 
-  def initialize key_size = 2048
+  def initialize(key_size = 2048)
     @start          = Time.utc 2012, 01, 01, 00, 00, 00
     @end_of_time    = Time.utc 9999, 12, 31, 23, 59, 59
     @end_of_time_32 = Time.utc 2038, 01, 19, 03, 14, 07
@@ -59,11 +59,11 @@ class CertificateBuilder
       ef.create_extension('subjectKeyIdentifier', 'hash')
     ]
 
-    if cert != issuer_cert then # not self-signed cert
+    if cert != issuer_cert  # not self-signed cert
       cert.add_extension ef.create_extension('authorityKeyIdentifier', 'keyid:always')
     end
 
-    if is_ca then
+    if is_ca
       cert.add_extension ef.create_extension('basicConstraints', 'CA:TRUE', true)
       cert.add_extension ef.create_extension('keyUsage', 'keyCertSign', true)
     end
@@ -79,7 +79,7 @@ class CertificateBuilder
     OpenSSL::PKey::RSA.new @key_size
   end
 
-  def create_keys names
+  def create_keys(names)
     keys = {}
 
     names.each do |name|
@@ -95,8 +95,8 @@ class CertificateBuilder
     serial
   end
 
-  def validity_for time
-    if time == :end_of_time then
+  def validity_for(time)
+    if time == :end_of_time
       validity    = @end_of_time
       validity_32 = @end_of_time_32
     else
@@ -169,4 +169,3 @@ certs.each do |name, (cert, cert_32)|
   dest = File.join base_dir, "#{name}_cert_32.pem"
   File.write dest, cert_32.to_pem
 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,17 +1,16 @@
 # 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'
 end
-

data/util/patch_with_prs.rb

@@ -50,7 +50,7 @@ sh("git", "checkout", branch)
 sh("git", "submodule", "update", "--init", "--recursive")
 
 commits = `git log --oneline origin/master --`.split("\n").map {|l| l.split(/\s/, 2) }.reverse
-commits.select! {|_sha, message| message =~ /(Auto merge of|Merge pull request) ##{Regexp.union(*prs)}/ }
+commits.select! {|_sha, message| message =~ /(Auto merge of|Merge pull request|Merge) ##{Regexp.union(*prs)}/ }
 
 unless system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first))
   abort unless system("zsh")

data/util/rubocop

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+begin
+  load Gem.bin_path("rubocop", "rubocop", "~> 0.60.0")
+rescue Gem::GemNotFoundException
+  abort "Install the rubocop gem (~> 0.60.0) to run a static analysis"
+end

data/util/update_bundled_ca_certificates.rb

@@ -8,14 +8,14 @@ URIS = [
   URI('https://www.rubygems.org'),
   URI('https://index.rubygems.org'),
   URI('https://staging.rubygems.org'),
-]
+].freeze
 
 HOSTNAMES_TO_MAP = [
   'rubygems.org',
   'index.rubygems.org'
-]
+].freeze
 
-def connect_to uri, store
+def connect_to(uri, store)
   # None of the URIs are IPv6, so URI::Generic#hostname(ruby 1.9.3+) isn't needed
   http = Net::HTTP.new uri.host, uri.port
 
@@ -31,7 +31,7 @@ rescue OpenSSL::SSL::SSLError
   false
 end
 
-def load_certificates io
+def load_certificates(io)
   cert_texts =
     io.read.scan(/^-{5}BEGIN CERTIFICATE-{5}.*?^-{5}END CERTIFICATE-{5}/m)
 
@@ -40,13 +40,13 @@ def load_certificates io
   end
 end
 
-def show_certificates certificates
+def show_certificates(certificates)
   certificates.each do |certificate|
     p certificate.subject.to_a
   end
 end
 
-def store_for certificates
+def store_for(certificates)
   store = OpenSSL::X509::Store.new
   certificates.each do |certificate|
     store.add_cert certificate
@@ -55,13 +55,13 @@ def store_for certificates
   store
 end
 
-def test_certificates certificates, uri
+def test_certificates(certificates, uri)
   1.upto certificates.length do |n|
     puts "combinations of #{n} certificates"
     certificates.combination(n).each do |combination|
       match = test_uri uri, combination
 
-      if match then
+      if match
         $needed_combinations << match
         puts
         puts match.map { |certificate| certificate.subject }
@@ -74,7 +74,7 @@ def test_certificates certificates, uri
   end
 end
 
-def test_uri uri, certificates
+def test_uri(uri, certificates)
   store = store_for certificates
 
   verified = connect_to uri, store
@@ -84,7 +84,7 @@ def test_uri uri, certificates
   nil
 end
 
-def hostname_certificate_mapping certificates
+def hostname_certificate_mapping(certificates)
   mapping = {}
   HOSTNAMES_TO_MAP.each do |hostname|
     uri = URI("https://#{hostname}")
@@ -96,7 +96,7 @@ def hostname_certificate_mapping certificates
   mapping
 end
 
-def write_certificates certificates
+def write_certificates(certificates)
   mapping = hostname_certificate_mapping(certificates)
   mapping.each do |hostname, certificate|
     subject = certificate.subject.to_a
@@ -115,7 +115,7 @@ def write_certificates certificates
 end
 
 io =
-  if ARGV.empty? then
+  if ARGV.empty?
     open OpenSSL::X509::DEFAULT_CERT_FILE
   else
     ARGF
@@ -135,4 +135,3 @@ end
 needed = $needed_combinations.flatten.uniq
 
 write_certificates needed
-

data/util/update_changelog.rb

@@ -52,7 +52,7 @@ history = File.read(File.expand_path('../../History.txt', __FILE__))
 
 File.open(File.expand_path('../../ChangeLog', __FILE__), 'w') do |changelog|
   commits = `git log --oneline v#{Gem::VERSION}..#{branch}`.split("\n")
-  prs = commits.reverse_each.map { |c| c =~ /(Auto merge of|Merge pull request) #(\d+)/ && $2 }.compact
+  prs = commits.reverse_each.map { |c| c =~ /(Auto merge of|Merge pull request|Merge) #(\d+)/ && $2 }.compact.uniq.sort!
   prs.each do |pr|
     next if history =~ /Pull\srequest\s##{pr}/m
     details = github_api "/repos/rubygems/rubygems/pulls/#{pr}"