Merge pull request #3319 from reitermarkus/squiggly-heredocs

 Use “squiggly” heredocs.

1 files changed, 18 insertions, 18 deletions

diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb
index a3d182a2b..97ed5749a 100644
--- a/Library/Homebrew/missing_formula.rb
+++ b/Library/Homebrew/missing_formula.rb
@@ -12,10 +12,10 @@ module Homebrew
 
       def blacklisted_reason(name)
         case name.downcase
-        when "gem", /^rubygems?$/ then <<-EOS.undent
+        when "gem", /^rubygems?$/ then <<~EOS
           Homebrew provides gem via: `brew install ruby`.
           EOS
-        when "tex", "tex-live", "texlive", "latex" then <<-EOS.undent
+        when "tex", "tex-live", "texlive", "latex" then <<~EOS
           Installing TeX from source is weird and gross, requires a lot of patches,
           and only builds 32-bit (and thus can't use Homebrew dependencies)
 
@@ -24,42 +24,42 @@ module Homebrew
           You can install it with Homebrew-Cask:
             brew cask install mactex
           EOS
-        when "pip" then <<-EOS.undent
+        when "pip" then <<~EOS
           Homebrew provides pip via: `brew install python`. However you will then
           have two Pythons installed on your Mac, so alternatively you can install
           pip via the instructions at:
             #{Formatter.url("https://pip.readthedocs.io/en/stable/installing/")}
           EOS
-        when "pil" then <<-EOS.undent
+        when "pil" then <<~EOS
           Instead of PIL, consider `pip2 install pillow`.
           EOS
-        when "macruby" then <<-EOS.undent
+        when "macruby" then <<~EOS
           MacRuby is not packaged and is on an indefinite development hiatus.
           You can read more about it at:
             #{Formatter.url("https://github.com/MacRuby/MacRuby")}
           EOS
         when /(lib)?lzma/
           "lzma is now part of the xz formula."
-        when "gtest", "googletest", "google-test" then <<-EOS.undent
+        when "gtest", "googletest", "google-test" then <<~EOS
           Installing gtest system-wide is not recommended; it should be vendored
           in your projects that use it.
           EOS
-        when "gmock", "googlemock", "google-mock" then <<-EOS.undent
+        when "gmock", "googlemock", "google-mock" then <<~EOS
           Installing gmock system-wide is not recommended; it should be vendored
           in your projects that use it.
           EOS
-        when "sshpass" then <<-EOS.undent
+        when "sshpass" then <<~EOS
           We won't add sshpass because it makes it too easy for novice SSH users to
           ruin SSH's security.
           EOS
-        when "gsutil" then <<-EOS.undent
+        when "gsutil" then <<~EOS
           Install gsutil with `pip2 install gsutil`
           EOS
-        when "gfortran" then <<-EOS.undent
+        when "gfortran" then <<~EOS
           GNU Fortran is now provided as part of GCC, and can be installed with:
             brew install gcc
           EOS
-        when "play" then <<-EOS.undent
+        when "play" then <<~EOS
           Play 2.3 replaces the play command with activator:
             brew install typesafe-activator
 
@@ -67,7 +67,7 @@ module Homebrew
             #{Formatter.url("https://www.playframework.com/documentation/2.3.x/Migration23")}
             #{Formatter.url("https://www.playframework.com/documentation/2.3.x/Highlights23")}
           EOS
-        when "haskell-platform" then <<-EOS.undent
+        when "haskell-platform" then <<~EOS
           We no longer package haskell-platform. Consider installing ghc
           and cabal-install instead:
             brew install ghc cabal-install
@@ -75,10 +75,10 @@ module Homebrew
           You can install with Homebrew-Cask:
             brew cask install haskell-platform
           EOS
-        when "mysqldump-secure" then <<-EOS.undent
+        when "mysqldump-secure" then <<~EOS
           The creator of mysqldump-secure tried to game our popularity metrics.
           EOS
-        when "ngrok" then <<-EOS.undent
+        when "ngrok" then <<~EOS
           Upstream sunsetted 1.x in March 2016 and 2.x is not open-source.
 
           If you wish to use the 2.x release you can install with Homebrew-Cask:
@@ -98,12 +98,12 @@ module Homebrew
           new_tap_user, new_tap_repo, = new_tap.split("/")
           new_tap_name = "#{new_tap_user}/#{new_tap_repo}"
 
-          message = <<-EOS.undent
+          message = <<~EOS
             It was migrated from #{old_tap} to #{new_tap}.
           EOS
           break if new_tap_name == CoreTap.instance.name
 
-          message += <<-EOS.undent
+          message += <<~EOS
             You can access it again by running:
               brew tap #{new_tap_name}
           EOS
@@ -124,7 +124,7 @@ module Homebrew
           unless silent
             ohai "Searching for a previously deleted formula..."
             if (tap.path/".git/shallow").exist?
-              opoo <<-EOS.undent
+              opoo <<~EOS
                 #{tap} is shallow clone. To get complete history run:
                   git -C "$(brew --repo #{tap})" fetch --unshallow
 
@@ -147,7 +147,7 @@ module Homebrew
           commit_message.sub!(/ \(#(\d+)\)$/, " (#{tap.issues_url}/\\1)")
           commit_message.gsub!(/(Closes|Fixes) #(\d+)/, "\\1 #{tap.issues_url}/\\2")
 
-          <<-EOS.undent
+          <<~EOS
             #{name} was deleted from #{tap.name} in commit #{short_hash}:
               #{commit_message}