From 198bf4d3bdeaf3047f9af80788ea18cd192541af Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Sun, 2 Oct 2016 20:39:43 +0200
Subject: Convert `puts_columns` to `puts Formatter.columns`.

---
 Library/Homebrew/utils/formatter.rb         |  1 +
 Library/Homebrew/utils/formatter/columns.rb | 46 +++++++++++++++++++++++++++++
 Library/Homebrew/utils/puts_columns.rb      | 41 -------------------------
 3 files changed, 47 insertions(+), 41 deletions(-)
 create mode 100644 Library/Homebrew/utils/formatter/columns.rb
 delete mode 100644 Library/Homebrew/utils/puts_columns.rb

(limited to 'Library/Homebrew/utils')

diff --git a/Library/Homebrew/utils/formatter.rb b/Library/Homebrew/utils/formatter.rb
index cb4f041f4..3759e2b4f 100644
--- a/Library/Homebrew/utils/formatter.rb
+++ b/Library/Homebrew/utils/formatter.rb
@@ -1,3 +1,4 @@
+require "utils/formatter/columns"
 require "utils/tty"
 
 module Formatter
diff --git a/Library/Homebrew/utils/formatter/columns.rb b/Library/Homebrew/utils/formatter/columns.rb
new file mode 100644
index 000000000..6488ef35f
--- /dev/null
+++ b/Library/Homebrew/utils/formatter/columns.rb
@@ -0,0 +1,46 @@
+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
diff --git a/Library/Homebrew/utils/puts_columns.rb b/Library/Homebrew/utils/puts_columns.rb
deleted file mode 100644
index 2810918c6..000000000
--- a/Library/Homebrew/utils/puts_columns.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require "utils/tty"
-
-module Kernel
-  def puts_columns(*objects, gap_size: 2)
-    objects.flatten!
-
-    fallback = proc do
-      puts(*objects)
-      return
-    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.to_s).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)
-
-    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)
-
-      puts (first_n + last).join(gap_string)
-    end
-  end
-end
-- 
cgit v1.2.3