util/rubocop -A --only Style/SymbolProc

61 files changed, 239 insertions, 295 deletions

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index db9c73c248..5a73cfc9ad 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -747,13 +747,9 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # Safely read a file in binary mode on all platforms.
 
   def self.read_binary(path)
-    open_file(path, "rb+") do |io|
-      io.read
-    end
+    open_file(path, "rb+", &:read)
   rescue Errno::EACCES, Errno::EROFS
-    open_file(path, "rb") do |io|
-      io.read
-    end
+    open_file(path, "rb", &:read)
   end
 
   ##
diff --git a/lib/rubygems/available_set.rb b/lib/rubygems/available_set.rb
index 553640c643..1606bc7016 100644
--- a/lib/rubygems/available_set.rb
+++ b/lib/rubygems/available_set.rb
@@ -69,7 +69,7 @@ class Gem::AvailableSet
   end
 
   def all_specs
-    @set.map {|t| t.spec }
+    @set.map(&:spec)
   end
 
   def match_platform!
diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb
index ce057af440..896bc95745 100644
--- a/lib/rubygems/command.rb
+++ b/lib/rubygems/command.rb
@@ -19,9 +19,7 @@ require_relative "user_interaction"
 class Gem::Command
   include Gem::UserInteraction
 
-  Gem::OptionParser.accept Symbol do |value|
-    value.to_sym
-  end
+  Gem::OptionParser.accept Symbol, &:to_sym
 
   ##
   # The name of the command.
diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
index f8b9796b37..5ceaf1c63c 100644
--- a/lib/rubygems/command_manager.rb
+++ b/lib/rubygems/command_manager.rb
@@ -140,7 +140,7 @@ class Gem::CommandManager
   # Return a sorted list of all command names as strings.
 
   def command_names
-    @commands.keys.collect {|key| key.to_s }.sort
+    @commands.keys.collect(&:to_s).sort
   end
 
   ##
diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb
index 0f53227d9a..91e8e4730a 100644
--- a/lib/rubygems/commands/cleanup_command.rb
+++ b/lib/rubygems/commands/cleanup_command.rb
@@ -74,7 +74,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
       until done do
         clean_gems
 
-        this_set = @gems_to_cleanup.map {|spec| spec.full_name }.sort
+        this_set = @gems_to_cleanup.map(&:full_name).sort
 
         done = this_set.empty? || last_set == this_set
 
@@ -87,7 +87,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
     say "Clean up complete"
 
     verbose do
-      skipped = @default_gems.map {|spec| spec.full_name }
+      skipped = @default_gems.map(&:full_name)
 
       "Skipped default gems: #{skipped.join ", "}"
     end
@@ -130,9 +130,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
       @primary_gems[spec.name].version != spec.version
     end
 
-    default_gems, gems_to_cleanup = gems_to_cleanup.partition do |spec|
-      spec.default_gem?
-    end
+    default_gems, gems_to_cleanup = gems_to_cleanup.partition(&:default_gem?)
 
     uninstall_from = options[:user_install] ? Gem.user_dir : @original_home
 
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
index a5870e9106..b258cd3349 100644
--- a/lib/rubygems/commands/dependency_command.rb
+++ b/lib/rubygems/commands/dependency_command.rb
@@ -90,7 +90,7 @@ use with other commands.
   def display_pipe(specs) # :nodoc:
     specs.each do |spec|
       unless spec.dependencies.empty?
-        spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
+        spec.dependencies.sort_by(&:name).each do |dep|
           say "#{dep.name} --version '#{dep.requirement}'"
         end
       end
@@ -152,7 +152,7 @@ use with other commands.
     response = String.new
     response << "  " * level + "Gem #{spec.full_name}\n"
     unless spec.dependencies.empty?
-      spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
+      spec.dependencies.sort_by(&:name).each do |dep|
         response << "  " * level + "  #{dep}\n"
       end
     end
diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
index a64c3e128d..68f0b44dad 100644
--- a/lib/rubygems/commands/help_command.rb
+++ b/lib/rubygems/commands/help_command.rb
@@ -323,7 +323,7 @@ platform.
 
     margin_width = 4
 
-    desc_width = @command_manager.command_names.map {|n| n.size }.max + 4
+    desc_width = @command_manager.command_names.map(&:size).max + 4
 
     summary_width = 80 - margin_width - desc_width
     wrap_indent = " " * (margin_width + desc_width)
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 6f0f7be7c9..e64f056cb0 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -113,9 +113,7 @@ extensions will be restored.
         spec.extensions && !spec.extensions.empty?
       end
     elsif options[:only_missing_extensions]
-      Gem::Specification.select do |spec|
-        spec.missing_extensions?
-      end
+      Gem::Specification.select(&:missing_extensions?)
     else
       get_all_gem_names.sort.map do |gem_name|
         Gem::Specification.find_all_by_name(gem_name, options[:version]).reverse
diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb
index fc2fb49ceb..5bc68efa3a 100644
--- a/lib/rubygems/commands/specification_command.rb
+++ b/lib/rubygems/commands/specification_command.rb
@@ -137,7 +137,7 @@ Specific fields in the specification can be extracted in YAML format:
     end
 
     unless options[:all]
-      specs = [specs.max_by {|s| s.version }]
+      specs = [specs.max_by(&:version)]
     end
 
     specs.each do |s|
diff --git a/lib/rubygems/commands/uninstall_command.rb b/lib/rubygems/commands/uninstall_command.rb
index aa05cda2c8..74c11dd64b 100644
--- a/lib/rubygems/commands/uninstall_command.rb
+++ b/lib/rubygems/commands/uninstall_command.rb
@@ -137,7 +137,7 @@ that is a dependency of an existing gem.  You can use the
   end
 
   def uninstall_all
-    specs = Gem::Specification.reject {|spec| spec.default_gem? }
+    specs = Gem::Specification.reject(&:default_gem?)
 
     specs.each do |spec|
       options[:version] = spec.version
diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb
index 314571dee6..cf619fa744 100644
--- a/lib/rubygems/commands/unpack_command.rb
+++ b/lib/rubygems/commands/unpack_command.rb
@@ -154,7 +154,7 @@ command help for an example.
 
     specs = dependency.matching_specs
 
-    selected = specs.max_by {|s| s.version }
+    selected = specs.max_by(&:version)
 
     return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless
       selected
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb
index 837972a8e7..14a9cb76f8 100644
--- a/lib/rubygems/commands/update_command.rb
+++ b/lib/rubygems/commands/update_command.rb
@@ -119,7 +119,7 @@ command to remove old versions.
     updated = update_gems gems_to_update
 
     installed_names = highest_installed_gems.keys
-    updated_names = updated.map {|spec| spec.name }
+    updated_names = updated.map(&:name)
     not_updated_names = options[:args].uniq - updated_names
     not_installed_names = not_updated_names - installed_names
     up_to_date_names = not_updated_names - not_installed_names
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index 00467443ac..21ce07c21e 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -476,7 +476,7 @@ if you believe they were disclosed to a third party.
     yaml_hash[:ssl_client_cert] =
       @hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
 
-    keys = yaml_hash.keys.map {|key| key.to_s }
+    keys = yaml_hash.keys.map(&:to_s)
     keys << "debug"
     re = Regexp.union(*keys)
 
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index d92b3429e4..5f768f3b23 100644
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -112,9 +112,7 @@ module Kernel
       if found_specs.empty?
         found_specs = Gem::Specification.find_in_unresolved_tree path
 
-        found_specs.each do |found_spec|
-          found_spec.activate
-        end
+        found_specs.each(&:activate)
 
       # We found +path+ directly in an unresolved gem. Now we figure out, of
       # the possible found specs, which one we should activate.
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
index f8143de64a..5d6aa63d79 100644
--- a/lib/rubygems/dependency.rb
+++ b/lib/rubygems/dependency.rb
@@ -325,7 +325,7 @@ class Gem::Dependency
   def to_spec
     matches = self.to_specs.compact
 
-    active = matches.find {|spec| spec.activated? }
+    active = matches.find(&:activated?)
     return active if active
 
     unless prerelease?
diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb
index eaf6702177..e76dbe7c1c 100644
--- a/lib/rubygems/dependency_list.rb
+++ b/lib/rubygems/dependency_list.rb
@@ -104,7 +104,7 @@ class Gem::DependencyList
   end
 
   def inspect # :nodoc:
-    "%s %p>" % [super[0..-2], map {|s| s.full_name }]
+    "%s %p>" % [super[0..-2], map(&:full_name)]
   end
 
   ##
