rubygems-update 3.1.2 → 3.2.3

data/Manifest.txt

@@ -1,9 +1,5 @@
-.bundle/config
-.rubocop.yml
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
-Gemfile
-Gemfile.lock
 History.txt
 LICENSE.txt
 MAINTAINERS.txt
@@ -16,7 +12,6 @@ UPGRADING.md
 bin/gem
 bin/update_rubygems
 bundler/CHANGELOG.md
-bundler/CODE_OF_CONDUCT.md
 bundler/LICENSE.md
 bundler/README.md
 bundler/UPGRADING.md
@@ -37,6 +32,7 @@ bundler/lib/bundler/cli/config.rb
 bundler/lib/bundler/cli/console.rb
 bundler/lib/bundler/cli/doctor.rb
 bundler/lib/bundler/cli/exec.rb
+bundler/lib/bundler/cli/fund.rb
 bundler/lib/bundler/cli/gem.rb
 bundler/lib/bundler/cli/info.rb
 bundler/lib/bundler/cli/init.rb
@@ -56,6 +52,7 @@ bundler/lib/bundler/cli/update.rb
 bundler/lib/bundler/cli/viz.rb
 bundler/lib/bundler/compact_index_client.rb
 bundler/lib/bundler/compact_index_client/cache.rb
+bundler/lib/bundler/compact_index_client/gem_parser.rb
 bundler/lib/bundler/compact_index_client/updater.rb
 bundler/lib/bundler/constants.rb
 bundler/lib/bundler/current_ruby.rb
@@ -93,6 +90,32 @@ bundler/lib/bundler/installer/standalone.rb
 bundler/lib/bundler/lazy_specification.rb
 bundler/lib/bundler/lockfile_generator.rb
 bundler/lib/bundler/lockfile_parser.rb
+bundler/lib/bundler/man/.document
+bundler/lib/bundler/man/bundle-add.1.ronn
+bundler/lib/bundler/man/bundle-binstubs.1.ronn
+bundler/lib/bundler/man/bundle-cache.1.ronn
+bundler/lib/bundler/man/bundle-check.1.ronn
+bundler/lib/bundler/man/bundle-clean.1.ronn
+bundler/lib/bundler/man/bundle-config.1.ronn
+bundler/lib/bundler/man/bundle-doctor.1.ronn
+bundler/lib/bundler/man/bundle-exec.1.ronn
+bundler/lib/bundler/man/bundle-gem.1.ronn
+bundler/lib/bundler/man/bundle-info.1.ronn
+bundler/lib/bundler/man/bundle-init.1.ronn
+bundler/lib/bundler/man/bundle-inject.1.ronn
+bundler/lib/bundler/man/bundle-install.1.ronn
+bundler/lib/bundler/man/bundle-list.1.ronn
+bundler/lib/bundler/man/bundle-lock.1.ronn
+bundler/lib/bundler/man/bundle-open.1.ronn
+bundler/lib/bundler/man/bundle-outdated.1.ronn
+bundler/lib/bundler/man/bundle-platform.1.ronn
+bundler/lib/bundler/man/bundle-pristine.1.ronn
+bundler/lib/bundler/man/bundle-remove.1.ronn
+bundler/lib/bundler/man/bundle-show.1.ronn
+bundler/lib/bundler/man/bundle-update.1.ronn
+bundler/lib/bundler/man/bundle-viz.1.ronn
+bundler/lib/bundler/man/bundle.1.ronn
+bundler/lib/bundler/man/gemfile.5.ronn
 bundler/lib/bundler/match_platform.rb
 bundler/lib/bundler/mirror.rb
 bundler/lib/bundler/plugin.rb
@@ -147,19 +170,25 @@ bundler/lib/bundler/templates/newgem/README.md.tt
 bundler/lib/bundler/templates/newgem/Rakefile.tt
 bundler/lib/bundler/templates/newgem/bin/console.tt
 bundler/lib/bundler/templates/newgem/bin/setup.tt
+bundler/lib/bundler/templates/newgem/circleci/config.yml.tt
 bundler/lib/bundler/templates/newgem/exe/newgem.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
+bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt
 bundler/lib/bundler/templates/newgem/gitignore.tt
+bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt
 bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt
 bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 bundler/lib/bundler/templates/newgem/newgem.gemspec.tt
 bundler/lib/bundler/templates/newgem/rspec.tt
+bundler/lib/bundler/templates/newgem/rubocop.yml.tt
 bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
 bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
