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

Move Formatter.columns into utils/formatter.

Browse Source
This commit is contained in:
Markus Reiter 2016-10-15 17:15:20 +02:00
parent ef70677e88
commit 581a1245bf
2 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Library/Homebrew/utils/formatter.rb
View File

@ -1,4 +1,3 @@
require "utils/formatter/columns"
require "utils/tty"
module Formatter
@ -50,4 +49,45 @@ module Formatter
end
end
private_class_method :prefix
def columns(*objects, gap_size: 2)
objects = objects.flatten.map(&:to_s)
fallback = proc do
return objects.join("\n").concat("\n")
end
fallback.call if objects.empty?
fallback.call if respond_to?(:tty?) ? !tty? : !$stdout.tty?
console_width = Tty.width
object_lengths = objects.map { |obj| Tty.strip_ansi(obj).length }
cols = (console_width + gap_size) / (object_lengths.max + gap_size)
fallback.call if cols < 2
rows = (objects.count + cols - 1) / cols
cols = (objects.count + rows - 1) / rows # avoid empty trailing columns
col_width = (console_width + gap_size) / cols - gap_size
gap_string = "".rjust(gap_size)
output = ""
rows.times do |row_index|
item_indices_for_row = row_index.step(objects.size - 1, rows).to_a
first_n = item_indices_for_row[0...-1].map { |index|
objects[index] + "".rjust(col_width - object_lengths[index])
}
# don't add trailing whitespace to last column
last = objects.values_at(item_indices_for_row.last)
output.concat((first_n + last).join(gap_string)).concat("\n")
end
output
end
end

46
Library/Homebrew/utils/formatter/columns.rb
View File

@ -1,46 +0,0 @@
require "utils/tty"
module Formatter
module_function
def columns(*objects, gap_size: 2)
objects = objects.flatten.map(&:to_s)
fallback = proc do
return objects.join("\n").concat("\n")
end
fallback.call if objects.empty?
fallback.call if respond_to?(:tty?) ? !tty? : !$stdout.tty?
console_width = Tty.width
object_lengths = objects.map { |obj| Tty.strip_ansi(obj).length }
cols = (console_width + gap_size) / (object_lengths.max + gap_size)
fallback.call if cols < 2
rows = (objects.count + cols - 1) / cols
cols = (objects.count + rows - 1) / rows # avoid empty trailing columns
col_width = (console_width + gap_size) / cols - gap_size
gap_string = "".rjust(gap_size)
output = ""
rows.times do |row_index|
item_indices_for_row = row_index.step(objects.size - 1, rows).to_a
first_n = item_indices_for_row[0...-1].map { |index|
objects[index] + "".rjust(col_width - object_lengths[index])
}
# don't add trailing whitespace to last column
last = objects.values_at(item_indices_for_row.last)
output.concat((first_n + last).join(gap_string)).concat("\n")
end
output
end
end