admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils: highlight items in column-wise output

Browse Source 
Closes Homebrew/homebrew#44343.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Martin Afanasjew 2015-10-02 21:56:05 +02:00 committed by Mike McQuaid
parent c3e7a64648
commit 4cf703d5d8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/Homebrew/utils.rb
View File

@ -42,6 +42,10 @@ class Tty
bold 30
end
def highlight
bold 43
end
def width
`/usr/bin/tput cols`.strip.to_i
end
@ -253,13 +257,9 @@ def curl(*args)
safe_system curl, *args
end
def puts_columns(items, star_items = [])
def puts_columns(items, highlight = [])
return if items.empty?
if star_items && star_items.any?
items = items.map { |item| star_items.include?(item) ? "#{item}*" : item }
end
unless $stdout.tty?
puts items
return
@ -276,9 +276,18 @@ def puts_columns(items, star_items = [])
rows = (items.size + cols - 1) / cols
cols = (items.size + rows - 1) / rows # avoid empty trailing columns
plain_item_lengths = items.map(&:length) if cols >= 2
if highlight && highlight.any?
items = items.map do |item|
highlight.include?(item) ? "#{Tty.highlight}#{item}#{Tty.reset}" : item
end
end
if cols >= 2
col_width = (console_width + col_gap) / cols - col_gap
items = items.map { |item| item.ljust(col_width) }
items = items.each_with_index.map do |item, index|
item + "".ljust(col_width - plain_item_lengths[index])
end
end
if cols == 1