Rakefile in rubygems-update-3.2.15 vs Rakefile in rubygems-update-3.2.16

@@ -5,22 +5,24 @@
 require "rake/testtask"
 require 'psych'
 
 desc "Setup Rubygems dev environment"
 task :setup do
-  sh "ruby", "bundler/bin/bundle", "install", "--gemfile=dev_gems.rb"
+  sh "ruby", "bundler/spec/support/bundle.rb", "install", "--gemfile=dev_gems.rb"
 end
 
 desc "Update Rubygems dev environment"
 task :update do |_, args|
-  sh "ruby", "bundler/bin/bundle", "update", *args, "--gemfile=dev_gems.rb"
+  sh "ruby", "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/bin/bundle", "update", "--bundler", "--gemfile=dev_gems.rb"
-  sh "ruby", "bundler/bin/bundle", "update", "--bundler", "--gemfile=bundler/test_gems.rb"
+  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"
@@ -240,18 +242,15 @@
   end
 
   desc 'Updates and publishes the guides for the just-released RubyGems'
   task 'publish'
 
-  on_master = `git branch --list master`.strip == '* master'
-  on_master = true if ENV['FORCE']
-
   task 'publish' => %w[
     guides:pull
     guides:update
     guides:commit
     guides:push
-  ] if on_master
+  ]
 end
 
 directory '../blog.rubygems.org' do
   sh 'git', 'clone',
      '[e-mail]:rubygems/rubygems.github.com.git',