Simplified code and added ability to show skipped tests

Author: toote

ruby/bin/annotate

@@ -19,16 +19,19 @@ failure_format = 'classname' if !failure_format || failure_format.empty?
 
 report_slowest = ENV['BUILDKITE_PLUGIN_JUNIT_ANNOTATE_REPORT_SLOWEST'].to_i
 
-class Failure < Struct.new(:name, :unit_name, :body, :job, :type, :message)
+class Failure < Struct.new(:name, :unit_name, :body, :job, :message)
 end
 
 class Timing < Struct.new(:name, :unit_name, :time)
 end
 
 junit_report_files = Dir.glob(File.join(junits_dir, "**", "*"), File::FNM_DOTMATCH)
 testcases = 0
-skipped = 0
-failures = []
+tests = {
+  failure: [],
+  error: [],
+  skipped: []
+}
 timings = []
 
 def text_content(element)
@@ -65,29 +68,22 @@ junit_report_files.sort.each do |file|
     unit_name = testcase.attributes[failure_format].to_s
     time = testcase.attributes['time'].to_f
     timings << Timing.new(name, unit_name, time)
-    testcase.elements.each("failure") do |failure|
-      failures << Failure.new(name, unit_name, text_content(failure), job, :failure, message_content(failure))
-    end
-    testcase.elements.each("error") do |error|
-      failures << Failure.new(name, unit_name, text_content(error), job, :error, message_content(error))
-    end
-    testcase.elements.each("skipped") do |skip|
-      skipped += 1
+    testcase.elements.each("failure | error | skipped") do |elem|
+      tests[elem.name.to_sym] << Failure.new(name, unit_name, text_content(elem), job, message_content(elem))
     end
   end
 end
 
 STDERR.puts "--- ✍️ Preparing annotation"
 
-failures_count = failures.select {|f| f.type == :failure }.length
-errors_count = failures.select {|f| f.type == :error }.length
-
-puts "Failures: #{failures_count}"
-puts "Errors: #{errors_count}"
-puts "Skipped: #{skipped}"
+puts "Failures: #{tests[:failure].length}"
+puts "Errors: #{tests[:error].length}"
+puts "Skipped: #{tests[:skipped].length}"
 puts "Total tests: #{testcases}"
 
-failures.each do |failure|
+tests.delete(:skipped) unless ENV.fetch('BUILDKITE_PLUGIN_JUNIT_ANNOTATE_SKIPPED_FORMAT', 'none') != 'none'
+
+tests.values.flatten.each do |failure|
   puts ""
   puts "<details>"
   puts "<summary><code>#{CGI.escapeHTML failure.name} in #{CGI.escapeHTML failure.unit_name}</code></summary>\n\n"
@@ -119,4 +115,4 @@ if report_slowest > 0
   puts "</details>"
 end
 
-exit 64 if failures.any? # special exit code to signal test failures
+exit 64 if tests.values.flatten.any? # special exit code to signal test failures