diff --git a/lib/rubygems/doctor.rb b/lib/rubygems/doctor.rb
index 600b6f4f55..f1f1d34403 100644
--- a/lib/rubygems/doctor.rb
+++ b/lib/rubygems/doctor.rb
@@ -52,7 +52,7 @@ class Gem::Doctor
   # Specs installed in this gem repository
 
   def installed_specs # :nodoc:
-    @installed_specs ||= Gem::Specification.map {|s| s.full_name }
+    @installed_specs ||= Gem::Specification.map(&:full_name)
   end
 
   ##
diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb
index b95a56f03f..24d2eec918 100644
--- a/lib/rubygems/install_update_options.rb
+++ b/lib/rubygems/install_update_options.rb
@@ -154,7 +154,7 @@ module Gem::InstallUpdateOptions
                "Omit the named groups (comma separated)",
                "when installing from a gem dependencies",
                "file") do |v,_o|
-      options[:without_groups].concat v.map {|without| without.intern }
+      options[:without_groups].concat v.map(&:intern)
     end
 
     add_option(:"Install/Update", "--default",
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index 9089771283..c8ac76db2b 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -588,7 +588,7 @@ class Gem::Installer
 
   def shebang(bin_file_name)
     path = File.join gem_dir, spec.bindir, bin_file_name
-    first_line = File.open(path, "rb") {|file| file.gets } || ""
+    first_line = File.open(path, "rb", &:gets) || ""
 
     if first_line.start_with?("#!")
       # Preserve extra words on shebang line, like "-w".  Thanks RPA.
diff --git a/lib/rubygems/name_tuple.rb b/lib/rubygems/name_tuple.rb
index 8e39fc3a4f..8754ac6c77 100644
--- a/lib/rubygems/name_tuple.rb
+++ b/lib/rubygems/name_tuple.rb
@@ -31,7 +31,7 @@ class Gem::NameTuple
   # [name, version, platform] tuples.
 
   def self.to_basic(list)
-    list.map {|t| t.to_a }
+    list.map(&:to_a)
   end
 
   ##
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index 0e5905e8bf..b33ab1ab2f 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -571,10 +571,10 @@ EOM
         )
 
       @spec.signing_key = nil
-      @spec.cert_chain = @signer.cert_chain.map {|cert| cert.to_s }
+      @spec.cert_chain = @signer.cert_chain.map(&:to_s)
     else
       @signer = Gem::Security::Signer.new nil, nil, passphrase
-      @spec.cert_chain = @signer.cert_chain.map {|cert| cert.to_pem } if
+      @spec.cert_chain = @signer.cert_chain.map(&:to_pem) if
         @signer.cert_chain
     end
   end
diff --git a/lib/rubygems/query_utils.rb b/lib/rubygems/query_utils.rb
index 859d231e61..9a6a736461 100644
--- a/lib/rubygems/query_utils.rb
+++ b/lib/rubygems/query_utils.rb
@@ -242,7 +242,7 @@ module Gem::QueryUtils
 
     list =
       if platforms.empty? || options[:details]
-        name_tuples.map {|n| n.version }.uniq
+        name_tuples.map(&:version).uniq
       else
         platforms.sort.reverse.map do |version, pls|
           out = version.to_s
diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
index 708b93209f..a3cb36e951 100644
--- a/lib/rubygems/remote_fetcher.rb
+++ b/lib/rubygems/remote_fetcher.rb
@@ -324,7 +324,7 @@ class Gem::RemoteFetcher
   end
 
   def close_all
-    @pools.each_value {|pool| pool.close_all }
+    @pools.each_value(&:close_all)
   end
 
   private
diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb
index 38f8db4ce0..b7ad92f5c6 100644
--- a/lib/rubygems/request/connection_pools.rb
+++ b/lib/rubygems/request/connection_pools.rb
@@ -28,7 +28,7 @@ class Gem::Request::ConnectionPools # :nodoc:
   end
 
   def close_all
-    @pools.each_value {|pool| pool.close_all }
+    @pools.each_value(&:close_all)
   end
 
   private
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
index f1af47618b..270bd9351e 100644
--- a/lib/rubygems/request_set.rb
+++ b/lib/rubygems/request_set.rb
@@ -375,7 +375,7 @@ class Gem::RequestSet
       q.text "sets:"
 
       q.breakable
-      q.pp @sets.map {|set| set.class }
+      q.pp @sets.map(&:class)
     end
   end
 
@@ -429,7 +429,7 @@ class Gem::RequestSet
   end
 
   def specs
-    @specs ||= @requests.map {|r| r.full_spec }
+    @specs ||= @requests.map(&:full_spec)
   end
 
   def specs_in(dir)
diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb
index 7ec9500406..40f06915db 100644
--- a/lib/rubygems/request_set/lockfile.rb
+++ b/lib/rubygems/request_set/lockfile.rb
@@ -105,7 +105,7 @@ class Gem::RequestSet::Lockfile
       out << "  remote: #{group}"
       out << "  specs:"
 
-      requests.sort_by {|request| request.name }.each do |request|
+      requests.sort_by(&:name).each do |request|
         next if request.spec.name == "bundler"
         platform = "-#{request.spec.platform}" unless
           Gem::Platform::RUBY == request.spec.platform
@@ -137,10 +137,10 @@ class Gem::RequestSet::Lockfile
       out << "  revision: #{revision}"
       out << "  specs:"
 
-      requests.sort_by {|request| request.name }.each do |request|
+      requests.sort_by(&:name).each do |request|
         out << "    #{request.name} (#{request.version})"
 
-        dependencies = request.spec.dependencies.sort_by {|dep| dep.name }
+        dependencies = request.spec.dependencies.sort_by(&:name)
         dependencies.each do |dep|
           out << "      #{dep.name}#{dep.requirement.for_lockfile}"
         end
@@ -184,7 +184,7 @@ class Gem::RequestSet::Lockfile
 
     platforms = requests.map {|request| request.spec.platform }.uniq
 
-    platforms = platforms.sort_by {|platform| platform.to_s }
+    platforms = platforms.sort_by(&:to_s)
 
     platforms.each do |platform|
       out << "  #{platform}"
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb
index 76d1e9d0cc..da67b79520 100644
--- a/lib/rubygems/resolver.rb
+++ b/lib/rubygems/resolver.rb
@@ -114,7 +114,7 @@ class Gem::Resolver
   def explain(stage, *data) # :nodoc:
     return unless DEBUG_RESOLVER
 
-    d = data.map {|x| x.pretty_inspect }.join(", ")
+    d = data.map(&:pretty_inspect).join(", ")
     $stderr.printf "%10s %s\n", stage.to_s.upcase, d
   end
 
diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb
index 226da1e1e0..1392a6c006 100644
--- a/lib/rubygems/resolver/composed_set.rb
+++ b/lib/rubygems/resolver/composed_set.rb
@@ -43,7 +43,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   end
 
   def errors
-    @errors + @sets.map {|set| set.errors }.flatten
+    @errors + @sets.map(&:errors).flatten
   end
 
   ##
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb
index fa0d3f089e..aec0f2da0a 100644
--- a/lib/rubygems/resolver/conflict.rb
+++ b/lib/rubygems/resolver/conflict.rb
@@ -54,7 +54,7 @@ class Gem::Resolver::Conflict
     activated   = @activated.spec.full_name
     dependency  = @failed_dep.dependency
     requirement = dependency.requirement
-    alternates  = dependency.matching_specs.map {|spec| spec.full_name }
+    alternates  = dependency.matching_specs.map(&:full_name)
 
     unless alternates.empty?
       matching = <<-MATCHING.chomp
diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb
index 4e794c2ea5..ad77a86f1a 100644
--- a/lib/rubygems/resolver/installer_set.rb
+++ b/lib/rubygems/resolver/installer_set.rb
@@ -184,7 +184,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   end
 
   def inspect # :nodoc:
