From 571179ff0ecab9bc03b1b7109ed24ccab187dc03 Mon Sep 17 00:00:00 2001
From: EricFromCanada <enk3@outlook.com>
Date: Mon, 6 Jul 2020 15:30:57 -0400
Subject: [PATCH] pass second argument to ohai when applicable
---
.../Homebrew/cask/artifact/abstract_uninstall.rb | 3 +--
Library/Homebrew/cask/artifact/pkg.rb | 4 ++--
Library/Homebrew/cask/caskroom.rb | 4 ++--
Library/Homebrew/cmd/search.rb | 8 ++------
Library/Homebrew/cmd/update-report.rb | 13 +++----------
Library/Homebrew/dev-cmd/extract.rb | 3 +--
Library/Homebrew/dev-cmd/irb.rb | 3 +--
Library/Homebrew/extend/ENV/shared.rb | 3 +--
Library/Homebrew/mktemp.rb | 5 +----
Library/Homebrew/sandbox.rb | 3 +--
Library/Homebrew/unpack_strategy/dmg.rb | 3 +--
11 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/Library/Homebrew/cask/artifact/abstract_uninstall.rb b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
index 9a67669be3..2eb0967222 100644
--- a/Library/Homebrew/cask/artifact/abstract_uninstall.rb
+++ b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
@@ -367,8 +367,7 @@ module Cask
resolved_paths = each_resolved_path(:trash, paths).to_a
- ohai "Trashing files:"
- puts resolved_paths.map(&:first)
+ ohai "Trashing files:", resolved_paths.map(&:first)
trash_paths(*resolved_paths.flat_map(&:last), **options)
end
diff --git a/Library/Homebrew/cask/artifact/pkg.rb b/Library/Homebrew/cask/artifact/pkg.rb
index f6eef1e42c..8099865081 100644
--- a/Library/Homebrew/cask/artifact/pkg.rb
+++ b/Library/Homebrew/cask/artifact/pkg.rb
@@ -39,8 +39,8 @@ module Cask
private
def run_installer(command: nil, verbose: false, **_options)
- ohai "Running installer for #{cask}; your password may be necessary."
- ohai "Package installers may write to any location; options such as --appdir are ignored."
+ ohai "Running installer for #{cask}; your password may be necessary.",
+ "Package installers may write to any location; options such as --appdir are ignored."
unless path.exist?
pkg = path.relative_path_from(cask.staged_path)
pkgs = Pathname.glob(cask.staged_path/"**"/"*.pkg").map { |path| path.relative_path_from(cask.staged_path) }
diff --git a/Library/Homebrew/cask/caskroom.rb b/Library/Homebrew/cask/caskroom.rb
index 8d91d4582f..c65d5649ac 100644
--- a/Library/Homebrew/cask/caskroom.rb
+++ b/Library/Homebrew/cask/caskroom.rb
@@ -22,8 +22,8 @@ module Cask
sudo = !path.parent.writable?
if sudo && !ENV.key?("SUDO_ASKPASS") && $stdout.tty?
- ohai "Creating Caskroom at #{path}"
- ohai "We'll set permissions properly so we won't need sudo in the future."
+ ohai "Creating Caskroom directory: #{path}",
+ "We'll set permissions properly so we won't need sudo in the future."
end
SystemCommand.run("/bin/mkdir", args: ["-p", path], sudo: sudo)
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 2bffd8e704..9d13a85c37 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -119,15 +119,11 @@ module Homebrew
print_casks = args.cask?
print_formulae = print_casks = true if !print_formulae && !print_casks
- if print_formulae && all_formulae.any?
- ohai "Formulae"
- puts Formatter.columns(all_formulae)
- end
+ ohai "Formulae", Formatter.columns(all_formulae) if print_formulae && all_formulae.any?
if print_casks && all_casks.any?
puts if args.formula? && all_formulae.any?
- ohai "Casks"
- puts Formatter.columns(all_casks)
+ ohai "Casks", Formatter.columns(all_casks)
end
count = all_formulae.count + all_casks.count
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 7b4f87324e..b3a0d48e83 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -470,10 +470,7 @@ class ReporterHub
dump_formula_report :M, "Updated Formulae"
else
updated = select_formula(:M).count
- if updated.positive?
- ohai "Updated Formulae"
- puts "Updated #{updated} #{"formula".pluralize(updated)}."
- end
+ ohai "Updated Formulae", "Updated #{updated} #{"formula".pluralize(updated)}." if updated.positive?
end
dump_formula_report :R, "Renamed Formulae"
dump_formula_report :D, "Deleted Formulae"
@@ -482,10 +479,7 @@ class ReporterHub
dump_formula_report :MC, "Updated Casks"
else
updated = select_formula(:MC).count
- if updated.positive?
- ohai "Updated Casks"
- puts "Updated #{updated} #{"cask".pluralize(updated)}."
- end
+ ohai "Updated Casks", "Updated #{updated} #{"cask".pluralize(updated)}." if updated.positive?
end
dump_formula_report :DC, "Deleted Casks"
end
@@ -525,8 +519,7 @@ class ReporterHub
return if formulae.empty?
# Dump formula list.
- ohai title
- puts Formatter.columns(formulae.sort)
+ ohai title, Formatter.columns(formulae.sort)
end
def installed?(formula)
diff --git a/Library/Homebrew/dev-cmd/extract.rb b/Library/Homebrew/dev-cmd/extract.rb
index abc3073b63..cb7d0dcc77 100644
--- a/Library/Homebrew/dev-cmd/extract.rb
+++ b/Library/Homebrew/dev-cmd/extract.rb
@@ -214,8 +214,7 @@ module Homebrew
odebug "Overwriting existing formula at #{path}"
path.delete
end
- ohai "Writing formula for #{name} from revision #{rev} to:"
- puts path
+ ohai "Writing formula for #{name} from revision #{rev} to:", path
path.write result
end
diff --git a/Library/Homebrew/dev-cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb
index 6fae810920..2fc25c2e28 100644
--- a/Library/Homebrew/dev-cmd/irb.rb
+++ b/Library/Homebrew/dev-cmd/irb.rb
@@ -59,8 +59,7 @@ module Homebrew
require "keg"
require "cask"
- ohai "Interactive Homebrew Shell"
- puts "Example commands available with: brew irb --examples"
+ ohai "Interactive Homebrew Shell", "Example commands available with: brew irb --examples"
if args.pry?
Pry.start
else
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index ca6ad76f11..2777f56adb 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -276,8 +276,7 @@ module SharedEnvExtension
flags = []
if fc
- ohai "Building with an alternative Fortran compiler"
- puts "This is unsupported."
+ ohai "Building with an alternative Fortran compiler", "This is unsupported."
self["F77"] ||= fc
else
if (gfortran = which("gfortran", (HOMEBREW_PREFIX/"bin").to_s))
diff --git a/Library/Homebrew/mktemp.rb b/Library/Homebrew/mktemp.rb
index ac58541b08..fb1eeb5397 100644
--- a/Library/Homebrew/mktemp.rb
+++ b/Library/Homebrew/mktemp.rb
@@ -65,9 +65,6 @@ class Mktemp
ignore_interrupts { rm_rf(tmpdir) } unless retain?
end
ensure
- if retain? && !@tmpdir.nil? && !@quiet
- ohai "Kept temporary files"
- puts "Temporary files retained at #{@tmpdir}"
- end
+ ohai "Temporary files retained at:", @tmpdir.to_s if retain? && !@tmpdir.nil? && !@quiet
end
end
diff --git a/Library/Homebrew/sandbox.rb b/Library/Homebrew/sandbox.rb
index f2c0dcabf0..459a5384f1 100644
--- a/Library/Homebrew/sandbox.rb
+++ b/Library/Homebrew/sandbox.rb
@@ -127,8 +127,7 @@ class Sandbox
end
if @failed && Homebrew::EnvConfig.verbose?
- ohai "Sandbox log"
- puts logs
+ ohai "Sandbox log", logs
$stdout.flush # without it, brew test-bot would fail to catch the log
end
end
diff --git a/Library/Homebrew/unpack_strategy/dmg.rb b/Library/Homebrew/unpack_strategy/dmg.rb
index d7d84285ad..2b04e12d44 100644
--- a/Library/Homebrew/unpack_strategy/dmg.rb
+++ b/Library/Homebrew/unpack_strategy/dmg.rb
@@ -194,8 +194,7 @@ module UnpackStrategy
)
if verbose && !(eula_text = without_eula.stdout).empty?
- ohai "Software License Agreement for '#{path}':"
- puts eula_text
+ ohai "Software License Agreement for '#{path}':", eula_text
end
with_eula.plist
--
GitLab