danger-xcode_summary 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f4af287c0370b31f01a690b01e813461929e52ab57fce3285aa66bcaff49c4
-  data.tar.gz: ed22370ea6a8c18a4fe031ab7b8dac06654ddbc31a45862d7232520b4b98955e
+  metadata.gz: 7f25343e3fe6e71f252e63e5874c5663ebf9b51ee797891a152cd7e2af4d1ebc
+  data.tar.gz: 22b537f085e5d3c7665b84de1b9eca6b1209fb718149470fd3cf7a1bf6a23bd9
 SHA512:
-  metadata.gz: 6fb83b4b61b89603f5b4075c67039cabcf1221defda9106583ac9b569be141fcc7cbb33475f4369eaca4c77eabd86868a9ae99cd891ee2a820764de805fcf6b9
-  data.tar.gz: b8ce24b92d313924532bf56626f4493cd8a1e2a9fa57beaeea66ac50cc08b40a5e5ed09c2aa8721bcce6d18a71d33820e777584e98a368517ed4d888fdea821b
+  metadata.gz: 2110fe068bad96009dd912161fa6ef43eeda1e05ba47453ef81b07cc2821c4c0455b3b3d0ef91cb593fc3df166669e55a602a20a4bc6d34905f070571bae31d0
+  data.tar.gz: 071fcaecbf8488ce2b59efdc02eb778d2230283c97de53117155232c5ab8ad2f7bc0c14e4f749bd0d0f4648a8a115f3a4040ab28b2bebf83693ebc71be5d6bae

data/.github/workflows/ruby.yml

@@ -29,8 +29,8 @@ jobs:
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+      uses: ruby/setup-ruby@v1
+    # uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.rubocop.yml

@@ -24,7 +24,7 @@ Style/ClassAndModuleChildren:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 60
+  Max: 66
 
 # The %w might be confusing for new users
 Style/WordArray:

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    danger-xcode_summary (1.3.0)
+    danger-xcode_summary (1.4.0)
       danger-plugin-api (~> 1.0)
