From 777b6426d542acd0ead2e24af2cdeb5cda478a78 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 6 Oct 2013 19:05:34 -0400 Subject: [PATCH 1/1] Only output the header when there's plugin output. --- bin/mailshears | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bin/mailshears b/bin/mailshears index 441708e..389c177 100755 --- a/bin/mailshears +++ b/bin/mailshears @@ -102,7 +102,12 @@ else dummy_runner_class = PruneDummyRunner end -puts make_header(plugin_class.to_s()) + +# Buffer the output so that we can avoid printing the informational +# header when no plugins produce output. +require 'stringio' +output_buffer = StringIO.new() +$stdout = output_buffer plugin_class.includers.each do |plugin_class_includer| plugin = plugin_class_includer.new() @@ -117,5 +122,13 @@ plugin_class.includers.each do |plugin_class_includer| # appropriate runner. The Rm(Dummy)Runner have splats on their # *target arguments as well, to turn ARGV back into an array. runner.run(plugin, *ARGV) +end +# Restore stdout, and print the header plus whatever the plugins +# produced if they produced anything. If they didn't, we avoid +# printing the header. +$stdout = STDOUT +if output_buffer.size > 0 then + puts make_header(plugin_class.to_s()) + puts output_buffer.string() end -- 2.43.2