-bundler/lib/bundler/templates/newgem/test/newgem_test.rb.tt
-bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt
+bundler/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
+bundler/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
+bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
+bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
 bundler/lib/bundler/templates/newgem/travis.yml.tt
 bundler/lib/bundler/ui.rb
 bundler/lib/bundler/ui/rg_proxy.rb
@@ -172,7 +201,6 @@ bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
 bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
 bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
 bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
 bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
@@ -227,6 +255,7 @@ bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb
 bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
 bundler/lib/bundler/vendor/thor/lib/thor/util.rb
 bundler/lib/bundler/vendor/thor/lib/thor/version.rb
+bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb
 bundler/lib/bundler/vendor/uri/lib/uri.rb
 bundler/lib/bundler/vendor/uri/lib/uri/common.rb
 bundler/lib/bundler/vendor/uri/lib/uri/file.rb
@@ -244,6 +273,7 @@ bundler/lib/bundler/vendored_fileutils.rb
 bundler/lib/bundler/vendored_molinillo.rb
 bundler/lib/bundler/vendored_persistent.rb
 bundler/lib/bundler/vendored_thor.rb
+bundler/lib/bundler/vendored_tmpdir.rb
 bundler/lib/bundler/vendored_uri.rb
 bundler/lib/bundler/version.rb
 bundler/lib/bundler/version_ranges.rb
@@ -251,80 +281,30 @@ 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.1.txt
-bundler/man/bundle-add.ronn
 bundler/man/bundle-binstubs.1
-bundler/man/bundle-binstubs.1.txt
-bundler/man/bundle-binstubs.ronn
 bundler/man/bundle-cache.1
-bundler/man/bundle-cache.1.txt
-bundler/man/bundle-cache.ronn
 bundler/man/bundle-check.1
-bundler/man/bundle-check.1.txt
-bundler/man/bundle-check.ronn
 bundler/man/bundle-clean.1
-bundler/man/bundle-clean.1.txt
-bundler/man/bundle-clean.ronn
 bundler/man/bundle-config.1
-bundler/man/bundle-config.1.txt
-bundler/man/bundle-config.ronn
 bundler/man/bundle-doctor.1
-bundler/man/bundle-doctor.1.txt
-bundler/man/bundle-doctor.ronn
 bundler/man/bundle-exec.1
-bundler/man/bundle-exec.1.txt
-bundler/man/bundle-exec.ronn
 bundler/man/bundle-gem.1
-bundler/man/bundle-gem.1.txt
-bundler/man/bundle-gem.ronn
 bundler/man/bundle-info.1
-bundler/man/bundle-info.1.txt
-bundler/man/bundle-info.ronn
 bundler/man/bundle-init.1
-bundler/man/bundle-init.1.txt
-bundler/man/bundle-init.ronn
 bundler/man/bundle-inject.1
-bundler/man/bundle-inject.1.txt
-bundler/man/bundle-inject.ronn
 bundler/man/bundle-install.1
-bundler/man/bundle-install.1.txt
-bundler/man/bundle-install.ronn
 bundler/man/bundle-list.1
-bundler/man/bundle-list.1.txt
-bundler/man/bundle-list.ronn
 bundler/man/bundle-lock.1
-bundler/man/bundle-lock.1.txt
-bundler/man/bundle-lock.ronn
 bundler/man/bundle-open.1
-bundler/man/bundle-open.1.txt
-bundler/man/bundle-open.ronn
 bundler/man/bundle-outdated.1
-bundler/man/bundle-outdated.1.txt
-bundler/man/bundle-outdated.ronn
 bundler/man/bundle-platform.1
-bundler/man/bundle-platform.1.txt
-bundler/man/bundle-platform.ronn
 bundler/man/bundle-pristine.1
-bundler/man/bundle-pristine.1.txt
-bundler/man/bundle-pristine.ronn
 bundler/man/bundle-remove.1
-bundler/man/bundle-remove.1.txt
-bundler/man/bundle-remove.ronn
 bundler/man/bundle-show.1
-bundler/man/bundle-show.1.txt
-bundler/man/bundle-show.ronn
 bundler/man/bundle-update.1
-bundler/man/bundle-update.1.txt
-bundler/man/bundle-update.ronn
 bundler/man/bundle-viz.1
-bundler/man/bundle-viz.1.txt
-bundler/man/bundle-viz.ronn
 bundler/man/bundle.1
-bundler/man/bundle.1.txt
-bundler/man/bundle.ronn
 bundler/man/gemfile.5
