diff options
| author | Eero Saynatkari | 2010-03-06 03:11:30 +0200 |
|---|---|---|
| committer | Max Howell | 2010-03-13 14:36:47 +0000 |
| commit | f56e96dfffe6748743bdbb1c0c8767143e924fae (patch) | |
| tree | 2a1910f65315eebf3704f74a61440cc62444c801 /Library | |
| parent | 01eddfea0043e755f859e17c298179dcf5ec68fa (diff) | |
| download | brew-f56e96dfffe6748743bdbb1c0c8767143e924fae.tar.bz2 | |
1.9 fix, String is not an Enumerable.
* Removed use of String altogether since all use cases
are Arrays currently. YAGNI.
* #max_by would have been more elegant, but this way we
can support 1.8.6.
Signed-off-by: Max Howell <max@methylblue.com>
I made the diff less gratuitous. Don't bloat diffs to meet personal coding style preferences :P
Closes Homebrew/homebrew#896
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/utils.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 12410217a..8c9aaa85d 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -96,9 +96,6 @@ def puts_columns items, cols = 4 return if items.empty? if $stdout.tty? - items = items.join("\n") if items.is_a?(Array) - items.concat("\n") unless items.empty? - # determine the best width to display for different console sizes console_width = `/bin/stty size`.chomp.split(" ").last.to_i console_width = 80 if console_width <= 0 @@ -106,7 +103,7 @@ def puts_columns items, cols = 4 optimal_col_width = (console_width.to_f / (longest.length + 2).to_f).floor cols = optimal_col_width > 1 ? optimal_col_width : 1 - IO.popen("/usr/bin/pr -#{cols} -t -w#{console_width}", "w"){|io| io.write(items) } + IO.popen("/usr/bin/pr -#{cols} -t -w#{console_width}", "w"){|io| io.puts(items) } else puts *items end |