-      xcresult (~> 0.2)
+      xcresult (~> 0.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
-    base64 (0.2.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
+    base64 (0.3.0)
     claide (1.1.0)
     claide-plugins (0.9.2)
       cork
@@ -21,7 +21,8 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (9.4.3)
+    danger (9.5.1)
+      base64 (~> 0.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -31,29 +32,33 @@ GEM
       git (~> 1.13)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
       octokit (>= 4.0)
+      pstore (~> 0.1)
       terminal-table (>= 1, < 4)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    diff-lcs (1.5.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    diff-lcs (1.6.2)
+    faraday (2.13.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-net_http (3.1.0)
-      net-http
-    ffi (1.16.3)
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
+    ffi (1.17.2)
     formatador (1.1.0)
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    guard (2.18.1)
+    guard (2.19.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
+      ostruct (~> 0.6)
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
@@ -62,85 +67,90 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    json (2.7.1)
-    kramdown (2.4.0)
-      rexml
+    json (2.12.2)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     lumberjack (1.2.10)
-    method_source (1.0.0)
+    method_source (1.1.0)
     nap (1.1.0)
     nenv (0.3.0)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
-    no_proxy_fix (0.1.2)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (8.1.0)
-      base64
+    octokit (10.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    ostruct (0.6.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    prism (1.4.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    pstore (0.2.0)
+    public_suffix (6.0.2)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rchardet (1.8.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rspec (3.13.0)
+    rchardet (1.9.0)
+    regexp_parser (2.10.0)
+    rexml (3.4.1)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.4)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rspec-support (3.13.4)
+    rubocop (1.76.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     ruby-progressbar (1.13.0)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.0)
-    unicode-display_width (2.5.0)
-    uri (0.13.0)
-    xcresult (0.2.1)
-    yard (0.9.34)
+    terminal-table (1.6.0)
+    thor (1.3.2)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    xcresult (0.2.2)
+    yard (0.9.37)
 
 PLATFORMS
   ruby

data/README.md

@@ -107,6 +107,10 @@ xcode_summary.ignored_results { |result|
 }
 
 xcode_summary.report 'MyApp.xcresult'
+
+# When `true`, collapses parallelized test runs of the same target into one line.
+# Defaults to `false`.
+xcode_summary.collapse_parallelized_tests = true
 ```
 
 You can use `ignores_warnings` to supress warnings and shows only errors.

data/danger-xcode_summary.gemspec

@@ -3,7 +3,7 @@
 lib = File.expand_path('lib', __dir__)
 
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'xcode_summary/gem_version.rb'
+require 'xcode_summary/gem_version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'danger-xcode_summary'
@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_dependency 'xcresult', '~> 0.2'
-  spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
+  spec.add_dependency 'danger-plugin-api', '~> 1.0'
+  spec.add_dependency 'xcresult', '~> 0.2.2'
 
   # General ruby development
   spec.add_development_dependency 'bundler', '>= 2.2.10'

data/lib/xcode_summary/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module XcodeSummary
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/lib/xcode_summary/plugin.rb

@@ -82,6 +82,12 @@ module Danger
     # @return   [Boolean]
     attr_accessor :strict
 
+    # Defines if parallelized test runs from the same target should be collapsed into one message.
+    # Defaults to `false`
+    # @param    [Boolean] value
+    # @return   [Boolean]
+    attr_accessor :collapse_parallelized_tests
+
     # rubocop:disable Lint/DuplicateMethods
     def project_root
       root = @project_root || Dir.pwd
@@ -106,7 +112,7 @@ module Danger
     end
 
     def test_summary
-      @test_summary.nil? ? true : @test_summary
+      @test_summary.nil? || @test_summary
     end
 
     def inline_mode
@@ -118,7 +124,11 @@ module Danger
     end
 
     def strict
-      @strict.nil? ? true : @strict
+      @strict.nil? || @strict
+    end
+
+    def collapse_parallelized_tests
+      @collapse_parallelized_tests || false
     end
 
     # Pick a Dangerfile plugin for a chosen request_source and cache it
@@ -211,26 +221,63 @@ module Danger
 
     def messages(xcode_summary)
       if test_summary
-        test_messages = xcode_summary.action_test_plan_summaries.map do |test_plan_summaries|
+        test_runs = xcode_summary.action_test_plan_summaries.map do |test_plan_summaries|
           test_plan_summaries.summaries.map do |summary|
             summary.testable_summaries.map do |test_summary|
               test_summary.tests.filter_map do |action_test_object|
                 if action_test_object.instance_of? XCResult::ActionTestSummaryGroup
                   subtests = action_test_object.all_subtests
                   subtests_duration = subtests.map(&:duration).sum
-                  test_text_infix = subtests.count == 1 ? 'test' : 'tests'
+
                   failed_tests_count = subtests.reject { |test| test.test_status == 'Success' }.count
                   expected_failed_tests_count = subtests.select { |test| test.test_status == 'Expected Failure' }.count
 
-                  "#{test_summary.target_name}: Executed #{subtests.count} #{test_text_infix}, " \
-                    "with #{failed_tests_count} failures (#{expected_failed_tests_count} expected) in " \
-                    "#{subtests_duration.round(3)} (#{action_test_object.duration.round(3)}) seconds"
+                  {
+                    target_name: test_summary.target_name,
+                    test_count: subtests.count,
+                    failed_tests_count: failed_tests_count,
+                    expected_failed_tests_count: expected_failed_tests_count,
+                    tests_duration: subtests_duration,
+                    action_duration: action_test_object.duration
+                  }
                 end
               end
             end
           end
         end
-        test_messages.flatten.uniq.compact.map(&:strip)
+
+        flattened_test_runs = test_runs.flatten.uniq.compact
+
+        if collapse_parallelized_tests
+          test_runs_by_target = flattened_test_runs.group_by { |test_run| test_run[:target_name] }
+          flattened_test_runs = test_runs_by_target.map do |target_name, test_runs|
+            test_runs.reduce do |acc, test_run|
+              acc.merge(
+                test_count: acc[:test_count] + test_run[:test_count],
+                failed_tests_count: acc[:failed_tests_count] + test_run[:failed_tests_count],
+                expected_failed_tests_count: acc[:expected_failed_tests_count] + test_run[:expected_failed_tests_count],
+                tests_duration: acc[:tests_duration] + test_run[:tests_duration],
+                action_duration: acc[:action_duration] + test_run[:action_duration]
+              )
+            end
+          end
+        end
+
+        test_messages = flattened_test_runs.map do |test_run|
+          target_name = test_run[:target_name]
+          test_count = test_run[:test_count]
+          failed_tests_count = test_run[:failed_tests_count]
+          expected_failed_tests_count = test_run[:expected_failed_tests_count]
+          subtests_duration = test_run[:tests_duration]
+          action_duration = test_run[:action_duration]
+          test_text_infix = test_count == 1 ? 'test' : 'tests'
+
+          "#{target_name}: Executed #{test_count} #{test_text_infix}, " \
+            "with #{failed_tests_count} failures (#{expected_failed_tests_count} expected) in " \
+            "#{subtests_duration.round(3)} (#{action_duration.round(3)}) seconds"
+        end
+
+        test_messages.map(&:strip)
       else
         []
       end

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@
 
 require 'pathname'
 ROOT = Pathname.new(File.expand_path('..', __dir__))
-$LOAD_PATH.unshift("#{ROOT}lib".to_s)
-$LOAD_PATH.unshift("#{ROOT}spec".to_s)
+$LOAD_PATH.unshift("#{ROOT}lib")
+$LOAD_PATH.unshift("#{ROOT}spec")
 
 require 'bundler/setup'
 require 'pry'
@@ -30,7 +30,6 @@ end
 # it comes with an extra function `.string` which will
 # strip all ANSI colours from the string.
 
-# rubocop:disable Lint/NestedMethodDefinition
 def testing_ui
   @output = StringIO.new
   def @output.winsize
@@ -43,7 +42,6 @@ def testing_ui
   end
   cork
 end
-# rubocop:enable Lint/NestedMethodDefinition
 
 # Example environment (ENV) that would come from
 # running a PR on TravisCI

data/spec/xcode_summary_spec.rb

@@ -257,6 +257,60 @@ module Danger
             expect(result).to eq '{"warnings":21,"errors":3}'
           end
         end
+
+        context 'with collapse_parallelized_tests' do
+          context 'enabled' do
+            before do
+              @xcode_summary.collapse_parallelized_tests = true
+            end
+
+            it 'collapses test runs from the same target' do
+              # Allow for message receiving testing
+              allow(@xcode_summary).to receive(:message).and_call_original
+              @xcode_summary.report('spec/fixtures/swiftlint.xcresult')
+
+              # Ensure that the plugin received a call to message with the combined test results
+              expect(@xcode_summary).to have_received(:message).with(/SwiftLintFrameworkTests: Executed .* tests/m, sticky: false)
+
+              # The standard test case should only show one message per target, even with parallelized tests
+              expect(@dangerfile.status_report[:messages].length).to eq(1)
+            end
+          end
+
+          context 'disabled' do
+            before do
+              @xcode_summary.collapse_parallelized_tests = false
+            end
+
+            it 'shows individual test runs for each target' do
+              @xcode_summary.report('spec/fixtures/swiftlint.xcresult')
+
+              # We know from the existing tests that the standard behavior should match
+              # the test in the "summary" context, with one test run per message
+              expect(@dangerfile.status_report[:messages]).to eq [
+                'SwiftLintFrameworkTests: Executed 540 tests, with 1 failures (0 expected) in 114.029 (27.922) seconds'
+              ]
+            end
+          end
+
+          context 'with default value' do
+            it 'defaults to disabled behavior' do
+              # Don't set collapse_parallelized_tests to test the default
+              # Reset any test_summary setting to ensure clean state
+              @xcode_summary.test_summary = true
+
+              @xcode_summary.report('spec/fixtures/swiftlint.xcresult')
+
+              # Default should match the disabled behavior
+              expect(@dangerfile.status_report[:messages]).to eq [
+                'SwiftLintFrameworkTests: Executed 540 tests, with 1 failures (0 expected) in 114.029 (27.922) seconds'
+              ]
+
+              # Verify the default value is false
+              expect(@xcode_summary.collapse_parallelized_tests).to eq(false)
+            end
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-xcode_summary
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Diogo Tridapalli
@@ -9,36 +9,36 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: xcresult
+  name: danger-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: danger-plugin-api
+  name: xcresult
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement