From 34c1a6f850261022ceca4c09faef1e3124bfcf40 Mon Sep 17 00:00:00 2001 From: Adrian Ho Date: Mon, 2 Aug 2021 13:54:33 +0800 Subject: [PATCH] gist-logs: grab files in subdirectories too --- Library/Homebrew/cmd/gist-logs.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/gist-logs.rb b/Library/Homebrew/cmd/gist-logs.rb index d9a184a948..34bccebc50 100644 --- a/Library/Homebrew/cmd/gist-logs.rb +++ b/Library/Homebrew/cmd/gist-logs.rb @@ -92,15 +92,19 @@ module Homebrew result end - def load_logs(dir) + def load_logs(dir, basedir = dir) logs = {} if dir.exist? dir.children.sort.each do |file| - contents = file.size? ? file.read : "empty log" - # small enough to avoid GitHub "unicorn" page-load-timeout errors - max_file_size = 1_000_000 - contents = truncate_text_to_approximate_size(contents, max_file_size, front_weight: 0.2) - logs[file.basename.to_s] = { content: contents } + if file.directory? + logs.merge! load_logs(file, basedir) + else + contents = file.size? ? file.read : "empty log" + # small enough to avoid GitHub "unicorn" page-load-timeout errors + max_file_size = 1_000_000 + contents = truncate_text_to_approximate_size(contents, max_file_size, front_weight: 0.2) + logs[file.relative_path_from(basedir).to_s.tr("/", ":")] = { content: contents } + end end end odie "No logs." if logs.empty?