-    always_install = @always_install.map {|s| s.full_name }
+    always_install = @always_install.map(&:full_name)
 
     "#<%s domain: %s specs: %p always install: %p>" % [
       self.class, @domain, @specs.keys, always_install
diff --git a/lib/rubygems/resolver/lock_set.rb b/lib/rubygems/resolver/lock_set.rb
index b1a5433cb5..b8b8e03df3 100644
--- a/lib/rubygems/resolver/lock_set.rb
+++ b/lib/rubygems/resolver/lock_set.rb
@@ -74,7 +74,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
       q.text "specs:"
 
       q.breakable
-      q.pp @specs.map {|spec| spec.full_name }
+      q.pp @specs.map(&:full_name)
     end
   end
 end
diff --git a/lib/rubygems/source/local.rb b/lib/rubygems/source/local.rb
index e8553a4289..0007b39bee 100644
--- a/lib/rubygems/source/local.rb
+++ b/lib/rubygems/source/local.rb
@@ -92,7 +92,7 @@ class Gem::Source::Local < Gem::Source
       end
     end
 
-    found.max_by {|s| s.version }
+    found.max_by(&:version)
   end
 
   def fetch_spec(name) # :nodoc:
diff --git a/lib/rubygems/spec_fetcher.rb b/lib/rubygems/spec_fetcher.rb
index ce58b24e7d..86eee5bcda 100644
--- a/lib/rubygems/spec_fetcher.rb
+++ b/lib/rubygems/spec_fetcher.rb
@@ -249,7 +249,7 @@ class Gem::SpecFetcher
 
   def tuples_for(source, type, gracefully_ignore=false) # :nodoc:
     @caches[type][source.uri] ||=
-      source.load_specs(type).sort_by {|tup| tup.name }
+      source.load_specs(type).sort_by(&:name)
   rescue Gem::RemoteFetcher::FetchError
     raise unless gracefully_ignore
     []
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index 8d2a14ffee..d1079cc42c 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -174,7 +174,7 @@ class Gem::Specification < Gem::BasicSpecification
     end
   end
 
-  @@attributes = @@default_value.keys.sort_by {|s| s.to_s }
+  @@attributes = @@default_value.keys.sort_by(&:to_s)
   @@array_attributes = @@default_value.reject {|_k,v| v != [] }.keys
   @@nil_attributes, @@non_nil_attributes = @@default_value.keys.partition do |k|
     @@default_value[k].nil?
@@ -857,7 +857,7 @@ class Gem::Specification < Gem::BasicSpecification
     installed_stubs = installed_stubs(Gem::Specification.dirs, pattern)
     installed_stubs.select! {|s| Gem::Platform.match_spec? s } if match_platform
     stubs = installed_stubs + default_stubs(pattern)
-    stubs = stubs.uniq {|stub| stub.full_name }
+    stubs = stubs.uniq(&:full_name)
     _resort!(stubs)
     stubs
   end
@@ -1084,7 +1084,7 @@ class Gem::Specification < Gem::BasicSpecification
   end
 
   def self.unresolved_specs
-    unresolved_deps.values.map {|dep| dep.to_specs }.flatten
+    unresolved_deps.values.map(&:to_specs).flatten
   end
   private_class_method :unresolved_specs
 
@@ -1143,7 +1143,7 @@ class Gem::Specification < Gem::BasicSpecification
       result[spec.name] = spec
     end
 
-    result.map(&:last).flatten.sort_by {|tup| tup.name }
+    result.map(&:last).flatten.sort_by(&:name)
   end
 
   ##
@@ -1269,7 +1269,7 @@ class Gem::Specification < Gem::BasicSpecification
 
   def self.reset
     @@dirs = nil
-    Gem.pre_reset_hooks.each {|hook| hook.call }
+    Gem.pre_reset_hooks.each(&:call)
     clear_specs
     clear_load_cache
     unresolved = unresolved_deps
@@ -1288,7 +1288,7 @@ class Gem::Specification < Gem::BasicSpecification
       warn "Please report a bug if this causes problems."
       unresolved.clear
     end
-    Gem.post_reset_hooks.each {|hook| hook.call }
+    Gem.post_reset_hooks.each(&:call)
   end
 
   # DOC: This method needs documented or nodoc'd
@@ -1600,7 +1600,7 @@ class Gem::Specification < Gem::BasicSpecification
   def build_args
     if File.exist? build_info_file
       build_info = File.readlines build_info_file
-      build_info = build_info.map {|x| x.strip }
+      build_info = build_info.map(&:strip)
       build_info.delete ""
       build_info
     else
@@ -1824,7 +1824,7 @@ class Gem::Specification < Gem::BasicSpecification
   # Returns all specs that matches this spec's runtime dependencies.
 
   def dependent_specs
-    runtime_dependencies.map {|dep| dep.to_specs }.flatten
+    runtime_dependencies.map(&:to_specs).flatten
   end
 
   ##
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
index d5465b32fe..5c9a59f13e 100644
--- a/lib/rubygems/uninstaller.rb
+++ b/lib/rubygems/uninstaller.rb
@@ -98,9 +98,7 @@ class Gem::Uninstaller
       raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
     end
 
-    default_specs, list = list.partition do |spec|
-      spec.default_gem?
-    end
+    default_specs, list = list.partition(&:default_gem?)
     warn_cannot_uninstall_default_gems(default_specs - list)
     @default_specs_matching_uninstall_params = default_specs
 
@@ -114,7 +112,7 @@ class Gem::Uninstaller
     if list.empty?
       return unless other_repo_specs.any?
 
-      other_repos = other_repo_specs.map {|spec| spec.base_dir }.uniq
+      other_repos = other_repo_specs.map(&:base_dir).uniq
 
       message = ["#{@gem} is not installed in GEM_HOME, try:"]
       message.concat other_repos.map {|repo|
@@ -126,7 +124,7 @@ class Gem::Uninstaller
       remove_all list
 
     elsif list.size > 1
-      gem_names = list.map {|gem| gem.full_name }
+      gem_names = list.map(&:full_name)
       gem_names << "All versions"
 
       say
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index cfca3d3fb2..ada24c0d10 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -1051,16 +1051,14 @@ Also, a list:
     unless Gem::RemoteFetcher === @fetcher
       v = Gem.marshal_version
 
-      specs = all.map {|spec| spec.name_tuple }
+      specs = all.map(&:name_tuple)
       s_zip = util_gzip Marshal.dump Gem::NameTuple.to_basic specs
 
-      latest_specs = latest.map do |spec|
-        spec.name_tuple
-      end
+      latest_specs = latest.map(&:name_tuple)
 
       l_zip = util_gzip Marshal.dump Gem::NameTuple.to_basic latest_specs
 
-      prerelease_specs = prerelease.map {|spec| spec.name_tuple }
+      prerelease_specs = prerelease.map(&:name_tuple)
       p_zip = util_gzip Marshal.dump Gem::NameTuple.to_basic prerelease_specs
 
       @fetcher.data["#{@gem_repo}specs.#{v}.gz"]            = s_zip
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 227dfac509..0ade26f5b6 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -97,7 +97,7 @@ class TestGem < Gem::TestCase
 
     installed = Gem.install "a", "= 1", :install_dir => gemhome2
 
-    assert_equal %w[a-1], installed.map {|spec| spec.full_name }
+    assert_equal %w[a-1], installed.map(&:full_name)
 
     assert_path_exist File.join(gemhome2, "gems", "a-1")
   end
@@ -116,7 +116,7 @@ class TestGem < Gem::TestCase
       rescue StandardError
         Gem.install "a", "= 1", :install_dir => gemhome2
       end
-    assert_equal %w[a-1], installed.map {|spec| spec.full_name }
+    assert_equal %w[a-1], installed.map(&:full_name)
   end
 
   def test_self_install_permissions
@@ -1377,7 +1377,7 @@ class TestGem < Gem::TestCase
       r.gem "b", "= 1"
     end
 
-    activated = Gem::Specification.map {|x| x.full_name }
+    activated = Gem::Specification.map(&:full_name)
 
     assert_equal %w[a-1 b-1 c-2], activated.sort
   end
diff --git a/test/rubygems/test_gem_available_set.rb b/test/rubygems/test_gem_available_set.rb
index 576f3f4221..cbaed1a686 100644
--- a/test/rubygems/test_gem_available_set.rb
+++ b/test/rubygems/test_gem_available_set.rb
@@ -36,12 +36,12 @@ class TestGemAvailableSet < Gem::TestCase
 
     dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-1], set.find_all(dep).map {|spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(dep).map(&:full_name)
 
     dep = Gem::Resolver::DependencyRequest.new dep("a", ">= 0.a"), nil
 
     assert_equal %w[a-1 a-1.a],
-                 set.find_all(dep).map {|spec| spec.full_name }.sort
+                 set.find_all(dep).map(&:full_name).sort
   end
 
   def test_match_platform
@@ -122,7 +122,7 @@ class TestGemAvailableSet < Gem::TestCase
     set.add a2a, @source
     set.add a2, @source
 
-    g = set.sorted.map {|t| t.spec }
+    g = set.sorted.map(&:spec)
 
     assert_equal [a3a, a2, a2a, a1, a1a], g
   end
diff --git a/test/rubygems/test_gem_commands_cert_command.rb b/test/rubygems/test_gem_commands_cert_command.rb
index 45051fbf91..5c2bc279c0 100644
--- a/test/rubygems/test_gem_commands_cert_command.rb
+++ b/test/rubygems/test_gem_commands_cert_command.rb
@@ -731,12 +731,12 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     ]
 
     assert_equal [PUBLIC_CERT.to_pem, ALTERNATE_CERT.to_pem],
-                 @cmd.options[:add].map {|cert| cert.to_pem }
+                 @cmd.options[:add].map(&:to_pem)
 
     assert_equal %w[nobody example], @cmd.options[:remove]
 
     assert_equal %w[nobody@example other@example],
-                 @cmd.options[:build].map {|name| name.to_s }
+                 @cmd.options[:build].map(&:to_s)
 
     assert_equal ["", "example"], @cmd.options[:list]
   end
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
index 0c93244f92..63caa3d42d 100644
--- a/test/rubygems/test_gem_commands_install_command.rb
+++ b/test/rubygems/test_gem_commands_install_command.rb
@@ -43,7 +43,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_explicit_version_includes_prerelease
@@ -65,7 +65,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
       end
     end
 
-    assert_equal %w[a-2.a], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2.a], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_local
@@ -91,7 +91,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
 
     assert_match "1 gem installed", @ui.output
   end