-bundler/man/gemfile.5.ronn
-bundler/man/gemfile.5.txt
 bundler/man/index.txt
 hide_lib_for_update/note.txt
 lib/rubygems.rb
@@ -396,9 +376,11 @@ lib/rubygems/install_message.rb
 lib/rubygems/install_update_options.rb
 lib/rubygems/installer.rb
 lib/rubygems/installer_test_case.rb
+lib/rubygems/installer_uninstaller_utils.rb
 lib/rubygems/local_remote_options.rb
 lib/rubygems/mock_gem_ui.rb
 lib/rubygems/name_tuple.rb
+lib/rubygems/openssl.rb
 lib/rubygems/package.rb
 lib/rubygems/package/digest_io.rb
 lib/rubygems/package/file_source.rb
@@ -415,6 +397,7 @@ lib/rubygems/path_support.rb
 lib/rubygems/platform.rb
 lib/rubygems/psych_additions.rb
 lib/rubygems/psych_tree.rb
+lib/rubygems/query_utils.rb
 lib/rubygems/rdoc.rb
 lib/rubygems/remote_fetcher.rb
 lib/rubygems/request.rb
@@ -430,6 +413,7 @@ lib/rubygems/requirement.rb
 lib/rubygems/resolver.rb
 lib/rubygems/resolver/activation_request.rb
 lib/rubygems/resolver/api_set.rb
+lib/rubygems/resolver/api_set/gem_parser.rb
 lib/rubygems/resolver/api_specification.rb
 lib/rubygems/resolver/best_set.rb
 lib/rubygems/resolver/composed_set.rb
@@ -491,15 +475,12 @@ lib/rubygems/source/lock.rb
 lib/rubygems/source/specific_file.rb
 lib/rubygems/source/vendor.rb
 lib/rubygems/source_list.rb
-lib/rubygems/source_local.rb
-lib/rubygems/source_specific_file.rb
 lib/rubygems/spec_fetcher.rb
 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
@@ -516,7 +497,6 @@ lib/rubygems/util/list.rb
 lib/rubygems/validator.rb
 lib/rubygems/version.rb
 lib/rubygems/version_option.rb
-lib/ubygems.rb
 rubygems-update.gemspec
 setup.rb
 test/rubygems/alternate_cert.pem
@@ -566,6 +546,7 @@ test/rubygems/sff/discover.rb
 test/rubygems/simple_gem.rb
 test/rubygems/specifications/bar-0.0.2.gemspec
 test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec
+test/rubygems/specifications/rubyforge-0.0.1.gemspec
 test/rubygems/ssl_cert.pem
 test/rubygems/ssl_key.pem
 test/rubygems/test_bundled_ca.rb
@@ -683,6 +664,7 @@ test/rubygems/test_gem_source_list.rb
 test/rubygems/test_gem_source_local.rb
 test/rubygems/test_gem_source_lock.rb
 test/rubygems/test_gem_source_specific_file.rb
+test/rubygems/test_gem_source_subpath_problem.rb
 test/rubygems/test_gem_source_vendor.rb
 test/rubygems/test_gem_spec_fetcher.rb
 test/rubygems/test_gem_specification.rb
@@ -702,16 +684,4 @@ test/rubygems/test_remote_fetch_error.rb
 test/rubygems/test_require.rb
 test/rubygems/wrong_key_cert.pem
 test/rubygems/wrong_key_cert_32.pem
-tmp/.keep
-util/CL2notes
-util/bisect
-util/ci.sh
-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
-util/rubocop
-util/update_bundled_ca_certificates.rb
-util/update_changelog.rb
+test/test_changelog_generator.rb

data/POLICIES.md

@@ -2,15 +2,8 @@
 
 Contributions to RubyGems are made via GitHub pull requests, which must be
 approved by a project committer other than the author. To approve a PR, a
