rubygems-update 3.2.22 → 3.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52d933727e75e688a2283b38dfbecc0997bd5ad8ae07735153c8c93fb868d1c2
-  data.tar.gz: 932932f5c5ef970bbd45d918985cccab896094ab07b20e75665270a92a8f72fd
+  metadata.gz: 34d592c07f3fc05d6a1201bb1cd26e0ace4cbced2f6030cdc552a8f8fc2a384f
+  data.tar.gz: 4cc3ad43ce2aad0c4787622f521b1d10fac300dc68b17926067f26b69c64f558
 SHA512:
-  metadata.gz: c362d63f528942ce0ef7fbc2f70bd48c640eff9a2237a223cd6e1fc1144760b0727dd45bf71655e2d67791dc4f4220dfae3a7ff936079cd6ebd12e800ef43312
-  data.tar.gz: 5ceeb69663855c94864fad8a2ff609d1bd9307c946dcac81227eb6d537986faf326925118ab4c8692b435b15f8b05e63d3d859beb485a150e8069bb4e232f2c2
+  metadata.gz: 1e8ae581d0b154dc77f54c9235c186034a374f456d3f226157c6a9852389c047449cfb7d8959258fceef79ce6f6695d0aa2ad4c003c0cd4968f3fffa81c60c6a
+  data.tar.gz: fe0aa438ee051a2f4e66c309f3d5945d53deba4ddf63a2118ad68a859591c17a2b30dd9f88d76be84b99c167b34627da43c49ee3eca929ced2926a6ed6a8000a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 3.2.23 / 2021-07-09
+
+## Enhancements:
+
+* Rewind IO source to allow working with contents in memory. Pull request
+  #4729 by drcapulet
+
 # 3.2.22 / 2021-07-06
 
 ## Enhancements:

data/Manifest.txt

@@ -7,7 +7,6 @@ MIT.txt
 Manifest.txt
 POLICIES.md
 README.md
-Rakefile
 UPGRADING.md
 bin/gem
 bin/update_rubygems