@@ -182,7 +182,7 @@ ERROR:  Could not find a valid gem 'bar' (= 0.5) (required by 'foo' (>= 0)) in a
       end
     end
 
-    assert_equal %w[a-2 b-2.a c-3], @cmd.installed_specs.map {|spec| spec.full_name }.sort
+    assert_equal %w[a-2 b-2.a c-3], @cmd.installed_specs.map(&:full_name).sort
 
     assert_match "3 gems installed", @ui.output
   end
@@ -465,7 +465,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-1], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-1], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_prerelease_wins_over_previous_ver
@@ -483,7 +483,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2.a], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2.a], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_with_version_specified_by_colon
@@ -500,7 +500,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-1], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-1], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_prerelease_skipped_when_non_pre_available
@@ -518,7 +518,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_required_ruby_version
@@ -548,7 +548,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_required_ruby_version_upper_bound
@@ -569,7 +569,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2.0], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2.0], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_required_ruby_version_specific_not_met
@@ -607,7 +607,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-1.0], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-1.0], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_required_ruby_version_specific_prerelease_not_met
@@ -774,7 +774,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
 
     assert_match "1 gem installed", @ui.output
   end
@@ -794,7 +794,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
 
     assert_match "1 gem installed", @ui.output
   end
@@ -814,7 +814,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-1], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-1], @cmd.installed_specs.map(&:full_name)
     assert_match "1 gem installed", @ui.output
 
     a1_gemspec = File.join(@gemhome, "specifications", "a-1.gemspec")
@@ -868,7 +868,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-1], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-1], @cmd.installed_specs.map(&:full_name)
 
     assert_match "1 gem installed", @ui.output
 
@@ -902,7 +902,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2 b-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2 b-2], @cmd.installed_specs.map(&:full_name)
 
     assert_match "2 gems installed", @ui.output
   end
@@ -944,7 +944,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-1 b-1], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-1 b-1], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_execute_conservative
@@ -970,7 +970,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[b-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[b-2], @cmd.installed_specs.map(&:full_name)
 
     assert_equal "", @ui.error
     assert_match "1 gem installed", @ui.output
@@ -992,7 +992,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     @cmd.install_gem "a", ">= 0"
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|s| s.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
 
     assert done_installing, "documentation was not generated"
   end
@@ -1006,7 +1006,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     @cmd.install_gem "a", ">= 0"
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_install_gem_ignore_dependencies_remote_platform_local
@@ -1023,7 +1023,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     @cmd.install_gem "a", ">= 0"
 
-    assert_equal %W[a-3-#{local}], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %W[a-3-#{local}], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_install_gem_ignore_dependencies_specific_file
@@ -1037,7 +1037,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     @cmd.install_gem File.join(@tempdir, spec.file_name), nil
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|s| s.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
   end
 
   def test_parses_requirement_from_gemname
@@ -1107,7 +1107,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
 
     assert_match "1 gem installed", @ui.output
 
@@ -1132,7 +1132,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
 
     assert_match "1 gem installed", @ui.output
 
@@ -1159,7 +1159,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[], @cmd.installed_specs.map(&:full_name)
 
     assert_match "Using a (2)", @ui.output
     assert File.exist?("#{@gemdeps}.lock")
@@ -1183,7 +1183,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[], @cmd.installed_specs.map(&:full_name)
 
     assert_match "Using a (2)", @ui.output
     assert !File.exist?("#{@gemdeps}.lock")
@@ -1208,7 +1208,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[], @cmd.installed_specs.map(&:full_name)
 
     assert_match "Using a (1)", @ui.output
   end
@@ -1230,7 +1230,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
+    assert_equal %w[a-2], @cmd.installed_specs.map(&:full_name)
 
     assert_match "Installing a (2)", @ui.output
   end
@@ -1253,7 +1253,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    names = @cmd.installed_specs.map {|spec| spec.full_name }
+    names = @cmd.installed_specs.map(&:full_name)
 
     assert_equal %w[q-1.0 r-2.0], names
 
@@ -1280,7 +1280,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    names = @cmd.installed_specs.map {|spec| spec.full_name }
+    names = @cmd.installed_specs.map(&:full_name)
 
     assert_equal %w[r-2.0], names
 
@@ -1307,7 +1307,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    names = @cmd.installed_specs.map {|spec| spec.full_name }
+    names = @cmd.installed_specs.map(&:full_name)
 
     assert_equal %w[q-1.0 r-2.0], names
 
@@ -1339,7 +1339,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    names = @cmd.installed_specs.map {|spec| spec.full_name }
+    names = @cmd.installed_specs.map(&:full_name)
 
     assert_equal %w[q-1.0 r-2.0], names
 
@@ -1374,7 +1374,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
       end
     end
 
-    names = @cmd.installed_specs.map {|spec| spec.full_name }
+    names = @cmd.installed_specs.map(&:full_name)
 
     assert_equal %w[r-2.0], names
 
diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb
index 6882098c53..99cbb60df2 100644
--- a/test/rubygems/test_gem_commands_query_command.rb
+++ b/test/rubygems/test_gem_commands_query_command.rb
@@ -22,9 +22,7 @@ class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase
   include TestGemCommandsQueryCommandSetup
 
   def test_execute
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[-r]
 
@@ -45,9 +43,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_all
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[-r --all]
 
@@ -68,9 +64,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_all_prerelease
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[-r --all --prerelease]
 
@@ -310,9 +304,7 @@ pl (1)
   end
 
   def test_execute_local
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.options[:domain] = :local
 
@@ -333,9 +325,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_local_notty
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[]
 
@@ -355,9 +345,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_local_quiet
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.options[:domain] = :local
     Gem.configuration.verbose = false
@@ -376,9 +364,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_no_versions
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[-r --no-versions]
 
@@ -399,9 +385,7 @@ pl
   end
 
   def test_execute_notty
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[-r]
 
@@ -439,9 +423,7 @@ a (3.a)
   end
 
   def test_execute_prerelease_local
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[-l --prerelease]
 
@@ -461,9 +443,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_no_prerelease_local
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[-l --no-prerelease]
 
@@ -483,9 +463,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_remote
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.options[:domain] = :remote
 
@@ -506,9 +484,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_remote_notty
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[]
 
@@ -528,9 +504,7 @@ pl (1 i386-linux)
   end
 
   def test_execute_remote_quiet
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.options[:domain] = :remote
     Gem.configuration.verbose = false
@@ -569,9 +543,7 @@ pl (1 i386-linux)
 
   # Test for multiple args handling!
   def test_execute_multiple_args
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     @cmd.handle_options %w[a pl]
 
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
index 067eb309b1..5e59539ae4 100644
--- a/test/rubygems/test_gem_dependency_installer.rb
+++ b/test/rubygems/test_gem_dependency_installer.rb
@@ -156,7 +156,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name),
                  "sanity check"
 
     Dir.chdir @tempdir do
@@ -164,7 +164,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "e"
     end
 
-    assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 e-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_cache_dir
@@ -181,7 +181,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name)
 
     assert File.exist? File.join(@gemhome, "cache", @a1.file_name)
     assert File.exist? File.join(@gemhome, "cache", @b1.file_name)
@@ -206,7 +206,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "a", req("= 2")
     end
 
-    assert_equal %w[a-2], inst.installed_gems.map {|s| s.full_name },
+    assert_equal %w[a-2], inst.installed_gems.map(&:full_name),
                  "sanity check"
 
     FileUtils.rm File.join(@tempdir, a2.file_name)
@@ -217,7 +217,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     end
 
     assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name)
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
   end
 
   # This asserts that if a gem's dependency is satisfied by an