-maintainer can leave a comment including the text "@bundlerbot r+", indicating
-that they have reviewed the PR and approve it. Bundlerbot will then
-automatically create a merge commit, test the merge, and land the PR if the
-merge commit passes the tests.
-
-This process guarantees that our release branches always have passing tests,
-and reduces siloing of information to a single contributor. For a full list of
-possible commands, see [the Bundlerbot
-documentation](https://bors.tech/documentation/).
+maintainer can use GitHubs PR review feature. After that, if the original author
+is happy to merge the PR, she can press the merge button.
 
 ## Long-Term Support
 
@@ -64,9 +57,10 @@ smooth and no needed steps are missed.
 
 ### Steps for all releases
 
-*   Confirm milestone on GitHub is complete
-*   Update History.txt
-*   Update Manifest.txt
+*   Confirm all PRs that you want backported are properly tagged with `rubygems:
+    <type>` labels at GitHub.
+*   Run `rake prepare_stable_branch[<target_version>]`, create a PR and merge it
+    to the stable branch once CI passes.
 *   Create and push git tag
 *   Create and push `rubygems-update` gem and tgz
 *   Publish blog post

data/README.md

@@ -6,7 +6,7 @@ A package (also known as a library) contains a set of functionality that can be
 We call these packages "gems" and RubyGems is a tool to install, create, manage and load these packages in your Ruby environment.
 
 RubyGems is also a client for [RubyGems.org](https://rubygems.org), a public repository of Gems that allows you to publish a Gem
-that can be shared and used by other developers. See our guide on publishing a Gem at [guides.rubygems.org](http://guides.rubygems.org/publishing/)
+that can be shared and used by other developers. See our guide on publishing a Gem at [guides.rubygems.org](https://guides.rubygems.org/publishing/)
 
 ## Getting Started
 
@@ -23,7 +23,7 @@ Finally, inside your Ruby program, load the Nokogiri gem and start parsing your
 
     Nokogiri.XML('<h1>Hello World</h1>')
 
-For more information about how to use RubyGems, see our RubyGems basics guide at [guides.rubygems.org](http://guides.rubygems.org/rubygems-basics/)
+For more information about how to use RubyGems, see our RubyGems basics guide at [guides.rubygems.org](https://guides.rubygems.org/rubygems-basics/)
 
 ## Requirements
 
@@ -40,7 +40,7 @@ with your OS's package manager before installing RubyGems manually.
 If you would like to manually install RubyGems:
 
 * Download from https://rubygems.org/pages/download, unpack, and `cd` into RubyGems' src
-* OR clone this repository and `cd` into the repository (make sure to run `git submodule update --init`)
+* OR clone this repository and `cd` into the repository
 
 Install RubyGems by running:
 
@@ -65,10 +65,10 @@ See [UPGRADING](UPGRADING.md) for more details and alternative instructions.
 ## Documentation
 
 RubyGems uses [rdoc](https://github.com/rdoc/rdoc) for documentation. A compiled set of the docs
-can be viewed online at [rubydoc](http://www.rubydoc.info/github/rubygems/rubygems).
+can be viewed online at [rubydoc](https://www.rubydoc.info/github/rubygems/rubygems).
 
 RubyGems also provides a comprehensive set of guides which covers numerous topics such as
-creating a new gem, security practices and other resources at http://guides.rubygems.org
+creating a new gem, security practices and other resources at https://guides.rubygems.org
 
 ## Getting Help
 

data/Rakefile

@@ -1,4 +1,4 @@
-# -*- ruby -*-
+RakeFileUtils.verbose_flag = false
 
 require 'rubygems'
 require 'rubygems/package_task'
@@ -6,9 +6,10 @@ require "rake/testtask"
 require 'psych'
 
 desc "Setup Rubygems dev environment"
-task :setup => ["bundler:checkout"] do
-  sh "gem install bundler:2.0.2"
-  sh "bundle install"
+task :setup do
+  version = File.read("dev_gems.rb.lock").split(/BUNDLED WITH\n   /).last
+  sh "gem install bundler:#{version}"
+  sh "bundle install --gemfile=dev_gems.rb"
 end
 
 desc "Setup git hooks"
@@ -18,7 +19,7 @@ end
 
 Rake::TestTask.new do |t|
   t.ruby_opts = %w[-w]
-  t.ruby_opts << '-rdevkit' if Gem.win_platform?
+  t.ruby_opts << '-rdevkit' if RbConfig::CONFIG['host_os'].include?('mingw')
 
   t.libs << "test"
   t.libs << "bundler/lib"
@@ -38,9 +39,9 @@ RDoc::Task.new :rdoc => 'docs', :clobber_rdoc => 'clobber_docs' do |doc|
   doc.title  = "RubyGems #{v} API Documentation"
 
   rdoc_files = Rake::FileList.new %w[lib bundler/lib]
-  rdoc_files.add %w[History.txt LICENSE.txt MIT.txt CODE_OF_CONDUCT.md CONTRIBUTING.rdoc
-                    MAINTAINERS.txt Manifest.txt POLICIES.rdoc README.md UPGRADING.rdoc bundler/CHANGELOG.md
-                    bundler/CODE_OF_CONDUCT.md bundler/CONTRIBUTING.md bundler/LICENSE.md bundler/README.md
+  rdoc_files.add %w[History.txt LICENSE.txt MIT.txt CODE_OF_CONDUCT.md CONTRIBUTING.md
+                    MAINTAINERS.txt Manifest.txt POLICIES.md README.md UPGRADING.md bundler/CHANGELOG.md
+                    bundler/doc/contributing/README.md bundler/LICENSE.md bundler/README.md
                     hide_lib_for_update/note.txt].map(&:freeze)
 
   doc.rdoc_files = rdoc_files
@@ -52,6 +53,7 @@ begin
   require "automatiek"
 
   Automatiek::RakeTask.new("molinillo") do |lib|
+    lib.version = "0.7.0"
     lib.download = { :github => "https://github.com/CocoaPods/Molinillo" }
     lib.namespace = "Molinillo"
     lib.prefix = "Gem::Resolver"
@@ -63,21 +65,23 @@ rescue LoadError
   end
 end
 
-desc "Run rubocop"
-task(:rubocop) do
-  sh "util/rubocop"
+namespace :rubocop do
+  desc "Run rubocop for RubyGems. Pass positional arguments, e.g. -a, as Rake arguments."
+  task(:rubygems) do |_, args|
+    sh "util/rubocop", *args
+  end
+
+  desc "Run rubocop for Bundler. Pass positional arguments, e.g. -a, as Rake arguments."
+  task(:bundler) do |_, args|
+    sh "bundler/bin/rubocop", *args
+  end
 end
 
+task rubocop: %w[rubocop:rubygems rubocop:bundler]
+
 desc "Run a test suite bisection"
 task(:bisect) do
-  seed = begin
-           Integer(ENV["SEED"])
-         rescue
-           abort "Specify the failing seed as the SEED environment variable"
-         end
-
-  gemdir = `gem env gemdir`.chomp
-  sh "SEED=#{seed} MTB_VERBOSE=2 util/bisect -Ilib:bundler/lib:test:#{gemdir}/gems/minitest-server-1.0.5/lib test"
+  sh "util/bisect"
 end
 
 # --------------------------------------------------------------------
@@ -95,9 +99,16 @@ task :check_deprecations do
   end
 end
 
+desc "Prepare stable branch"
+task :prepare_stable_branch, [:version] do |_t, opts|
+  require_relative "util/release"
+
+  Release.new(opts[:version] || v.to_s).prepare!
+end
+
 desc "Install rubygems to local system"
 task :install => [:clear_package, :package] do
-  sh "ruby -Ilib bin/gem install pkg/rubygems-update-#{v}.gem && update_rubygems"
+  sh "ruby -Ilib bin/gem install --no-document pkg/rubygems-update-#{v}.gem && update_rubygems --no-document"
 end
 
 desc "Clears previously built package"
@@ -105,6 +116,13 @@ task :clear_package do
   rm_rf "pkg"
 end
 
+desc "Generates the changelog for a specific target version"
+task :generate_changelog, [:version] do |_t, opts|
+  require_relative "util/release"
+
+  Release.for_rubygems(opts[:version]).cut_changelog!
+end
+
 desc "Release rubygems-#{v}"
 task :release => :prerelease do
   Rake::Task["package"].invoke
@@ -151,11 +169,18 @@ file "pkg/rubygems-#{v}.tgz" => "pkg/rubygems-#{v}" do
       sh "7z a -ttar  rubygems-#{v}.tar rubygems-#{v}"
       sh "7z a -tgzip rubygems-#{v}.tgz rubygems-#{v}.tar"
     else
-      sh "tar -czf rubygems-#{v}.tgz rubygems-#{v}"
+      sh "tar -czf rubygems-#{v}.tgz --owner=rubygems:0 --group=rubygems:0 rubygems-#{v}"
     end
   end
 end
 
+desc "Upload the release to Github releases"
+task :upload_to_github do
+  require_relative "util/release"
+
+  Release.for_rubygems(v).create_for_github!
+end
+
 desc "Upload release to S3"
 task :upload_to_s3 do
   begin
@@ -167,12 +192,12 @@ task :upload_to_s3 do
   s3 = Aws::S3::Resource.new(region:'us-west-2')
   %w[zip tgz].each do |ext|
     obj = s3.bucket('oregon.production.s3.rubygems.org').object("rubygems/rubygems-#{v}.#{ext}")
-    obj.upload_file("pkg/rubygems-#{v}.#{ext}")
+    obj.upload_file("pkg/rubygems-#{v}.#{ext}", acl: 'public-read')
   end
 end
 
 desc "Upload release to rubygems.org"
-task :upload => %w[upload_to_s3]
+task :upload => %w[upload_to_github upload_to_s3]
 
 directory '../guides.rubygems.org' do
   sh 'git', 'clone',
@@ -268,50 +293,8 @@ namespace 'blog' do
     name  = `git config --get user.name`.strip
     email = `git config --get user.email`.strip
 
-    history = File.read 'History.txt'
-
-    history.force_encoding Encoding::UTF_8
-
-    _, change_log, = history.split %r%^===\s*\d.*%, 3
-
-    change_types = []
-
-    lines = change_log.strip.lines
-    change_log = []
-
-    while line = lines.shift do
-      case line
-      when /(^[A-Z].*)/ then
-        change_types << $1
-        change_log << "_#{$1}_\n"
-      when /^\*/ then
-        entry = [line.strip]
-
-        while /^  \S/ =~ lines.first do
-          entry << lines.shift.strip
-        end
-
-        change_log << "#{entry.join ' '}\n"
-      else
-        change_log << line
-      end
-    end
-
-    change_log = change_log.join
-
-    change_types = change_types.map do |change_type|
-      change_type.downcase.tr '^a-z ', ''
-    end
-
-    last_change_type = change_types.pop
-
-    if change_types.empty?
-      change_types = ''
-    else
-      change_types = change_types.join(', ') << ' and '
-    end
-
-    change_types << last_change_type
+    require_relative "util/changelog"
+    history = Changelog.for_rubygems(v.to_s)
 
     require 'tempfile'
 
@@ -324,7 +307,7 @@ author: #{name}
 author_email: #{email}
 ---
 
-RubyGems #{v} includes #{change_types}.
+RubyGems #{v} includes #{history.change_types_for_blog}.
 
 To update to the latest RubyGems you can run:
 
@@ -334,13 +317,13 @@ If you need to upgrade or downgrade please follow the [how to upgrade/downgrade
 RubyGems][upgrading] instructions.  To install RubyGems by hand see the
 [Download RubyGems][download] page.
 
-#{change_log}
+#{history.release_notes_for_blog.join("\n")}
 
 SHA256 Checksums:
 
 #{checksums}
 
-[download]: http://rubygems.org/pages/download
+[download]: https://rubygems.org/pages/download
 [upgrading]: http://docs.seattlerb.org/rubygems/UPGRADING_rdoc.html
 
       ANNOUNCEMENT
@@ -380,42 +363,35 @@ end
 
 module Rubygems
   class ProjectFiles
-
     def self.all
       files = []
-      exclude = %r[\.git|\./bundler/(?!lib|man|exe|[^/]+\.md|bundler.gemspec)]ox
-      tracked_files = `git ls-files --recurse-submodules`.split("\n").map {|f| "./#{f}" }
+      exclude = %r{\A(?:\.|dev_gems|bundler/(?!lib|man|exe|[^/]+\.md|bundler.gemspec)|util/)}
+      tracked_files = `git ls-files`.split("\n")
 
       tracked_files.each do |path|
         next unless File.file?(path)
         next if path =~ exclude
-        files << path[2..-1]
+        files << path
       end
 
-      files
+      files.sort
     end
-
   end
 end
 
 desc "Update the manifest to reflect what's on disk"
 task :update_manifest do
-  File.open('Manifest.txt', 'w') {|f| f.puts(Rubygems::ProjectFiles.all.sort) }
+  File.open('Manifest.txt', 'w') {|f| f.puts(Rubygems::ProjectFiles.all) }
 end
 
 desc "Check the manifest is up to date"
 task :check_manifest do
-  if File.read("Manifest.txt").split.sort != Rubygems::ProjectFiles.all.sort
+  if File.read("Manifest.txt").split != Rubygems::ProjectFiles.all
     abort "Manifest is out of date. Run `rake update_manifest` to sync it"
   end
 end
 
 namespace :bundler do
-  desc "Initialize bundler submodule"
-  task :checkout do
-    sh "git submodule update --init"
-  end
-
   task :build_metadata do
     chdir('bundler') { sh "rake build_metadata" }
   end