Merge pull request #677 from sjackman/print-dependencies

install_dependencies: Do not truncate dependencies
This commit is contained in:
Mike McQuaid 2016-08-14 09:44:07 +01:00 committed by GitHub
commit c008797ffe
2 changed files with 7 additions and 4 deletions

View File

@ -406,8 +406,9 @@ class FormulaInstaller
def install_dependencies(deps)
if deps.empty? && only_deps?
puts "All dependencies for #{formula.full_name} are satisfied."
else
oh1 "Installing dependencies for #{formula.full_name}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}" unless deps.empty?
elsif !deps.empty?
oh1 "Installing dependencies for #{formula.full_name}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}",
:truncate => false
deps.each { |dep, options| install_dependency(dep, options) }
end

View File

@ -88,8 +88,10 @@ def ohai(title, *sput)
puts sput
end
def oh1(title)
title = Tty.truncate(title) if $stdout.tty? && !ARGV.verbose?
def oh1(title, options = {})
if $stdout.tty? && !ARGV.verbose? && options.fetch(:truncate, :auto) == :auto
title = Tty.truncate(title)
end
puts "#{Tty.green}==>#{Tty.white} #{title}#{Tty.reset}"
end