@@ -254,7 +254,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     end
 
     assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name)
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_dependency
@@ -277,7 +277,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name)
 
     assert done_installing_ran, "post installs hook was not run"
   end
@@ -297,7 +297,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_dependency_development_deep
@@ -317,7 +317,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "d"
     end
 
-    assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_dependency_development_shallow
@@ -337,7 +337,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "d"
     end
 
-    assert_equal %w[c-1 d-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[c-1 d-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_dependency_existing
@@ -353,7 +353,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_dependency_existing_extension
@@ -390,7 +390,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       Dir.chdir pwd
     end
 
-    assert_equal %w[f-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[f-1], inst.installed_gems.map(&:full_name)
 
     assert_path_exist e1.extension_dir
   end
@@ -410,7 +410,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "f"
     end
 
-    assert_equal %w[f-2], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[f-2], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_local
@@ -424,7 +424,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "a-1.gem"
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_local_prerelease
@@ -438,7 +438,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "a-1.a.gem"
     end
 
-    assert_equal %w[a-1.a], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1.a], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_local_dependency
@@ -454,7 +454,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b-1.gem"
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_local_dependency_installed
@@ -472,7 +472,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b-1.gem"
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_local_subdir
@@ -485,7 +485,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "gems/a-1.gem"
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_minimal_deps
@@ -511,7 +511,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b", req("= 1")
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name),
                  "sanity check"
 
     Dir.chdir @tempdir do
@@ -519,7 +519,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "e"
     end
 
-    assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 e-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_no_minimal_deps
@@ -545,7 +545,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b", req("= 1")
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name),
                  "sanity check"
 
     Dir.chdir @tempdir do
@@ -553,7 +553,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "e"
     end
 
-    assert_equal %w[a-1 b-2 e-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 b-2 e-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_no_document
@@ -603,7 +603,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_build_args
@@ -632,7 +632,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_install_dir
@@ -653,7 +653,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name)
 
     assert File.exist?(File.join(gemhome2, "specifications", @a1.spec_name))
     assert File.exist?(File.join(gemhome2, "cache", @a1.file_name))
@@ -677,7 +677,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name)
     a1, b1 = inst.installed_gems
 
     assert_equal a1.spec_file, a1.loaded_from
@@ -701,7 +701,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_domain_local
@@ -720,7 +720,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       assert_equal expected, e.message
     end
 
-    assert_equal [], inst.installed_gems.map {|s| s.full_name }
+    assert_equal [], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_domain_remote
@@ -736,7 +736,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :domain => :remote
     inst.install "a"
 
-    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_dual_repository
@@ -753,7 +753,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "a"
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name },
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name),
                  "sanity check"
 
     ENV["GEM_HOME"] = @gemhome
@@ -765,7 +765,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "b"
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_reinstall
@@ -800,7 +800,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install "a"
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_remote_dep
@@ -820,7 +820,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install dep
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_remote_platform_newer
@@ -853,7 +853,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :domain => :remote
     inst.install "a"
 
-    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_platform_is_ignored_when_a_file_is_specified
@@ -864,7 +864,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :domain => :local
     inst.install a_gem
 
-    assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map(&:full_name)
   end
 
   require "rubygems/openssl"
@@ -873,10 +873,10 @@ class TestGemDependencyInstaller < Gem::TestCase
     def test_install_security_policy
       util_setup_gems
 
-      data = File.open(@a1_gem, "rb") {|f| f.read }
+      data = File.open(@a1_gem, "rb", &:read)
       @fetcher.data["http://gems.example.com/gems/a-1.gem"] = data
 
-      data = File.open(@b1_gem, "rb") {|f| f.read }
+      data = File.open(@b1_gem, "rb", &:read)
       @fetcher.data["http://gems.example.com/gems/b-1.gem"] = data
 
       policy = Gem::Security::HighSecurity
@@ -889,7 +889,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       assert_equal "unsigned gems are not allowed by the High Security policy",
                    e.message
 
-      assert_equal %w[], inst.installed_gems.map {|s| s.full_name }
+      assert_equal %w[], inst.installed_gems.map(&:full_name)
     end
   end
 
@@ -911,32 +911,32 @@ class TestGemDependencyInstaller < Gem::TestCase
   def test_install_version
     util_setup_d
 
-    data = File.open(@d2_gem, "rb") {|f| f.read }
+    data = File.open(@d2_gem, "rb", &:read)
     @fetcher.data["http://gems.example.com/gems/d-2.gem"] = data
 
-    data = File.open(@d1_gem, "rb") {|f| f.read }
+    data = File.open(@d1_gem, "rb", &:read)
     @fetcher.data["http://gems.example.com/gems/d-1.gem"] = data
 
     inst = Gem::DependencyInstaller.new
 
     inst.install "d", "= 1"
 
-    assert_equal %w[d-1], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[d-1], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_version_default
     util_setup_d
 
-    data = File.open(@d2_gem, "rb") {|f| f.read }
+    data = File.open(@d2_gem, "rb", &:read)
     @fetcher.data["http://gems.example.com/gems/d-2.gem"] = data
 
-    data = File.open(@d1_gem, "rb") {|f| f.read }
+    data = File.open(@d1_gem, "rb", &:read)
     @fetcher.data["http://gems.example.com/gems/d-1.gem"] = data
 
     inst = Gem::DependencyInstaller.new
     inst.install "d"
 
-    assert_equal %w[d-2], inst.installed_gems.map {|s| s.full_name }
+    assert_equal %w[d-2], inst.installed_gems.map(&:full_name)
   end
 
   def test_install_legacy_spec_with_nil_required_ruby_version
@@ -1109,7 +1109,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
     request_set = inst.resolve_dependencies "b", req(">= 0")
 
-    requests = request_set.sorted_requests.map {|req| req.full_name }
+    requests = request_set.sorted_requests.map(&:full_name)
 
     assert_equal %w[a-1 b-1], requests
   end
@@ -1123,7 +1123,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :ignore_dependencies => true
     request_set = inst.resolve_dependencies "b", req(">= 0")
 
-    requests = request_set.sorted_requests.map {|req| req.full_name }
+    requests = request_set.sorted_requests.map(&:full_name)
 
     assert request_set.ignore_dependencies
 
@@ -1140,7 +1140,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
     request_set = inst.resolve_dependencies "a-1.gem", req(">= 0")
 
-    requests = request_set.sorted_requests.map {|req| req.full_name }
+    requests = request_set.sorted_requests.map(&:full_name)
 
     assert_equal %w[a-1], requests
   end
diff --git a/test/rubygems/test_gem_dependency_list.rb b/test/rubygems/test_gem_dependency_list.rb
index 0dca8f8c3a..3991fb4daa 100644
--- a/test/rubygems/test_gem_dependency_list.rb
+++ b/test/rubygems/test_gem_dependency_list.rb
@@ -52,7 +52,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[d-1 c-1 b-1 a-1], order.map {|s| s.full_name }
+    assert_equal %w[d-1 c-1 b-1 a-1], order.map(&:full_name)
   end
 
   def test_dependency_order_circle
@@ -61,7 +61,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[b-1 c-1 a-1], order.map {|s| s.full_name }
+    assert_equal %w[b-1 c-1 a-1], order.map(&:full_name)
   end
 
   def test_dependency_order_development
@@ -79,7 +79,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = deplist.dependency_order
 
-    assert_equal %w[g-1 a-1 f-1 e-1], order.map {|s| s.full_name },
+    assert_equal %w[g-1 a-1 f-1 e-1], order.map(&:full_name),
                  "development on"
 
     deplist2 = Gem::DependencyList.new
@@ -87,7 +87,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = deplist2.dependency_order
 
-    assert_equal %w[a-1 g-1 f-1 e-1], order.map {|s| s.full_name },
+    assert_equal %w[a-1 g-1 f-1 e-1], order.map(&:full_name),
                  "development off"
   end
 
@@ -99,7 +99,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map {|s| s.full_name },
+    assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map(&:full_name),
                  "deps of trimmed specs not included"
   end
 
@@ -108,7 +108,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[c-2 a-1], order.map {|s| s.full_name }
+    assert_equal %w[c-2 a-1], order.map(&:full_name)
   end
 
   def test_find_name
diff --git a/test/rubygems/test_gem_package_tar_reader_entry.rb b/test/rubygems/test_gem_package_tar_reader_entry.rb
index 06e9c38e27..3f0b8debf9 100644
--- a/test/rubygems/test_gem_package_tar_reader_entry.rb
+++ b/test/rubygems/test_gem_package_tar_reader_entry.rb
@@ -23,9 +23,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   def test_open
     io = TempIO.new @tar
     header = Gem::Package::TarHeader.from io
