rspec-mergify 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea10824d5251a6814614815a6a4810591e4ed3fe0980d731a5cfcf5c834fa6c8
-  data.tar.gz: 28ca44cd61f5b92a280b3d4bf946cdd956316b99cc489dd767b28470e4b902b8
+  metadata.gz: 6620dc68c37035d9a03d498baaa8d190df7d27ab7d31fdab36b08ae7b937b382
+  data.tar.gz: c67c51eec28faf72ad4840571107b251bb6eff923e96274be2c3345fdd672d1d
 SHA512:
-  metadata.gz: 3c7c2a9d250516364d3b051e019d35b97b873ce7dbe8d5200d9aad9f1ef832de1a6d7386f4cb9367fcad35ff66f088bc235bb8123e0b377f3dfb5cee07741985
-  data.tar.gz: 2c5d31956e19e4d6c71463b75c26818e89e0e4c2de8cac4d92ca9997b50d87b1195783cfdcf375bcc70fa36a99e544ba91021aaf50e92042469f1eb0e40f31d3
+  metadata.gz: 485019cda8980abe528dcc4833eec21c662f209e2c7b7ae966ecc32ce284b06eb25e3c919496329d94eea8f70e1b7dc889a770e42e4cec40f6db3d9cd1763882
+  data.tar.gz: 9552f28c2d015ce6aa70f81cb50c021037c971619a3cafa19269654f997afb30540293426d18d3bcc8236e945aeaea2bc49d86ba43c57c71dff26e048112f260

data/lib/mergify/rspec/configuration.rb

@@ -16,6 +16,16 @@ module Mergify
           # Add formatter when in CI
           config.add_formatter(Mergify::RSpec::Formatter) if Utils.in_ci?
 
+          # Flaky detection: prepare session with all example IDs
+          config.before(:suite) do
+            ci = Mergify::RSpec.ci_insights
+            fd = ci&.flaky_detector
+            if fd
+              all_ids = ::RSpec.world.example_groups.flat_map(&:descendants).flat_map(&:examples).map(&:id)
+              fd.prepare_for_session(all_ids)
+            end
+          end
+
           # Quarantine: mark tests before execution
           config.before(:each) do |example|
             ci = Mergify::RSpec.ci_insights
@@ -32,14 +42,24 @@ module Mergify
 
             example.run
 
-            next unless fd&.rerunning_test?(example.id)
+            # Feed metrics from the initial run so the detector can evaluate
+            if fd
+              run_time = example.execution_result.run_time || 0.0
+              status = example.execution_result.status
+              fd.fill_metrics_from_report(example.id, 'setup', 0.0, status)
+              fd.fill_metrics_from_report(example.id, 'call', run_time, status)
+              fd.fill_metrics_from_report(example.id, 'teardown', 0.0, status)
+            end
 
-            fd.set_test_deadline(example.id)
-            next if fd.test_too_slow?(example.id)
+            next unless fd&.rerunning_test?(example.id)
 
+            # Mark as flaky detection candidate (even if too slow to rerun)
             example.metadata[:mergify_flaky_detection] = true
             example.metadata[:mergify_new_test] = true if fd.mode == 'new'
 
+            fd.set_test_deadline(example.id)
+            next if fd.test_too_slow?(example.id)
+
             distinct_outcomes = Set.new
             distinct_outcomes.add(example.execution_result.status) if example.execution_result.status
 

data/lib/mergify/rspec/formatter.rb

@@ -189,13 +189,13 @@ module Mergify
         output.puts report if report
       end
 
-      def flush_and_shutdown
+      def flush_and_shutdown # rubocop:disable Metrics/MethodLength
         return unless @ci_insights&.tracer_provider
 
         begin
           @ci_insights.tracer_provider.force_flush
         rescue StandardError => e
-          output.puts "Error while exporting traces: #{e.message}"
+          print_export_error(e)
         end
 
         begin
@@ -204,6 +204,17 @@ module Mergify
           output.puts "Error while shutting down the tracer: #{e.message}"
         end
       end
+
+      def print_export_error(error)
+        output.puts "Error while exporting traces: #{error.message}"
+        output.puts ''
+        output.puts 'Common issues:'
+        output.puts '  - Your MERGIFY_TOKEN might not be set or could be invalid'
+        output.puts '  - CI Insights might not be enabled for this repository'
+        output.puts '  - There might be a network connectivity issue with the Mergify API'
+        output.puts ''
+        output.puts 'Documentation: https://docs.mergify.com/ci-insights/test-frameworks/'
+      end
     end
     # rubocop:enable Metrics/ClassLength
   end

data/lib/mergify/rspec/version.rb

@@ -2,8 +2,17 @@
 
 module Mergify
   module RSpec
-    VERSION = `git describe --tags --match '*' 2>/dev/null`.then do |v|
-      v.empty? ? '0.0.0.dev' : v.tr('-', '.')
+    VERSION = begin
+      v = `git describe --tags 2>/dev/null`.strip.delete_prefix('v')
+      if v.empty?
+        '0.0.0.dev'
+      elsif v.include?('-')
+        # e.g. "0.1.0-3-gabc123" -> "0.1.0.dev3"
+        parts = v.split('-')
+        "#{parts[0]}.dev#{parts[1]}"
+      else
+        v
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mergify
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - Mergify