From b1d0c61feacb894f0235c2e2fed1370771f426bc Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Thu, 3 Oct 2019 08:50:45 +0200
Subject: [PATCH] Update Gems.

---
 Library/.rubocop_shared.yml                   |  5 +-
 Library/Homebrew/Gemfile                      |  3 +-
 Library/Homebrew/Gemfile.lock                 | 13 ++----
 Library/Homebrew/cmd/info.rb                  |  2 +-
 Library/Homebrew/debrew.rb                    |  2 +-
 Library/Homebrew/dev-cmd/audit.rb             |  2 +-
 Library/Homebrew/dev-cmd/bottle.rb            | 11 ++---
 Library/Homebrew/formula.rb                   |  2 +-
 Library/Homebrew/messages.rb                  |  2 +-
 .../rubocops/cask/homepage_matches_url.rb     |  8 ++--
 .../cask/homepage_url_trailing_slash.rb       |  2 +-
 .../Homebrew/rubocops/cask/no_dsl_version.rb  |  2 +-
 .../Homebrew/rubocops/cask/stanza_order.rb    |  2 +-
 .../test/cask/artifact/alt_target_spec.rb     | 15 +++---
 .../cask/artifact/two_apps_correct_spec.rb    | 16 +++----
 Library/Homebrew/test/cask/depends_on_spec.rb | 46 +++++++++++++------
 Library/Homebrew/test/cask/dsl_spec.rb        | 10 ++--
 .../Homebrew/test/diagnostic_checks_spec.rb   |  5 +-
 .../rubocops/cask/stanza_grouping_spec.rb     |  4 +-
 .../test/rubocops/cask/stanza_order_spec.rb   |  4 +-
 Library/Homebrew/utils.rb                     |  4 +-
 Library/Homebrew/utils/curl.rb                |  2 +-
 Library/Homebrew/utils/github.rb              |  2 +-
 .../Homebrew/vendor/bundle/bundler/setup.rb   | 15 +++---
 .../config/default.yml                        |  9 ++--
 .../lib/rubocop-performance.rb                |  0
 .../lib/rubocop/cop/performance/caller.rb     |  0
 .../cop/performance/case_when_splat.rb        |  0
 .../lib/rubocop/cop/performance/casecmp.rb    |  0
 .../cop/performance/chain_array_allocation.rb |  0
 .../cop/performance/compare_with_block.rb     |  0
 .../lib/rubocop/cop/performance/count.rb      |  3 --
 .../lib/rubocop/cop/performance/detect.rb     |  4 --
 .../cop/performance/double_start_end_with.rb  |  0
 .../lib/rubocop/cop/performance/end_with.rb   |  0
 .../lib/rubocop/cop/performance/fixed_size.rb |  0
 .../lib/rubocop/cop/performance/flat_map.rb   |  9 +++-
 .../performance/inefficient_hash_search.rb    |  0
 .../rubocop/cop/performance/open_struct.rb    |  0
 .../rubocop/cop/performance/range_include.rb  |  0
 .../cop/performance/redundant_block_call.rb   |  0
 .../cop/performance/redundant_match.rb        |  0
 .../cop/performance/redundant_merge.rb        |  2 +-
 .../rubocop/cop/performance/regexp_match.rb   |  0
 .../rubocop/cop/performance/reverse_each.rb   |  0
 .../lib/rubocop/cop/performance/size.rb       |  0
 .../lib/rubocop/cop/performance/start_with.rb |  0
 .../cop/performance/string_replacement.rb     |  0
 .../lib/rubocop/cop/performance/times_map.rb  |  0
 .../cop/performance/unfreeze_string.rb        |  0
 .../cop/performance/uri_default_parser.rb     |  0
 .../lib/rubocop/cop/performance_cops.rb       |  0
 .../lib/rubocop/performance.rb                |  0
 .../lib/rubocop/performance/inject.rb         |  0
 .../lib/rubocop/performance/version.rb        |  2 +-
 55 files changed, 106 insertions(+), 102 deletions(-)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/config/default.yml (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop-performance.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/caller.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/case_when_splat.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/casecmp.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/chain_array_allocation.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/compare_with_block.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/count.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/detect.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/double_start_end_with.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/end_with.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/fixed_size.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/flat_map.rb (92%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/inefficient_hash_search.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/open_struct.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/range_include.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/redundant_block_call.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/redundant_match.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/redundant_merge.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/regexp_match.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/reverse_each.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/size.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/start_with.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/string_replacement.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/times_map.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/unfreeze_string.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance/uri_default_parser.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/cop/performance_cops.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/performance.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/performance/inject.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/{rubocop-performance-1.4.1 => rubocop-performance-1.5.0}/lib/rubocop/performance/version.rb (81%)

diff --git a/Library/.rubocop_shared.yml b/Library/.rubocop_shared.yml
index 32d122760..96f158902 100644
--- a/Library/.rubocop_shared.yml
+++ b/Library/.rubocop_shared.yml
@@ -45,9 +45,10 @@ Style/BarePercentLiterals:
 Style/CollectionMethods:
   Enabled: true
 
-# Prefer simple tokens without type annotations.
+# Prefer tokens with type annotations for consistency
+# between formatting numbers and strings.
 Style/FormatStringToken:
-  EnforcedStyle: template
+  EnforcedStyle: annotated
 
 # This shouldn't be enabled until LineLength is lower.
 Style/IfUnlessModifier:
diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile
index bf6f42025..0bf2f0da3 100644
--- a/Library/Homebrew/Gemfile
+++ b/Library/Homebrew/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 # installed gems
-gem "coveralls", require: false
+gem "coveralls", "~> 0.8", require: false
 gem "parallel_tests"
 gem "ronn", require: false
 gem "rspec"
@@ -12,7 +12,6 @@ gem "rspec-retry", require: false
 gem "rspec-wait", require: false
 gem "rubocop"
 gem "simplecov", require: false
-gem "simplecov-cobertura", require: false
 
 # vendored gems
 gem "activesupport"
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 2c28b60ee..508329274 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-expectations (3.8.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-its (1.3.0)
@@ -80,14 +80,14 @@ GEM
     rspec-support (3.8.3)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
-    rubocop (0.74.0)
+    rubocop (0.75.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
+    rubocop-performance (1.5.0)
       rubocop (>= 0.71.0)
     rubocop-rspec (1.36.0)
       rubocop (>= 0.68.1)
@@ -97,8 +97,6 @@ GEM
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-cobertura (1.3.1)
-      simplecov (~> 0.8)
     simplecov-html (0.10.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
@@ -120,7 +118,7 @@ DEPENDENCIES
   activesupport
   backports
   concurrent-ruby
-  coveralls
+  coveralls (~> 0.8)
   mechanize
   parallel_tests
   plist
@@ -134,7 +132,6 @@ DEPENDENCIES
   rubocop-rspec
   ruby-macho
   simplecov
-  simplecov-cobertura
 
 BUNDLED WITH
-   2.0.1
+   2.0.2
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 01e3ca541..a17980a22 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -410,6 +410,6 @@ module Homebrew
   end
 
   def format_percent(percent)
-    format "%.2f", percent
+    format("%<percent>.2f", percent: percent)
   end
 end
diff --git a/Library/Homebrew/debrew.rb b/Library/Homebrew/debrew.rb
index f3827b964..33209cffe 100644
--- a/Library/Homebrew/debrew.rb
+++ b/Library/Homebrew/debrew.rb
@@ -88,7 +88,7 @@ module Debrew
 
   def self.debrew
     @active = true
-    Object.send(:include, Raise)
+    Object.include Raise
 
     begin
       yield
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 896cd2a4a..9af74e538 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -254,7 +254,7 @@ module Homebrew
       wanted_mode = 0100644 & ~File.umask
       actual_mode = formula.path.stat.mode
       unless actual_mode == wanted_mode
-        problem format("Incorrect file permissions (%03<actual>o): chmod %03<wanted>o %{path}",
+        problem format("Incorrect file permissions (%03<actual>o): chmod %03<wanted>o %<path>s",
                        actual: actual_mode & 0777,
                        wanted: wanted_mode & 0777,
                        path:   formula.path)
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 534d66721..51b597ce7 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -530,14 +530,13 @@ module Homebrew
 
         unless args.no_commit?
           if ENV["HOMEBREW_GIT_NAME"]
-            ENV["GIT_AUTHOR_NAME"] =
-              ENV["GIT_COMMITTER_NAME"] =
-                ENV["HOMEBREW_GIT_NAME"]
+            ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] =
+              ENV["HOMEBREW_GIT_NAME"]
           end
+
           if ENV["HOMEBREW_GIT_EMAIL"]
-            ENV["GIT_AUTHOR_EMAIL"] =
-              ENV["GIT_COMMITTER_EMAIL"] =
-                ENV["HOMEBREW_GIT_EMAIL"]
+            ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] =
+              ENV["HOMEBREW_GIT_EMAIL"]
           end
 
           short_name = formula_name.split("/", -1).last
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 3e22bd8d1..a59171592 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1843,7 +1843,7 @@ class Formula
 
     @exec_count ||= 0
     @exec_count += 1
-    logfn = format("#{logs}/#{active_log_prefix}%02<exec_count>d.%{cmd_base}",
+    logfn = format("#{logs}/#{active_log_prefix}%02<exec_count>d.%<cmd_base>s",
                    exec_count: @exec_count,
                    cmd_base:   File.basename(cmd).split(" ").first)
     logs.mkpath
diff --git a/Library/Homebrew/messages.rb b/Library/Homebrew/messages.rb
index 664fd50d3..d0b371a2e 100644
--- a/Library/Homebrew/messages.rb
+++ b/Library/Homebrew/messages.rb
@@ -40,7 +40,7 @@ class Messages
 
     oh1 "Installation times"
     install_times.each do |t|
-      puts format("%-20s %10.3f s", t[:formula], t[:time])
+      puts format("%<formula>-20s %<time>10.3f s", t)
     end
   end
 end
diff --git a/Library/Homebrew/rubocops/cask/homepage_matches_url.rb b/Library/Homebrew/rubocops/cask/homepage_matches_url.rb
index 850132129..34c526169 100644
--- a/Library/Homebrew/rubocops/cask/homepage_matches_url.rb
+++ b/Library/Homebrew/rubocops/cask/homepage_matches_url.rb
@@ -19,15 +19,15 @@ module RuboCop
 
         COMMENT_FORMAT = /# [^ ]+ was verified as official when first introduced to the cask/.freeze
 
-        MSG_NO_MATCH = "`%{url}` does not match `%{full_url}`"
+        MSG_NO_MATCH = "`%<url>s` does not match `%<full_url>s`"
 
-        MSG_MISSING = ("`%{domain}` does not match `%{homepage}`, a comment has to be added " \
+        MSG_MISSING = ("`%<domain>s` does not match `%<homepage>s`, a comment has to be added " \
                       "above the `url` stanza. For details, see " + REFERENCE_URL).freeze
 
-        MSG_WRONG_FORMAT = ("`%{comment}` does not match the expected comment format. " \
+        MSG_WRONG_FORMAT = ("`%<comment>s` does not match the expected comment format. " \
                            "For details, see " + REFERENCE_URL).freeze
 
-        MSG_UNNECESSARY = "The URL's domain `%{domain}` matches the homepage `%{homepage}`, " \
+        MSG_UNNECESSARY = "The URL's domain `%<domain>s` matches the homepage `%<homepage>s`, " \
                           "the comment above the `url` stanza is unnecessary"
 
         def on_cask(cask_block)
diff --git a/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb b/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb
index ab7f0987a..c6c7f2c1f 100644
--- a/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb
+++ b/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb
@@ -11,7 +11,7 @@ module RuboCop
       class HomepageUrlTrailingSlash < Cop
         include OnHomepageStanza
 
-        MSG_NO_SLASH = "'%{url}' must have a slash after the domain."
+        MSG_NO_SLASH = "'%<url>s' must have a slash after the domain."
 
         def on_homepage_stanza(stanza)
           url_node = stanza.stanza_node.first_argument
diff --git a/Library/Homebrew/rubocops/cask/no_dsl_version.rb b/Library/Homebrew/rubocops/cask/no_dsl_version.rb
index 8fcdd4435..6e21cd85f 100644
--- a/Library/Homebrew/rubocops/cask/no_dsl_version.rb
+++ b/Library/Homebrew/rubocops/cask/no_dsl_version.rb
@@ -21,7 +21,7 @@ module RuboCop
         extend Forwardable
         include CaskHelp
 
-        MESSAGE = "Use `%{preferred}` instead of `%{current}`"
+        MESSAGE = "Use `%<preferred>s` instead of `%<current>s`"
 
         def on_cask(cask_block)
           @cask_header = cask_block.header
diff --git a/Library/Homebrew/rubocops/cask/stanza_order.rb b/Library/Homebrew/rubocops/cask/stanza_order.rb
index 0c960e843..bb8c153ba 100644
--- a/Library/Homebrew/rubocops/cask/stanza_order.rb
+++ b/Library/Homebrew/rubocops/cask/stanza_order.rb
@@ -12,7 +12,7 @@ module RuboCop
         extend Forwardable
         include CaskHelp
 
-        MESSAGE = "`%{stanza}` stanza out of order"
+        MESSAGE = "`%<stanza>s` stanza out of order"
 
         def on_cask(cask_block)
           @cask_block = cask_block
diff --git a/Library/Homebrew/test/cask/artifact/alt_target_spec.rb b/Library/Homebrew/test/cask/artifact/alt_target_spec.rb
index 3fdbe36cb..22d439a9a 100644
--- a/Library/Homebrew/test/cask/artifact/alt_target_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/alt_target_spec.rb
@@ -5,10 +5,8 @@ describe Cask::Artifact::App, :cask do
     let(:cask) { Cask::CaskLoader.load(cask_path("with-alt-target")) }
 
     let(:install_phase) {
-      lambda do
-        cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
-          artifact.install_phase(command: NeverSudoSystemCommand, force: false)
-        end
+      cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
+        artifact.install_phase(command: NeverSudoSystemCommand, force: false)
       end
     }
 
@@ -23,7 +21,7 @@ describe Cask::Artifact::App, :cask do
       expect(source_path).to be_a_directory
       expect(target_path).not_to exist
 
-      install_phase.call
+      install_phase
 
       expect(target_path).to be_a_directory
       expect(source_path).not_to exist
@@ -44,7 +42,7 @@ describe Cask::Artifact::App, :cask do
         appsubdir = cask.staged_path.join("subdir").tap(&:mkpath)
         FileUtils.mv(source_path, appsubdir)
 
-        install_phase.call
+        install_phase
 
         expect(target_path).to be_a_directory
         expect(appsubdir.join("Caffeine.app")).not_to exist
@@ -55,7 +53,7 @@ describe Cask::Artifact::App, :cask do
       staged_app_copy = source_path.sub("Caffeine.app", "Caffeine Deluxe.app")
       FileUtils.cp_r source_path, staged_app_copy
 
-      install_phase.call
+      install_phase
 
       expect(target_path).to be_a_directory
       expect(source_path).not_to exist
@@ -67,7 +65,8 @@ describe Cask::Artifact::App, :cask do
     it "avoids clobbering an existing app by moving over it" do
       target_path.mkpath
 
-      expect(install_phase).to raise_error(Cask::CaskError, "It seems there is already an App at '#{target_path}'.")
+      expect { install_phase }
+        .to raise_error(Cask::CaskError, "It seems there is already an App at '#{target_path}'.")
 
       expect(source_path).to be_a_directory
       expect(target_path).to be_a_directory
diff --git a/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb b/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb
index 200823abb..730851f69 100644
--- a/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb
@@ -5,10 +5,8 @@ describe Cask::Artifact::App, :cask do
     let(:cask) { Cask::CaskLoader.load(cask_path("with-two-apps-correct")) }
 
     let(:install_phase) {
-      lambda do
-        cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
-          artifact.install_phase(command: NeverSudoSystemCommand, force: false)
-        end
+      cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
+        artifact.install_phase(command: NeverSudoSystemCommand, force: false)
       end
     }
 
@@ -23,7 +21,7 @@ describe Cask::Artifact::App, :cask do
     end
 
     it "installs both apps using the proper target directory" do
-      install_phase.call
+      install_phase
 
       expect(target_path_mini).to be_a_directory
       expect(source_path_mini).not_to exist
@@ -36,7 +34,7 @@ describe Cask::Artifact::App, :cask do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-two-apps-subdir")) }
 
       it "installs both apps using the proper target directory" do
-        install_phase.call
+        install_phase
 
         expect(target_path_mini).to be_a_directory
         expect(source_path_mini).not_to exist
@@ -49,7 +47,7 @@ describe Cask::Artifact::App, :cask do
     it "only uses apps when they are specified" do
       FileUtils.cp_r source_path_mini, source_path_mini.sub("Caffeine Mini.app", "Caffeine Deluxe.app")
 
-      install_phase.call
+      install_phase
 
       expect(target_path_mini).to be_a_directory
       expect(source_path_mini).not_to exist
@@ -63,7 +61,7 @@ describe Cask::Artifact::App, :cask do
         target_path_mini.mkpath
 
         expect {
-          expect(install_phase).to output(<<~EOS).to_stdout
+          expect { install_phase }.to output(<<~EOS).to_stdout
             ==> Moving App 'Caffeine Pro.app' to '#{target_path_pro}'
           EOS
         }.to raise_error(Cask::CaskError, "It seems there is already an App at '#{target_path_mini}'.")
@@ -77,7 +75,7 @@ describe Cask::Artifact::App, :cask do
         target_path_pro.mkpath
 
         expect {
-          expect(install_phase).to output(<<~EOS).to_stdout
+          expect { install_phase }.to output(<<~EOS).to_stdout
             ==> Moving App 'Caffeine Mini.app' to '#{target_path_mini}'
           EOS
         }.to raise_error(Cask::CaskError, "It seems there is already an App at '#{target_path_pro}'.")
diff --git a/Library/Homebrew/test/cask/depends_on_spec.rb b/Library/Homebrew/test/cask/depends_on_spec.rb
index c630d3dfd..2917d6dac 100644
--- a/Library/Homebrew/test/cask/depends_on_spec.rb
+++ b/Library/Homebrew/test/cask/depends_on_spec.rb
@@ -3,10 +3,8 @@
 # TODO: this test should be named after the corresponding class, once
 #       that class is abstracted from installer.rb
 describe "Satisfy Dependencies and Requirements", :cask do
-  subject {
-    lambda do
-      Cask::Installer.new(cask).install
-    end
+  subject(:install) {
+    Cask::Installer.new(cask).install
   }
 
   describe "depends_on cask" do
@@ -14,7 +12,7 @@ describe "Satisfy Dependencies and Requirements", :cask do
     let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-cask")) }
 
     it "installs the dependency of a Cask and the Cask itself" do
-      expect(subject).not_to raise_error
+      expect { install }.not_to raise_error
       expect(cask).to be_installed
       expect(dependency).to be_installed
     end
@@ -23,7 +21,7 @@ describe "Satisfy Dependencies and Requirements", :cask do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-cask-cyclic")) }
 
       it {
-        expect(subject).to raise_error(
+        expect { install }.to raise_error(
           Cask::CaskCyclicDependencyError,
           "Cask 'with-depends-on-cask-cyclic' includes cyclic dependencies "\
           "on other Casks: with-depends-on-cask-cyclic-helper",
@@ -36,31 +34,41 @@ describe "Satisfy Dependencies and Requirements", :cask do
     context "given an array" do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-macos-array")) }
 
-      it { is_expected.not_to raise_error }
+      it "does not raise an error" do
+        expect { install }.not_to raise_error
+      end
     end
 
     context "given a comparison" do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-macos-comparison")) }
 
-      it { is_expected.not_to raise_error }
+      it "does not raise an error" do
+        expect { install }.not_to raise_error
+      end
     end
 
     context "given a string", :needs_compat do
       let(:cask) { Cask::CaskLoader.load(cask_path("compat/with-depends-on-macos-string")) }
 
-      it { is_expected.not_to raise_error }
+      it "does not raise an error" do
+        expect { install }.not_to raise_error
+      end
     end
 
     context "given a symbol" do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-macos-symbol")) }
 
-      it { is_expected.not_to raise_error }
+      it "does not raise an error" do
+        expect { install }.not_to raise_error
+      end
     end
 
     context "when not satisfied" do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-macos-failure")) }
 
-      it { is_expected.to raise_error(Cask::CaskError) }
+      it "raises an error" do
+        expect { install }.to raise_error(Cask::CaskError)
+      end
     end
   end
 
@@ -68,7 +76,9 @@ describe "Satisfy Dependencies and Requirements", :cask do
     context "when satisfied" do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-arch")) }
 
-      it { is_expected.not_to raise_error }
+      it "does not raise an error" do
+        expect { install }.not_to raise_error
+      end
     end
   end
 
@@ -81,21 +91,27 @@ describe "Satisfy Dependencies and Requirements", :cask do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-x11")) }
       let(:x11_installed) { true }
 
-      it { is_expected.not_to raise_error }
+      it "does not raise an error" do
+        expect { install }.not_to raise_error
+      end
     end
 
     context "when not satisfied" do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-x11")) }
       let(:x11_installed) { false }
 
-      it { is_expected.to raise_error(Cask::CaskX11DependencyError) }
+      it "does not raise an error" do
+        expect { install }.to raise_error Cask::CaskX11DependencyError
+      end
     end
 
     context "when depends_on x11: false" do
       let(:cask) { Cask::CaskLoader.load(cask_path("with-depends-on-x11-false")) }
       let(:x11_installed) { false }
 
-      it { is_expected.not_to raise_error }
+      it "does not raise an error" do
+        expect { install }.not_to raise_error
+      end
     end
   end
 end
diff --git a/Library/Homebrew/test/cask/dsl_spec.rb b/Library/Homebrew/test/cask/dsl_spec.rb
index 5b6b8b780..77f0d3723 100644
--- a/Library/Homebrew/test/cask/dsl_spec.rb
+++ b/Library/Homebrew/test/cask/dsl_spec.rb
@@ -14,10 +14,8 @@ describe Cask::DSL, :cask do
 
   describe "when a Cask includes an unknown method" do
     let(:attempt_unknown_method) {
-      lambda do
-        Cask::Cask.new("unexpected-method-cask") do
-          future_feature :not_yet_on_your_machine
-        end
+      Cask::Cask.new("unexpected-method-cask") do
+        future_feature :not_yet_on_your_machine
       end
     }
 
@@ -32,13 +30,13 @@ describe Cask::DSL, :cask do
       EOS
 
       expect {
-        expect(attempt_unknown_method).not_to output.to_stdout
+        expect { attempt_unknown_method }.not_to output.to_stdout
       }.to output(expected).to_stderr
     end
 
     it "will simply warn, not throw an exception" do
       expect {
-        attempt_unknown_method.call
+        attempt_unknown_method
       }.not_to raise_error
     end
   end
diff --git a/Library/Homebrew/test/diagnostic_checks_spec.rb b/Library/Homebrew/test/diagnostic_checks_spec.rb
index 8d75726c5..0852dcfd7 100644
--- a/Library/Homebrew/test/diagnostic_checks_spec.rb
+++ b/Library/Homebrew/test/diagnostic_checks_spec.rb
@@ -94,9 +94,8 @@ describe Homebrew::Diagnostic::Checks do
       file = "#{path}/foo-config"
       FileUtils.touch file
       FileUtils.chmod 0755, file
-      ENV["HOMEBREW_PATH"] =
-        ENV["PATH"] =
-          "#{path}#{File::PATH_SEPARATOR}#{ENV["PATH"]}"
+      ENV["HOMEBREW_PATH"] = ENV["PATH"] =
+        "#{path}#{File::PATH_SEPARATOR}#{ENV["PATH"]}"
 
       expect(subject.check_for_config_scripts)
         .to match('"config" scripts exist')
diff --git a/Library/Homebrew/test/rubocops/cask/stanza_grouping_spec.rb b/Library/Homebrew/test/rubocops/cask/stanza_grouping_spec.rb
index c8a70a286..21cfb5393 100644
--- a/Library/Homebrew/test/rubocops/cask/stanza_grouping_spec.rb
+++ b/Library/Homebrew/test/rubocops/cask/stanza_grouping_spec.rb
@@ -150,7 +150,7 @@ describe RuboCop::Cop::Cask::StanzaGrouping do
           url 'https://foo.brew.sh/foo.zip'
           name 'Foo'
           app 'Foo.app'
-          %{caveats}
+          %<caveats>s
         end
       CASK
     end
@@ -165,7 +165,7 @@ describe RuboCop::Cop::Cask::StanzaGrouping do
 
           app 'Foo.app'
 
-          %{caveats}
+          %<caveats>s
         end
       CASK
     end
diff --git a/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb b/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb
index 7db8ab727..c10ef5bf5 100644
--- a/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb
+++ b/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb
@@ -202,7 +202,7 @@ describe RuboCop::Cop::Cask::StanzaOrder do
         cask 'foo' do
           name 'Foo'
           url 'https://foo.brew.sh/foo.zip'
-          %{caveats}
+          %<caveats>s
           version :latest
           app 'Foo.app'
           sha256 :no_check
@@ -217,7 +217,7 @@ describe RuboCop::Cop::Cask::StanzaOrder do
           url 'https://foo.brew.sh/foo.zip'
           name 'Foo'
           app 'Foo.app'
-          %{caveats}
+          %<caveats>s
         end
       CASK
     end
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index c55fc4aa2..3a54611e7 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -67,7 +67,7 @@ module Homebrew
     at_exit do
       col_width = [$times.keys.map(&:size).max.to_i + 2, 15].max
       $times.sort_by { |_k, v| v }.each do |method, time|
-        puts format("%-*s %0.4f sec", col_width, "#{method}:", time)
+        puts format("%<method>-#{col_width}s %<time>0.4f sec", method: "#{method}:", time: time)
       end
     end
   end
@@ -415,7 +415,7 @@ module Kernel
     if ((size * 10).to_i % 10).zero?
       "#{size.to_i}#{unit}"
     else
-      "#{format("%.1f", size)}#{unit}"
+      "#{format("%<size>.1f", size: size)}#{unit}"
     end
   end
 
diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
index 3c2118196..33c2e6843 100644
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@@ -60,7 +60,7 @@ def curl_download(*args, to: nil, **options)
 
   range_stdout = curl_output("--location", "--range", "0-1",
                              "--dump-header", "-",
-                             "--write-out", "%{http_code}",
+                             "--write-out", "%\{http_code}",
                              "--output", "/dev/null", *args, **options).stdout
   headers, _, http_status = range_stdout.partition("\r\n\r\n")
 
diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index 8ac404d44..681efa394 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -163,7 +163,7 @@ module GitHub
     # This is a no-op if the user is opting out of using the GitHub API.
     return block_given? ? yield({}) : {} if ENV["HOMEBREW_NO_GITHUB_API"]
 
-    args = ["--header", "Accept: application/vnd.github.v3+json", "--write-out", "\n%{http_code}"]
+    args = ["--header", "Accept: application/vnd.github.v3+json", "--write-out", "\n%\{http_code}"]
     args += ["--header", "Accept: application/vnd.github.antiope-preview+json"]
 
     token, username = api_credentials
diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
index 94ce14cf0..34f069b8b 100644
--- a/Library/Homebrew/vendor/bundle/bundler/setup.rb
+++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -5,7 +5,7 @@ ruby_version = RbConfig::CONFIG["ruby_version"]
 path = File.expand_path('..', __FILE__)
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.5/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.6.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.12.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.12.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.5/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-5.2.3/lib"
@@ -45,24 +45,23 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mechanize-2.7.6/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mustache-1.1.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.17.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-2.29.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.6.4.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.6.5.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/rdiscount-2.2.0.1"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ronn-0.7.3/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.8.2/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.8.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-core-3.8.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.8.4/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-mocks-3.8.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.8.5/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-mocks-3.8.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.8.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-its-1.3.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-retry-0.6.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.6.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.74.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.4.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.75.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.36.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-cobertura-1.3.1/lib"
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/config/default.yml b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/config/default.yml
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/config/default.yml
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/config/default.yml
index cc896dd05..13740d941 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/config/default.yml
+++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/config/default.yml
@@ -44,11 +44,10 @@ Performance/Count:
   # This cop has known compatibility issues with `ActiveRecord` and other
   # frameworks. ActiveRecord's `count` ignores the block that is passed to it.
   # For more information, see the documentation in the cop itself.
-  # If you understand the known risk, you can disable `SafeMode`.
-  SafeMode: true
+  SafeAutoCorrect: false
   Enabled: true
   VersionAdded: '0.31'
-  VersionChanged: '0.39'
+  VersionChanged: '1.5'
 
 Performance/Detect:
   Description: >-
@@ -59,10 +58,10 @@ Performance/Detect:
   # frameworks. `ActiveRecord` does not implement a `detect` method and `find`
   # has its own meaning. Correcting `ActiveRecord` methods with this cop
   # should be considered unsafe.
-  SafeMode: true
+  SafeAutoCorrect: false
   Enabled: true
   VersionAdded: '0.30'
-  VersionChanged: '0.39'
+  VersionChanged: '1.5'
 
 Performance/DoubleStartEndWith:
   Description: >-
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop-performance.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop-performance.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop-performance.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop-performance.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/caller.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/caller.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/caller.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/caller.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/case_when_splat.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/case_when_splat.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/case_when_splat.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/case_when_splat.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/casecmp.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/casecmp.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/casecmp.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/casecmp.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/chain_array_allocation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/chain_array_allocation.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/chain_array_allocation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/chain_array_allocation.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/compare_with_block.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/compare_with_block.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/compare_with_block.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/compare_with_block.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/count.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/count.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/count.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/count.rb
index 7dc54ec9a..c6b5182a5 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/count.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/count.rb
@@ -38,7 +38,6 @@ module RuboCop
       #
       #   Model.where(id: [1, 2, 3]).to_a.count { |m| m.method == true }
       class Count < Cop
-        include SafeMode
         include RangeHelp
 
         MSG = 'Use `count` instead of `%<selector>s...%<counter>s`.'
@@ -51,8 +50,6 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return if rails_safe_mode?
-
           count_candidate?(node) do |selector_node, selector, counter|
             return unless eligible_node?(node)
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/detect.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/detect.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/detect.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/detect.rb
index b22ea5d44..f1aa75be8 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/detect.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/detect.rb
@@ -23,8 +23,6 @@ module RuboCop
       # own meaning. Correcting ActiveRecord methods with this cop should be
       # considered unsafe.
       class Detect < Cop
-        include SafeMode
-
         MSG = 'Use `%<prefer>s` instead of ' \
               '`%<first_method>s.%<second_method>s`.'
         REVERSE_MSG = 'Use `reverse.%<prefer>s` instead of ' \
@@ -38,8 +36,6 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return if rails_safe_mode?
-
           detect_candidate?(node) do |receiver, second_method, args|
             return unless args.empty?
             return unless receiver
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/double_start_end_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/double_start_end_with.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/double_start_end_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/double_start_end_with.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/end_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/end_with.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/end_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/end_with.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/fixed_size.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/fixed_size.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/fixed_size.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/fixed_size.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/flat_map.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/flat_map.rb
similarity index 92%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/flat_map.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/flat_map.rb
index c90932f71..b5b91876a 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/flat_map.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/flat_map.rb
@@ -23,7 +23,14 @@ module RuboCop
                                   'multiple levels.'
 
         def_node_matcher :flat_map_candidate?, <<-PATTERN
-          (send (block $(send _ ${:collect :map}) ...) ${:flatten :flatten!} $...)
+          (send
+            {
+              (block $(send _ ${:collect :map}) ...)
+              $(send _ ${:collect :map} (block_pass _))
+            }
+            ${:flatten :flatten!}
+            $...
+          )
         PATTERN
 
         def on_send(node)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/inefficient_hash_search.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/inefficient_hash_search.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/inefficient_hash_search.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/inefficient_hash_search.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/open_struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/open_struct.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/open_struct.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/open_struct.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/range_include.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/range_include.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/range_include.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/range_include.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/redundant_block_call.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/redundant_block_call.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/redundant_block_call.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/redundant_block_call.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/redundant_match.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/redundant_match.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/redundant_match.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/redundant_match.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/redundant_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/redundant_merge.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/redundant_merge.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/redundant_merge.rb
index 45b610846..0ccb54eee 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/redundant_merge.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/redundant_merge.rb
@@ -132,7 +132,7 @@ module RuboCop
         end
 
         def max_key_value_pairs
-          Integer(cop_config['MaxKeyValuePairs']) || 2
+          Integer(cop_config['MaxKeyValuePairs'] || 2)
         end
 
         # A utility class for checking the use of values within an
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/regexp_match.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/regexp_match.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/regexp_match.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/regexp_match.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/reverse_each.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/reverse_each.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/reverse_each.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/reverse_each.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/size.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/size.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/size.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/size.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/start_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/start_with.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/start_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/start_with.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/string_replacement.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/string_replacement.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/string_replacement.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/string_replacement.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/times_map.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/times_map.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/times_map.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/times_map.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/unfreeze_string.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/unfreeze_string.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/unfreeze_string.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/unfreeze_string.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/uri_default_parser.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/uri_default_parser.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance/uri_default_parser.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance/uri_default_parser.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance_cops.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance_cops.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/cop/performance_cops.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/cop/performance_cops.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/performance.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/performance.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/performance.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/performance.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/performance/inject.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/performance/inject.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/performance/inject.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/performance/inject.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/performance/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/performance/version.rb
similarity index 81%
rename from Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/performance/version.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/performance/version.rb
index 3b37832e8..ecc953a51 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.4.1/lib/rubocop/performance/version.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-performance-1.5.0/lib/rubocop/performance/version.rb
@@ -3,7 +3,7 @@
 module RuboCop
   module Performance
     module Version
-      STRING = '1.4.1'
+      STRING = '1.5.0'
     end
   end
 end