-    retval = Gem::Package::TarReader::Entry.open header, io do |entry|
-      entry.getc
-    end
+    retval = Gem::Package::TarReader::Entry.open header, io, &:getc
     assert_equal "a", retval
     assert_equal @tar.size, io.pos, "should have read to end of entry"
   ensure
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 4685afef6c..088acad841 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -336,9 +336,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   end
 
   def test_download_install_dir
-    a1_data = File.open @a1_gem, "rb" do |fp|
-      fp.read
-    end
+    a1_data = File.open @a1_gem, "rb", &:read
 
     fetcher = util_fuck_with_fetcher a1_data
 
diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
index 1e80028ccc..cf0cd8b38d 100644
--- a/test/rubygems/test_gem_request_set.rb
+++ b/test/rubygems/test_gem_request_set.rb
@@ -324,7 +324,7 @@ ruby "0"
     res = rs.resolve StaticSet.new([a, b])
     assert_equal 2, res.size
 
-    names = res.map {|s| s.full_name }.sort
+    names = res.map(&:full_name).sort
 
     assert_equal ["a-2", "b-2"], names
 
@@ -343,7 +343,7 @@ ruby "0"
     res = rs.resolve StaticSet.new([a, b, c])
     assert_equal 3, res.size
 
-    names = res.map {|s| s.full_name }.sort
+    names = res.map(&:full_name).sort
 
     assert_equal %w[a-1.b b-1.b c-1.1.b], names
   end
@@ -410,12 +410,12 @@ ruby "0"
     res = rs.resolve
     assert_equal 1, res.size
 
-    names = res.map {|s| s.full_name }.sort
+    names = res.map(&:full_name).sort
 
     assert_equal %w[a-1], names
 
     assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
-                 rs.sets.map {|set| set.class }
+                 rs.sets.map(&:class)
   end
 
   def test_resolve_ignore_dependencies
@@ -429,7 +429,7 @@ ruby "0"
     res = rs.resolve StaticSet.new([a, b])
     assert_equal 1, res.size
 
-    names = res.map {|s| s.full_name }.sort
+    names = res.map(&:full_name).sort
 
     assert_equal %w[a-2], names
   end
@@ -474,12 +474,12 @@ ruby "0"
     res = rs.resolve
     assert_equal 2, res.size
 
-    names = res.map {|s| s.full_name }.sort
+    names = res.map(&:full_name).sort
 
     assert_equal ["a-1", "b-2"], names
 
     assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
-                 rs.sets.map {|set| set.class }
+                 rs.sets.map(&:class)
   end
 
   def test_sorted_requests
@@ -492,7 +492,7 @@ ruby "0"
 
     rs.resolve StaticSet.new([a, b, c])
 
-    names = rs.sorted_requests.map {|s| s.full_name }
+    names = rs.sorted_requests.map(&:full_name)
     assert_equal %w[c-2 b-2 a-2], names
   end
 
@@ -521,14 +521,14 @@ ruby "0"
       installers << installer
     end
 
-    assert_equal %w[b-1 a-1], reqs.map {|req| req.full_name }
+    assert_equal %w[b-1 a-1], reqs.map(&:full_name)
     assert_equal %w[b-1 a-1],
                  installers.map {|installer| installer.spec.full_name }
 
     assert_path_exist File.join @gemhome, "specifications", "a-1.gemspec"
     assert_path_exist File.join @gemhome, "specifications", "b-1.gemspec"
 
-    assert_equal %w[b-1 a-1], installed.map {|s| s.full_name }
+    assert_equal %w[b-1 a-1], installed.map(&:full_name)
 
     assert done_installing_ran
   end
@@ -551,7 +551,7 @@ ruby "0"
     assert_path_exist File.join @tempdir, "specifications", "a-1.gemspec"
     assert_path_exist File.join @tempdir, "specifications", "b-1.gemspec"
 
-    assert_equal %w[b-1 a-1], installed.map {|s| s.full_name }
+    assert_equal %w[b-1 a-1], installed.map(&:full_name)
   end
 
   def test_install_into_development_shallow
@@ -583,7 +583,7 @@ ruby "0"
       assert_equal @tempdir, ENV["GEM_HOME"]
     end
 
-    assert_equal %w[a-1 b-1], installed.map {|s| s.full_name }.sort
+    assert_equal %w[a-1 b-1], installed.map(&:full_name).sort
   end
 
   def test_sorted_requests_development_shallow
@@ -608,7 +608,7 @@ ruby "0"
 
     rs.resolve StaticSet.new [a_spec, b_spec, c_spec]
 
-    assert_equal %w[b-1 a-1], rs.sorted_requests.map {|req| req.full_name }
+    assert_equal %w[b-1 a-1], rs.sorted_requests.map(&:full_name)
   end
 
   def test_tsort_each_child_development
@@ -637,7 +637,7 @@ ruby "0"
 
     deps = rs.enum_for(:tsort_each_child, a_req).to_a
 
-    assert_equal %w[b], deps.map {|dep| dep.name }
+    assert_equal %w[b], deps.map(&:name)
   end
 
   def test_tsort_each_child_development_shallow
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
index a8ecb8a50b..b8507291d1 100644
--- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb
+++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
@@ -493,7 +493,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
       groups = @gda.send :gem_group, "a", :group => :b, :groups => [:c, :d]
     end
 
-    assert_equal [:a, :b, :c, :d], groups.sort_by {|group| group.to_s }
+    assert_equal [:a, :b, :c, :d], groups.sort_by(&:to_s)
   end
 
   def test_gemspec
diff --git a/test/rubygems/test_gem_request_set_lockfile_parser.rb b/test/rubygems/test_gem_request_set_lockfile_parser.rb
index 69a3a328aa..942edec75b 100644
--- a/test/rubygems/test_gem_request_set_lockfile_parser.rb
+++ b/test/rubygems/test_gem_request_set_lockfile_parser.rb
@@ -93,7 +93,7 @@ DEPENDENCIES
 
     assert lockfile_set, "could not find a LockSet"
 
-    assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map(&:full_name)
   end
 
   def test_parse_dependencies
@@ -123,7 +123,7 @@ DEPENDENCIES
 
     assert lockfile_set, "could not find a LockSet"
 
-    assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map(&:full_name)
   end
 
   def test_parse_DEPENDENCIES_git
@@ -217,7 +217,7 @@ DEPENDENCIES
 
     assert lockfile_set, "found a LockSet"
 
-    assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map(&:full_name)
   end
 
   def test_parse_GEM_remote_multiple
@@ -245,7 +245,7 @@ DEPENDENCIES
 
     assert lockfile_set, "found a LockSet"
 
-    assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map(&:full_name)
 
     assert_equal %w[https://gems.example/ https://other.example/],
                  lockfile_set.specs.flat_map {|s| s.sources.map {|src| src.uri.to_s } }
@@ -283,7 +283,7 @@ DEPENDENCIES
 
     assert git_set, "could not find a GitSet"
 
-    assert_equal %w[a-2], git_set.specs.values.map {|s| s.full_name }
+    assert_equal %w[a-2], git_set.specs.values.map(&:full_name)
 
     assert_equal [dep("b", ">= 3"), dep("c")],
                  git_set.specs.values.first.dependencies
@@ -437,7 +437,7 @@ DEPENDENCIES
 
     assert vendor_set, "could not find a VendorSet"
 
-    assert_equal %w[a-1], vendor_set.specs.values.map {|s| s.full_name }
+    assert_equal %w[a-1], vendor_set.specs.values.map(&:full_name)
 
     spec = vendor_set.load_spec "a", nil, nil, nil
 
@@ -496,14 +496,14 @@ DEPENDENCIES
 
     assert lockfile_set, "could not find a LockSet"
 
-    assert_equal %w[a-2 b-3], lockfile_set.specs.map {|tuple| tuple.full_name }
+    assert_equal %w[a-2 b-3], lockfile_set.specs.map(&:full_name)
 
     expected = [
       Gem::Platform::RUBY,
       Gem::Platform.new("x86_64-linux"),
     ]
 
-    assert_equal expected, lockfile_set.specs.map {|tuple| tuple.platform }
+    assert_equal expected, lockfile_set.specs.map(&:platform)
 
     spec = lockfile_set.specs.first
 
diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb
index c849af04f3..435b01ed71 100644
--- a/test/rubygems/test_gem_resolver.rb
+++ b/test/rubygems/test_gem_resolver.rb
@@ -25,10 +25,10 @@ class TestGemResolver < Gem::TestCase
   def assert_resolves_to(expected, resolver)
     actual = resolver.resolve
 
-    exp = expected.sort_by {|s| s.full_name }
-    act = actual.map {|a| a.spec.spec }.sort_by {|s| s.full_name }
+    exp = expected.sort_by(&:full_name)
+    act = actual.map {|a| a.spec.spec }.sort_by(&:full_name)
 
-    msg = "Set of gems was not the same: #{exp.map {|x| x.full_name }.inspect} != #{act.map {|x| x.full_name }.inspect}"
+    msg = "Set of gems was not the same: #{exp.map(&:full_name).inspect} != #{act.map(&:full_name).inspect}"
 
     assert_equal exp, act, msg
   rescue Gem::DependencyResolutionError => e
@@ -104,7 +104,7 @@ class TestGemResolver < Gem::TestCase
 
     res.requests a1, act, reqs
 
-    assert_equal ["b (= 2)"], reqs.map {|req| req.to_s }
+    assert_equal ["b (= 2)"], reqs.map(&:to_s)
   end
 
   def test_requests_development
@@ -126,7 +126,7 @@ class TestGemResolver < Gem::TestCase
 
     res.requests spec, act, reqs
 
-    assert_equal ["b (= 2)"], reqs.map {|req| req.to_s }
+    assert_equal ["b (= 2)"], reqs.map(&:to_s)
 
     assert spec.instance_variable_defined? :@called
   end
diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb
index 7d3a5ee77d..a718d839fa 100644
--- a/test/rubygems/test_gem_resolver_api_set.rb
+++ b/test/rubygems/test_gem_resolver_api_set.rb
@@ -149,7 +149,7 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep, b_dep]
 