data/bundler/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.2.23 (July 9, 2021)
+
+## Enhancements:
+
+  - Fix `bundle install` on truffleruby selecting incorrect variant for `sorbet-static` gem [#4625](https://github.com/rubygems/rubygems/pull/4625)
+  - Spare meaningless warning on read-only bundle invocations [#4724](https://github.com/rubygems/rubygems/pull/4724)
+
+## Bug fixes:
+
+  - Fix incorrect warning about duplicated gems in the Gemfile [#4732](https://github.com/rubygems/rubygems/pull/4732)
+  - Fix `bundle plugin install foo` crashing [#4734](https://github.com/rubygems/rubygems/pull/4734)
+
 # 2.2.22 (July 6, 2021)
 
 ## Enhancements:

data/bundler/lib/bundler.rb

@@ -236,8 +236,9 @@ module Bundler
         end
 
         if warning
-          user_home = tmp_home_path(warning)
-          Bundler.ui.warn "#{warning}\nBundler will use `#{user_home}' as your home directory temporarily.\n"
+          Bundler.ui.warn "#{warning}\n"
+          user_home = tmp_home_path
+          Bundler.ui.warn "Bundler will use `#{user_home}' as your home directory temporarily.\n"
           user_home
         else
           Pathname.new(home)
@@ -684,15 +685,13 @@ EOF
       Bundler.rubygems.clear_paths
     end
 
-    def tmp_home_path(warning)
+    def tmp_home_path
       Kernel.send(:require, "tmpdir")
       SharedHelpers.filesystem_access(Dir.tmpdir) do
         path = Bundler.tmp
         at_exit { Bundler.rm_rf(path) }
         path
       end
-    rescue RuntimeError => e
-      raise e.exception("#{warning}\nBundler also failed to create a temporary home directory':\n#{e}")
     end
 
     # @param env [Hash]

data/bundler/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2021-07-06".freeze
-    @git_commit_sha = "0bdd3e8e71".freeze
+    @built_at = "2021-07-09".freeze
+    @git_commit_sha = "e863a3905d".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/dsl.rb

@@ -102,28 +102,26 @@ module Bundler
       # if there's already a dependency with this name we try to prefer one
       if current = @dependencies.find {|d| d.name == dep.name }
         deleted_dep = @dependencies.delete(current) if current.type == :development
+        return if deleted_dep
 
         if current.requirement != dep.requirement
-          unless deleted_dep
-            return if dep.type == :development
+          return if dep.type == :development
 
-            update_prompt = ""
+          update_prompt = ""
 
-            if File.basename(@gemfile) == Injector::INJECTED_GEMS
-              if dep.requirements_list.include?(">= 0") && !current.requirements_list.include?(">= 0")
-                update_prompt = ". Gem already added"
-              else
-                update_prompt = ". If you want to update the gem version, run `bundle update #{current.name}`"
+          if File.basename(@gemfile) == Injector::INJECTED_GEMS
+            if dep.requirements_list.include?(">= 0") && !current.requirements_list.include?(">= 0")
+              update_prompt = ". Gem already added"
+            else
+              update_prompt = ". If you want to update the gem version, run `bundle update #{current.name}`"
 
-                update_prompt += ". You may also need to change the version requirement specified in the Gemfile if it's too restrictive." unless current.requirements_list.include?(">= 0")
-              end
+              update_prompt += ". You may also need to change the version requirement specified in the Gemfile if it's too restrictive." unless current.requirements_list.include?(">= 0")
             end
-
-            raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
-                            "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})" \
-                             "#{update_prompt}"
           end
 
+          raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
+                          "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})" \
+                           "#{update_prompt}"
         else
           Bundler.ui.warn "Your Gemfile lists the gem #{current.name} (#{current.requirement}) more than once.\n" \
                           "You should probably keep only one of them.\n" \
@@ -132,12 +130,10 @@ module Bundler
         end
 
         if current.source != dep.source
-          unless deleted_dep
-            return if dep.type == :development
-            raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
-                            "You specified that #{dep.name} (#{dep.requirement}) should come from " \
-                            "#{current.source || "an unspecified source"} and #{dep.source}\n"
-          end
+          return if dep.type == :development
+          raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
+                          "You specified that #{dep.name} (#{dep.requirement}) should come from " \
+                          "#{current.source || "an unspecified source"} and #{dep.source}\n"
         end
       end
 

data/bundler/lib/bundler/index.rb

@@ -195,11 +195,7 @@ module Bundler
           if base # allow all platforms when searching from a lockfile
             dependency.matches_spec?(spec)
           else
-            if Gem::Platform.respond_to? :match_spec?
-              dependency.matches_spec?(spec) && Gem::Platform.match_spec?(spec)
-            else
-              dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform)
-            end
+            dependency.matches_spec?(spec) && Gem::Platform.match_spec?(spec)
           end
         end
 

data/bundler/lib/bundler/plugin/installer.rb

@@ -77,7 +77,7 @@ module Bundler
         source_list = SourceList.new
 
         source_list.add_git_source(git_source_options) if git_source_options
-        source_list.add_global_rubygems_remote(rubygems_source) if rubygems_source
+        Array(rubygems_source).each {|remote| source_list.add_global_rubygems_remote(remote) } if rubygems_source
 
         deps = names.map {|name| Dependency.new name, version }
 

data/bundler/lib/bundler/rubygems_ext.rb

@@ -174,20 +174,36 @@ module Gem
     end
   end
 
+  require "rubygems/platform"
+
   class Platform
     JAVA  = Gem::Platform.new("java") unless defined?(JAVA)
     MSWIN = Gem::Platform.new("mswin32") unless defined?(MSWIN)
     MSWIN64 = Gem::Platform.new("mswin64") unless defined?(MSWIN64)
     MINGW = Gem::Platform.new("x86-mingw32") unless defined?(MINGW)
     X64_MINGW = Gem::Platform.new("x64-mingw32") unless defined?(X64_MINGW)
+  end
 
-    undef_method :hash if method_defined? :hash
-    def hash
-      @cpu.hash ^ @os.hash ^ @version.hash
-    end
+  Platform.singleton_class.module_eval do
+    unless Platform.singleton_methods.include?(:match_spec?)
+      def match_spec?(spec)
+        match_gem?(spec.platform, spec.name)
+      end
 
-    undef_method :eql? if method_defined? :eql?
-    alias_method :eql?, :==
+      def match_gem?(platform, gem_name)
+        match_platforms?(platform, Gem.platforms)
+      end
+
+      private
+
+      def match_platforms?(platform, platforms)
+        platforms.any? do |local_platform|
+          platform.nil? ||
+            local_platform == platform ||
+            (local_platform != Gem::Platform::RUBY && local_platform =~ platform)
+        end
+      end
+    end
   end
 
   require "rubygems/util"

data/bundler/lib/bundler/settings.rb

@@ -428,12 +428,8 @@ module Bundler
     def global_config_file
       if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty?
         Pathname.new(ENV["BUNDLE_CONFIG"])
-      else
-        begin
-          Bundler.user_bundle_path("config")
-        rescue PermissionError, GenericSystemCallError
-          nil
-        end
+      elsif Bundler.rubygems.user_home && !Bundler.rubygems.user_home.empty?
+        Pathname.new(Bundler.rubygems.user_home).join(".bundle/config")
       end
     end
 

data/bundler/lib/bundler/spec_set.rb

@@ -195,7 +195,7 @@ module Bundler
     def spec_for_dependency(dep, match_current_platform)
       specs_for_platforms = lookup[dep.name]
       if match_current_platform
-        GemHelpers.select_best_platform_match(specs_for_platforms, Bundler.local_platform)
+        GemHelpers.select_best_platform_match(specs_for_platforms.select{|s| Gem::Platform.match_spec?(s) }, Bundler.local_platform)
       else
         GemHelpers.select_best_platform_match(specs_for_platforms, dep.__platform)
       end

data/bundler/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.22".freeze
+  VERSION = "2.2.23".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = "3.2.22".freeze
+  VERSION = "3.2.23".freeze
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/package/io_source.rb

@@ -32,10 +32,14 @@ class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
 
   def with_read_io
     yield io
+  ensure
+    io.rewind
   end
 
   def with_write_io
     yield io
+  ensure
+    io.rewind
   end
 
   def path

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.2.22"
+  s.version = "3.2.23"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -48,7 +48,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       io.puts gemspec.to_ruby
     end
 
-    open(File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io|
+    File.open(File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io|
       gemspec.version = "1.15.4"
       io.puts gemspec.to_ruby
     end

data/test/rubygems/test_gem_installer.rb

@@ -730,7 +730,7 @@ gem 'other', version
     installer.generate_bin
 
     default_shebang = Gem.ruby
-    shebang_line = open("#{@gemhome}/bin/executable") {|f| f.readlines.first }
+    shebang_line = File.open("#{@gemhome}/bin/executable") {|f| f.readlines.first }
     assert_match(/\A#!/, shebang_line)
     assert_match(/#{default_shebang}/, shebang_line)
   end

data/test/rubygems/test_gem_package.rb

@@ -937,7 +937,7 @@ class TestGemPackage < Gem::Package::TarTestCase
     build = Gem::Package.new @gem
     build.spec = @spec
     build.setup_signer
-    open @gem, 'wb' do |gem_io|
+    File.open @gem, 'wb' do |gem_io|
       Gem::Package::TarWriter.new gem_io do |gem|
         build.add_metadata gem
         build.add_contents gem
@@ -1145,6 +1145,13 @@ class TestGemPackage < Gem::Package::TarTestCase
     end
   end
 
+  def test_contents_from_io
+    io = StringIO.new Gem.read_binary @gem
+    package = Gem::Package.new io
+
+    assert_equal %w[lib/code.rb], package.contents
+  end
+
   def util_tar
     tar_io = StringIO.new
 

data/test/rubygems/test_gem_server.rb

@@ -365,7 +365,7 @@ class TestGemServer < Gem::TestCase
     specs_dir = File.join dir, 'specifications'
     FileUtils.mkdir_p specs_dir
 
-    open File.join(specs_dir, spec.spec_name), 'w' do |io|
+    File.open File.join(specs_dir, spec.spec_name), 'w' do |io|
       io.write spec.to_ruby
     end
 
@@ -420,7 +420,7 @@ class TestGemServer < Gem::TestCase
     specs_dir = File.join dir, 'specifications'
     FileUtils.mkdir_p specs_dir
 
-    open File.join(specs_dir, spec.spec_name), 'w' do |io|
+    File.open File.join(specs_dir, spec.spec_name), 'w' do |io|
       io.write spec.to_ruby
     end
 
@@ -475,7 +475,7 @@ class TestGemServer < Gem::TestCase
     specs_dir = File.join dir, 'specifications'
     FileUtils.mkdir_p specs_dir
 
-    open File.join(specs_dir, spec.spec_name), 'w' do |io|
+    File.open File.join(specs_dir, spec.spec_name), 'w' do |io|
       io.write spec.to_ruby
     end
 
@@ -502,7 +502,7 @@ class TestGemServer < Gem::TestCase
     specs_dir = File.join dir, 'specifications'
     FileUtils.mkdir_p specs_dir
 
-    open File.join(specs_dir, spec.spec_name), 'w' do |io|
+    File.open File.join(specs_dir, spec.spec_name), 'w' do |io|
       io.write spec.to_ruby
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.2.22
+  version: 3.2.23
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -63,7 +63,6 @@ files:
 - Manifest.txt
 - POLICIES.md
 - README.md
-- Rakefile
 - UPGRADING.md
 - bin/gem
 - bin/update_rubygems
@@ -772,7 +771,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.23
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.

data/Rakefile

@@ -1,401 +0,0 @@
-RakeFileUtils.verbose_flag = false
-
-require 'rubygems'
-require 'rubygems/package_task'
-require "rake/testtask"
-require 'psych'
-
-desc "Setup Rubygems dev environment"
-task :setup do
-  sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "install", "--gemfile=dev_gems.rb"
-end
-
-desc "Update Rubygems dev environment"
-task :update do |_, args|
-  sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", *args, "--gemfile=dev_gems.rb"
-end
-
-desc "Update the locked bundler version in dev environment"
-task :update_locked_bundler do |_, args|
-  sh "ruby", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=dev_gems.rb"
-  sh "ruby", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/test_gems.rb"
-  sh "ruby", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/rubocop_gems.rb"
-  sh "ruby", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/rubocop23_gems.rb"
-end
-
-desc "Setup git hooks"
-task :git_hooks do
-  sh "git config core.hooksPath .githooks"
-end
-
-Rake::TestTask.new do |t|
-  t.ruby_opts = %w[-w]
-  t.ruby_opts << '-rdevkit' if RbConfig::CONFIG['host_os'].include?('mingw')
-
-  t.libs << "test"
-  t.libs << "bundler/lib"
-
-  t.test_files = FileList['test/**/test_*.rb']
-end
-
-task :default => :test
-
-spec = Gem::Specification.load('rubygems-update.gemspec')
-v = spec.version
-
-require 'rdoc/task'
-
-RDoc::Task.new :rdoc => 'docs', :clobber_rdoc => 'clobber_docs' do |doc|
-  doc.main   = 'README.md'
-  doc.title  = "RubyGems #{v} API Documentation"
-
-  rdoc_files = Rake::FileList.new %w[lib bundler/lib]
-  rdoc_files.add %w[CHANGELOG.md 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
-
-  doc.rdoc_dir = 'doc'
-end
-
-load "util/automatiek.rake"
-
-# We currently ship Molinillo master branch as of
-# https://github.com/CocoaPods/Molinillo/commit/7cc27a355e861bdf593e2cde7bf1bca3daae4303
-Automatiek::RakeTask.new("molinillo") do |lib|
-  lib.version = "master"
-  lib.download = { :github => "https://github.com/CocoaPods/Molinillo" }
-  lib.namespace = "Molinillo"
-  lib.prefix = "Gem::Resolver"
-  lib.vendor_lib = "lib/rubygems/resolver/molinillo"
-end
-
-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]
-
-# --------------------------------------------------------------------
-# Creating a release
-
-task :prerelease => %w[clobber test bundler:build_metadata check_deprecations]
-task :postrelease => %w[bundler:build_metadata:clean upload guides:publish blog:publish]
-
-desc "Check for deprecated methods with expired deprecation horizon"
-task :check_deprecations do
-  if v.segments[1] == 0 && v.segments[2] == 0
-    sh("util/rubocop -r ./util/cops/deprecations --only Rubygems/Deprecations")
-  else
-    puts "Skipping deprecation checks since not releasing a major version."
-  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 --no-document pkg/rubygems-update-#{v}.gem --backtrace && update_rubygems --no-document --backtrace"
-end
-
-desc "Clears previously built package"
-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
-  sh "gem push pkg/rubygems-update-#{v}.gem"
-  Rake::Task["postrelease"].invoke
-end
-
-Gem::PackageTask.new(spec) {}
-
-Rake::Task["package"].enhance ["pkg/rubygems-#{v}.tgz", "pkg/rubygems-#{v}.zip"]
-
-file "pkg/rubygems-#{v}" => "pkg/rubygems-update-#{v}" do |t|
-  require 'find'
-
-  dest_root = File.expand_path t.name
-
-  cd t.source do
-    Find.find '.' do |file|
-      dest = File.expand_path file, dest_root
-
-      if File.directory? file
-        mkdir_p dest
-      else
-        rm_f dest
-        safe_ln file, dest
-      end
-    end
-  end
-end
-
-file "pkg/rubygems-#{v}.zip" => "pkg/rubygems-#{v}" do
-  cd 'pkg' do
-    if Gem.win_platform?
-      sh "7z a rubygems-#{v}.zip rubygems-#{v}"
-    else
-      sh "zip -q -r rubygems-#{v}.zip rubygems-#{v}"
-    end
-  end
-end
-
-file "pkg/rubygems-#{v}.tgz" => "pkg/rubygems-#{v}" do
-  cd 'pkg' do
-    if Gem.win_platform? && RUBY_VERSION < '2.4'
-      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 --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
-  require "aws-sdk-s3"
-
-  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}", acl: 'public-read')
-  end
-end
-
-desc "Upload release to rubygems.org"
-task :upload => %w[upload_to_github upload_to_s3]
-
-directory '../guides.rubygems.org' do
-  sh 'git', 'clone',
-     'git@github.com:rubygems/guides.git',
-     '../guides.rubygems.org'
-end
-
-namespace 'guides' do
-  task 'pull' => %w[../guides.rubygems.org] do
-    chdir '../guides.rubygems.org' do
-      sh 'git', 'pull'
-    end
-  end
-
-  task 'update' => %w[../guides.rubygems.org] do
-    lib_dir = File.join Dir.pwd, 'lib'
-
-    chdir '../guides.rubygems.org' do
-      ruby '-I', lib_dir, '-S', 'rake', 'command_guide'
-      ruby '-I', lib_dir, '-S', 'rake', 'spec_guide'
-    end
-  end
-
-  task 'commit' => %w[../guides.rubygems.org] do
-    chdir '../guides.rubygems.org' do
-      begin
-        sh 'git', 'diff', '--quiet'
-      rescue
-        sh 'git', 'commit', 'command-reference.md', 'specification-reference.md',
-           '-m', "Rebuild for RubyGems #{v}"
-      end
-    end
-  end
-
-  task 'push' => %w[../guides.rubygems.org] do
-    chdir '../guides.rubygems.org' do
-      sh 'git', 'push'
-    end
-  end
-
-  desc 'Updates and publishes the guides for the just-released RubyGems'
-  task 'publish'
-
-  task 'publish' => %w[
-    guides:pull
-    guides:update
-    guides:commit
-    guides:push
-  ]
-end
-
-directory '../blog.rubygems.org' do
-  sh 'git', 'clone',
-     'git@github.com:rubygems/rubygems.github.io.git',
-     '../blog.rubygems.org'
-end
-
-namespace 'blog' do
-  date = Time.now.strftime '%Y-%m-%d'
-  post_page = "_posts/#{date}-#{v}-released.md"
-  checksums = ''
-
-  task 'checksums' => 'package' do
-    require 'digest'
-    Dir['pkg/*{tgz,zip,gem}'].map do |file|
-      digest = Digest::SHA256.new
-
-      open file, 'rb' do |io|
-        while chunk = io.read(65536) do
-          digest.update chunk
-        end
-      end
-
-      checksums << "* #{File.basename(file)}  \n"
-      checksums << "  #{digest.hexdigest}\n"
-    end
-  end
-
-  task 'pull' => %w[../blog.rubygems.org] do
-    chdir '../blog.rubygems.org' do
-      sh 'git', 'pull'
-    end
-  end
-
-  path = File.join '../blog.rubygems.org', post_page
-
-  task 'update' => [path]
-
-  file path => 'checksums' do
-    name  = `git config --get user.name`.strip
-    email = `git config --get user.email`.strip
-
-    require_relative "util/changelog"
-    history = Changelog.for_rubygems(v.to_s)
-
-    require 'tempfile'
-
-    Tempfile.open 'blog_post' do |io|
-      io.write <<-ANNOUNCEMENT
----
-title: #{v} Released
-layout: post
-author: #{name}
-author_email: #{email}
----
-
-RubyGems #{v} includes #{history.change_types_for_blog}.
-
-To update to the latest RubyGems you can run:
-
-    gem update --system
-
-To install RubyGems by hand see the [Download RubyGems][download] page.
-
-#{history.release_notes_for_blog.join("\n")}
-
-SHA256 Checksums:
-
-#{checksums}
-
-[download]: https://rubygems.org/pages/download
-
-      ANNOUNCEMENT
-
-      io.flush
-
-      sh(ENV['EDITOR'] || 'vim', io.path)
-
-      FileUtils.cp io.path, path
-    end
-  end
-
-  task 'commit' => %w[../blog.rubygems.org] do
-    chdir '../blog.rubygems.org' do
-      sh 'git', 'add', post_page
-      sh 'git', 'commit', post_page,
-         '-m', "Added #{v} release announcement"
-    end
-  end
-
-  task 'push' => %w[../blog.rubygems.org] do
-    chdir '../blog.rubygems.org' do
-      sh 'git', 'push'
-    end
-  end
-
-  desc 'Updates and publishes the blog for the just-released RubyGems'
-  task 'publish' => %w[
-    blog:pull
-    blog:update
-    blog:commit
-    blog:push
-  ]
-end
-
-# Misc Tasks ---------------------------------------------------------
-
-module Rubygems
-  class ProjectFiles
-    def self.all
-      files = []
-      exclude = %r{\A(?:\.|dev_gems|bundler/(?!lib|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
-      end
-
-      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) }
-end
-
-desc "Check the manifest is up to date"
-task :check_manifest do
-  if File.read("Manifest.txt").split != Rubygems::ProjectFiles.all
-    abort "Manifest is out of date. Run `rake update_manifest` to sync it"
-  end
-end
-
-desc "Update License list from SPDX.org"
-task :update_licenses do
-  load "util/generate_spdx_license_list.rb"
-end
-
-namespace :bundler do
-  task :build_metadata do
-    chdir('bundler') { sh "rake build_metadata" }
-  end
-
-  namespace :build_metadata do
-    task :clean do
-      chdir('bundler') { sh "rake build_metadata:clean" }
-    end
-  end
-end