From 330ae8c6fa9932189634789f18c2e8279da456f8 Mon Sep 17 00:00:00 2001 From: Zach Auten Date: Sun, 24 Feb 2019 21:53:04 -0500 Subject: [PATCH] print_caveats and get_info return heredocs --- Library/Homebrew/cask/cmd/info.rb | 26 ++++++++++++++------------ Library/Homebrew/cask/installer.rb | 6 ++++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Library/Homebrew/cask/cmd/info.rb b/Library/Homebrew/cask/cmd/info.rb index ec160e6b4f..081245caeb 100644 --- a/Library/Homebrew/cask/cmd/info.rb +++ b/Library/Homebrew/cask/cmd/info.rb @@ -27,14 +27,12 @@ module Cask end def self.get_info(cask) - "#{title_info(cask)}\n"\ - "#{Formatter.url(cask.homepage) if cask.homepage}\n"\ - "#{installation_info(cask)}\n"\ - "#{repo_info(cask)}"\ - "#{name_info(cask)}"\ - "#{language_info(cask)}"\ - "#{artifact_info(cask)}"\ - "#{Installer.print_caveats(cask)}"\ + <<~EOS.chomp + #{title_info(cask)} + #{Formatter.url(cask.homepage) if cask.homepage} + #{installation_info(cask)} + #{repo_info(cask)}#{name_info(cask)}#{language_info(cask)}#{artifact_info(cask)}#{Installer.print_caveats(cask)} + EOS end def self.info(cask) @@ -57,12 +55,16 @@ module Cask cask.versions.each do |version| versioned_staged_path = cask.caskroom_path.join(version) install_info << versioned_staged_path.to_s - .concat(" (") - .concat(versioned_staged_path.exist? ? versioned_staged_path.abv : Formatter.error("does not exist")) - .concat(")") + .concat(" (") + .concat( + if versioned_staged_path.exist? + then versioned_staged_path.abv + else Formatter.error("does not exist") + end, + ).concat(")") install_info << "\n" end - return install_info.strip + return install_info.strip else "Not installed" end diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb index c65a1395da..df1f747878 100644 --- a/Library/Homebrew/cask/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -49,8 +49,10 @@ module Cask caveats = cask.caveats return if caveats.empty? - "#{ohai_title "Caveats"}\n"\ - "#{caveats}\n" + <<~EOS + #{ohai_title "Caveats"} + #{caveats} + EOS end def fetch