-    assert_equal %w[a-1], set.find_all(a_dep).map {|s| s.full_name }
+    assert_equal %w[a-1], set.find_all(a_dep).map(&:full_name)
     assert_empty          set.find_all(b_dep)
   end
 
diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb
index c1c67ba832..66c014c5cc 100644
--- a/test/rubygems/test_gem_resolver_best_set.rb
+++ b/test/rubygems/test_gem_resolver_best_set.rb
@@ -29,7 +29,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map {|s| s.full_name }
+    assert_equal %w[a-1], found.map(&:full_name)
   end
 
   def test_find_all_fallback
@@ -49,7 +49,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map {|s| s.full_name }
+    assert_equal %w[a-1], found.map(&:full_name)
   end
 
   def test_find_all_local
diff --git a/test/rubygems/test_gem_resolver_index_set.rb b/test/rubygems/test_gem_resolver_index_set.rb
index 3b8f047808..15d6465a78 100644
--- a/test/rubygems/test_gem_resolver_index_set.rb
+++ b/test/rubygems/test_gem_resolver_index_set.rb
@@ -41,7 +41,7 @@ class TestGemResolverIndexSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map {|s| s.full_name }
+    assert_equal %w[a-1], found.map(&:full_name)
   end
 
   def test_find_all_local
@@ -82,6 +82,6 @@ class TestGemResolverIndexSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1.a], found.map {|s| s.full_name }
+    assert_equal %w[a-1.a], found.map(&:full_name)
   end
 end
diff --git a/test/rubygems/test_gem_resolver_installer_set.rb b/test/rubygems/test_gem_resolver_installer_set.rb
index 7617919e2c..432d483872 100644
--- a/test/rubygems/test_gem_resolver_installer_set.rb
+++ b/test/rubygems/test_gem_resolver_installer_set.rb
@@ -14,7 +14,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep("a")
 
-    assert_equal %w[a-2], set.always_install.map {|s| s.full_name }
+    assert_equal %w[a-2], set.always_install.map(&:full_name)
 
     e = assert_raise Gem::UnsatisfiableDependencyError do
       set.add_always_install dep("b")
@@ -48,7 +48,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep("a")
 
-    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map(&:full_name)
   end
 
   def test_add_always_install_platform_if_gem_platforms_modified_by_platform_flag
@@ -67,7 +67,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep("a")
 
-    assert_equal %w[a-1-x86-freebsd-9], set.always_install.map {|s| s.full_name }
+    assert_equal %w[a-1-x86-freebsd-9], set.always_install.map(&:full_name)
   end
 
   def test_add_always_install_index_spec_platform
@@ -80,7 +80,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
     set = Gem::Resolver::InstallerSet.new :both
     set.add_always_install dep("a")
 
-    assert_equal [Gem::Platform.local], set.always_install.map {|s| s.platform }
+    assert_equal [Gem::Platform.local], set.always_install.map(&:platform)
   end
 
   def test_add_always_install_prerelease
@@ -93,7 +93,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep("a")
 
-    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map(&:full_name)
   end
 
   def test_add_always_install_prerelease_github_problem
@@ -111,7 +111,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep("a")
 
-    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map(&:full_name)
   end
 
   def test_add_always_install_prerelease_only
@@ -142,7 +142,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(req).map(&:full_name)
   end
 
   def test_consider_local_eh
@@ -198,7 +198,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-2], set.find_all(req).map {|spec| spec.full_name }
+    assert_equal %w[a-2], set.find_all(req).map(&:full_name)
   end
 
   def test_find_all_prerelease
@@ -211,12 +211,12 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(req).map(&:full_name)
 
     req = Gem::Resolver::DependencyRequest.new dep("a", ">= 0.a"), nil
 
     assert_equal %w[a-1 a-1.a],
-                 set.find_all(req).map {|spec| spec.full_name }.sort
+                 set.find_all(req).map(&:full_name).sort
   end
 
   def test_find_all_prerelease_dependencies_with_add_local
@@ -228,7 +228,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep("activesupport", ">= 4.2.0"), nil
 
-    assert_equal %w[activesupport-7.1.0.alpha], set.find_all(req).map {|spec| spec.full_name }
+    assert_equal %w[activesupport-7.1.0.alpha], set.find_all(req).map(&:full_name)
   end
 
   def test_load_spec
diff --git a/test/rubygems/test_gem_resolver_lock_set.rb b/test/rubygems/test_gem_resolver_lock_set.rb
index e01d73093c..cc9a510c9d 100644
--- a/test/rubygems/test_gem_resolver_lock_set.rb
+++ b/test/rubygems/test_gem_resolver_lock_set.rb
@@ -15,7 +15,7 @@ class TestGemResolverLockSet < Gem::TestCase
     specs = @set.add "a", "2", Gem::Platform::RUBY
     spec = specs.first
 
-    assert_equal %w[a-2], @set.specs.map {|t| t.full_name }
+    assert_equal %w[a-2], @set.specs.map(&:full_name)
 
     assert_kind_of Gem::Resolver::LockSpecification, spec
 
@@ -33,11 +33,11 @@ class TestGemResolverLockSet < Gem::TestCase
 
     found = @set.find_all dep "a"
 
-    assert_equal %w[a-2], found.map {|s| s.full_name }
+    assert_equal %w[a-2], found.map(&:full_name)
 
     found = @set.find_all dep "a", ">= 0.a"
 
-    assert_equal %w[a-1.a a-2], found.map {|s| s.full_name }
+    assert_equal %w[a-1.a a-2], found.map(&:full_name)
   end
 
   def test_load_spec
diff --git a/test/rubygems/test_gem_security_signer.rb b/test/rubygems/test_gem_security_signer.rb
index 6b2a4a201a..f71f08957d 100644
--- a/test/rubygems/test_gem_security_signer.rb
+++ b/test/rubygems/test_gem_security_signer.rb
@@ -36,8 +36,8 @@ class TestGemSecuritySigner < Gem::TestCase
   def test_initialize_cert_chain_mixed
     signer = Gem::Security::Signer.new nil, [@cert_file, CHILD_CERT]
 
-    assert_equal [PUBLIC_CERT, CHILD_CERT].map {|c| c.to_pem },
-                 signer.cert_chain.map {|c| c.to_pem }
+    assert_equal [PUBLIC_CERT, CHILD_CERT].map(&:to_pem),
+                 signer.cert_chain.map(&:to_pem)
   end
 
   def test_initialize_cert_chain_invalid
@@ -49,8 +49,8 @@ class TestGemSecuritySigner < Gem::TestCase
   def test_initialize_cert_chain_path
     signer = Gem::Security::Signer.new nil, [@cert_file]
 
-    assert_equal [PUBLIC_CERT].map {|c| c.to_pem },
-                 signer.cert_chain.map {|c| c.to_pem }
+    assert_equal [PUBLIC_CERT].map(&:to_pem),
+                 signer.cert_chain.map(&:to_pem)
   end
 
   def test_initialize_default
@@ -65,7 +65,7 @@ class TestGemSecuritySigner < Gem::TestCase
     signer = Gem::Security::Signer.new nil, nil
 
     assert_equal PRIVATE_KEY.to_pem, signer.key.to_pem
-    assert_equal [PUBLIC_CERT.to_pem], signer.cert_chain.map {|c| c.to_pem }
+    assert_equal [PUBLIC_CERT.to_pem], signer.cert_chain.map(&:to_pem)
   end
 
   def test_initialize_key_path
@@ -99,7 +99,7 @@ class TestGemSecuritySigner < Gem::TestCase
     signer.load_cert_chain
 
     assert_equal [PUBLIC_CERT.to_pem, CHILD_CERT.to_pem],
-                 signer.cert_chain.map {|c| c.to_pem }
+                 signer.cert_chain.map(&:to_pem)
   end
 
   def test_load_cert_chain_broken
@@ -111,7 +111,7 @@ class TestGemSecuritySigner < Gem::TestCase
     signer.load_cert_chain
 
     assert_equal [CHILD_CERT.to_pem, GRANDCHILD_CERT.to_pem],
-                 signer.cert_chain.map {|c| c.to_pem }
+                 signer.cert_chain.map(&:to_pem)
   end
 
   def test_sign
diff --git a/test/rubygems/test_gem_source.rb b/test/rubygems/test_gem_source.rb
index af39303085..fa82098dc5 100644
--- a/test/rubygems/test_gem_source.rb
+++ b/test/rubygems/test_gem_source.rb
@@ -104,9 +104,7 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_fetch_spec_platform
-    specs = spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    specs = spec_fetcher(&:legacy_platform)
 
     spec = @source.fetch_spec tuple("pl", Gem::Version.new(1), "i386-linux")
 
@@ -122,7 +120,7 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_load_specs
-    released = @source.load_specs(:released).map {|spec| spec.full_name }
+    released = @source.load_specs(:released).map(&:full_name)
     assert_equal %W[a-2 a-1 b-2], released
 
     cache_dir = File.join Gem.spec_cache_dir, "gems.example.com%80"
diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb
index 3ece28b147..1c8fcf9e9f 100644
--- a/test/rubygems/test_gem_source_git.rb
+++ b/test/rubygems/test_gem_source_git.rb
@@ -251,7 +251,7 @@ class TestGemSourceGit < Gem::TestCase
       specs = source.specs
     end
 
-    assert_equal %w[a-1 b-1], specs.map {|spec| spec.full_name }
+    assert_equal %w[a-1 b-1], specs.map(&:full_name)
 
     a_spec = specs.shift
 
diff --git a/test/rubygems/test_gem_source_local.rb b/test/rubygems/test_gem_source_local.rb
index ace3923009..2e16389850 100644
--- a/test/rubygems/test_gem_source_local.rb
+++ b/test/rubygems/test_gem_source_local.rb
@@ -72,7 +72,7 @@ class TestGemSourceLocal < Gem::TestCase
 
     @sl.load_specs :released
 
-    inner = [@a, @ap, @b].map {|t| t.name_tuple }.inspect
+    inner = [@a, @ap, @b].map(&:name_tuple).inspect
 
     assert_equal "#<Gem::Source::Local specs: #{inner}>", @sl.inspect
   end
diff --git a/test/rubygems/test_gem_source_subpath_problem.rb b/test/rubygems/test_gem_source_subpath_problem.rb
index 219c344290..e52cb58868 100644
--- a/test/rubygems/test_gem_source_subpath_problem.rb
+++ b/test/rubygems/test_gem_source_subpath_problem.rb
@@ -43,7 +43,7 @@ class TestGemSourceSubpathProblem < Gem::TestCase
       Gem::NameTuple.new(@b2.name, @b2.version, "ruby"),
     ]))
 
-    released = @source.load_specs(:latest).map {|spec| spec.full_name }
+    released = @source.load_specs(:latest).map(&:full_name)
     assert_equal %W[a-1 b-2], released
   end
 end
diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb
index f23a93350b..cd6aa8e9b2 100644
--- a/test/rubygems/test_gem_spec_fetcher.rb
+++ b/test/rubygems/test_gem_spec_fetcher.rb
@@ -108,9 +108,7 @@ class TestGemSpecFetcher < Gem::TestCase
   def test_spec_for_dependency_platform
     util_set_arch "i386-linux"
 
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     dep = Gem::Dependency.new "pl", 1
     specs_and_sources, _ = @sf.spec_for_dependency dep
@@ -126,9 +124,7 @@ class TestGemSpecFetcher < Gem::TestCase
   def test_spec_for_dependency_mismatched_platform
     util_set_arch "hrpa-989"
 
-    spec_fetcher do |fetcher|
-      fetcher.legacy_platform
-    end
+    spec_fetcher(&:legacy_platform)
 
     dep = Gem::Dependency.new "pl", 1
     specs_and_sources, errors = @sf.spec_for_dependency dep
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index d326efc17e..a49a0d32b9 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -691,7 +691,7 @@ end
       version
     ]
 
-    actual_value = Gem::Specification.attribute_names.map {|a| a.to_s }.sort
+    actual_value = Gem::Specification.attribute_names.map(&:to_s).sort
 
     assert_equal expected_value, actual_value
   end
@@ -964,13 +964,13 @@ dependencies: []
     install_specs @a1
 
     assert_includes Gem::Specification.all_names, "a-1"
-    assert_includes Gem::Specification.stubs.map {|s| s.full_name }, "a-1"
+    assert_includes Gem::Specification.stubs.map(&:full_name), "a-1"
 
     uninstall_gem @a1
     Gem::Specification.reset
 
     refute_includes Gem::Specification.all_names, "a-1"
-    refute_includes Gem::Specification.stubs.map {|s| s.full_name }, "a-1"
+    refute_includes Gem::Specification.stubs.map(&:full_name), "a-1"
   end
 
   def test_self_remove_spec_removed
@@ -985,7 +985,7 @@ dependencies: []
     Gem::Specification.reset
 
     refute_includes Gem::Specification.all_names, "a-1"
-    refute_includes Gem::Specification.stubs.map {|s| s.full_name }, "a-1"
+    refute_includes Gem::Specification.stubs.map(&:full_name), "a-1"
   end
 
   def test_self_stubs_for_lazy_loading
@@ -997,14 +997,14 @@ dependencies: []
     save_gemspec("a-1", "1", dir_standard_specs) {|s| s.name = "a" }
     save_gemspec("b-1", "1", dir_standard_specs) {|s| s.name = "b" }
 
-    assert_equal ["a-1"], Gem::Specification.stubs_for("a").map {|s| s.full_name }
+    assert_equal ["a-1"], Gem::Specification.stubs_for("a").map(&:full_name)
     assert_equal 1, Gem::Specification.class_variable_get(:@@stubs_by_name).length
-    assert_equal ["b-1"], Gem::Specification.stubs_for("b").map {|s| s.full_name }
+    assert_equal ["b-1"], Gem::Specification.stubs_for("b").map(&:full_name)
     assert_equal 2, Gem::Specification.class_variable_get(:@@stubs_by_name).length
 
     assert_equal(
-      Gem::Specification.stubs_for("a").map {|s| s.object_id },
-      Gem::Specification.stubs_for("a").map {|s| s.object_id }
+      Gem::Specification.stubs_for("a").map(&:object_id),
+      Gem::Specification.stubs_for("a").map(&:object_id)
     )
 
     Gem.loaded_specs.delete "a"
@@ -1017,7 +1017,7 @@ dependencies: []
 
     save_gemspec("b-1", "1", File.join(Gem.dir, "specifications")) {|s| s.name = "b" }
 
-    assert_equal [], Gem::Specification.stubs_for("b").map {|s| s.full_name }
+    assert_equal [], Gem::Specification.stubs_for("b").map(&:full_name)
   end
 
   def test_self_stubs_for_mult_platforms
@@ -1254,7 +1254,7 @@ dependencies: []
       awesome.add_dependency :gem_name
     end
 
-    assert_equal %w[true gem_name], gem.dependencies.map {|dep| dep.name }
+    assert_equal %w[true gem_name], gem.dependencies.map(&:name)
   end
 
   def test_add_dependency_from_existing_dependency
@@ -1324,9 +1324,7 @@ dependencies: []
 
     assert_empty @ext.build_args
 
-    File.open @ext.build_info_file, "w" do |io|
-      io.puts
-    end
+    File.open @ext.build_info_file, "w", &:puts
 
     assert_empty @ext.build_args
 
@@ -2188,7 +2186,7 @@ dependencies: []
 
     expected = %w[rake jabber4r pqa]
 
-    assert_equal expected, @c1.runtime_dependencies.map {|d| d.name }
+    assert_equal expected, @c1.runtime_dependencies.map(&:name)
   end
 
   def test_spaceship_name