fast_ci 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c198e20b22117ce90305fa7c2f82c512ef268097b46c63fcb9cdfaaa9c45aa1d
-  data.tar.gz: cede75f91ab2fad8ee74715660a273ed9a0f229f40beb0875b4edc6ae253d550
+  metadata.gz: cde3318f98f75d587d3151007dd38a0336106709b3df12bc971fc720275adc64
+  data.tar.gz: a600f3f55cdf8c479b9b9f555e3a9818d2a26113af146994c5ce809c38b928da
 SHA512:
-  metadata.gz: 04040e4fff496fe2065fc2f120160fc29f253322abe3f6f526f9516e88bd9feb98ddb1319ce161858f204eacc2c59d6dccd2390645b1f168e254a91ad1ccb89e
-  data.tar.gz: 168c07fddb1154357fa647d5d59e61a8a248206f933a96f437ff4ac8d2a485b56c8b15b0cecc05a9974ad181d8cff8cc999129767ae92de4993c6ea20fdbd40c
+  metadata.gz: 654096c3ac8764a47cf7122a66e6b931fe349fffea27e37cbe1875de914efe9d3acad2fe319783fbd0c0651099fb23e510324ad399b8835980b58b070be7e65e
+  data.tar.gz: fe743b69df08bd40150ad3d09a93e468b81217a36462d5c3e872db32351aa9b74ed11dad06e70f8574cb211cf5e32ac38e573d5e3681b4e0682e0d14d8590632

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    fast_ci (1.1.0)
+    fast_ci (1.1.1)
       async-websocket (<= 0.20.0)
       brakeman (>= 5.4.1)
       console (>= 1.10.0)
@@ -80,7 +80,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.1)
     equalizer (0.0.11)
-    erubi (1.13.0)
+    erubi (1.13.1)
     fiber-local (1.0.0)
     flay (2.13.3)
       erubi (~> 1.10)
@@ -98,13 +98,13 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    logger (1.6.1)
+    logger (1.6.4)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
     minitest-rails (6.1.1)
       minitest (~> 5.10)
       railties (~> 6.1.0)
@@ -179,7 +179,7 @@ GEM
       simplecov (>= 0.17.0)
       tty-which (~> 0.4.0)
       virtus (~> 1.0)
-    sexp_processor (4.17.2)
+    sexp_processor (4.17.3)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/lib/fast_ci/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastCI
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/minitest/fastci_plugin.rb

@@ -3,6 +3,45 @@ require_relative "reporters/fastci_reporter"
 module Minitest
   def self.plugin_fastci_init(options)
     if ENV['FAST_CI_SECRET_KEY'].present?
+      FastCI.configure { |c| c.run_key = "minitest" }
+      Minitest.class_eval do
+        class<< self
+          def __run reporter, options
+            suites = Minitest::Runnable.runnables
+            tests = {}
+            suit_paths = {}
+            suites.each do |suite|
+              path = "./#{Object.const_source_location(suite.name)[0].gsub(Regexp.new("^#{::Rails.root}/"), '')}"
+              next if path.starts_with?('./vendor/bundle')
+              tests[path] ||= { run_time: 0.0, file_status: 'pending', test_count: suite.runnable_methods.count, test_counters: { failed: 0, passed: 0, pending: 0 }, '1' => {} }
+              suit_paths[path] = suite
+              suite.runnable_methods.each_with_index do |method, ix|
+                description = method.split(':')[1..-1].join(':')
+                tests[path]['1'][(ix + 1).to_s] ||= { status: 'pending', description: description }
+              end
+            end
+      
+            FastCI.minitest_ws.on(:enq_request) do
+              tests
+            end
+      
+            FastCI.minitest_ws.on(:deq) do |api_tests|
+              run_suites = api_tests.map do |test_path|
+                suit_paths[test_path]
+              end
+              parallel, serial = run_suites.partition { |s| s.test_order == :parallel }
+
+              serial.map { |suite| suite.run reporter, options }
+              parallel.map { |suite| suite.run reporter, options }
+              
+              fc_reporter = reporter.report.select {|r| r.class == Minitest::Reporters::FastCIReporter }.first
+              fc_reporter.test_results
+            end
+            FastCI.minitest_await
+          end
+        end
+      end
+
       Minitest.reporter << Minitest::Reporters::FastCIReporter.new
     end
   end

data/lib/minitest/reporters/fastci_reporter.rb

@@ -31,18 +31,6 @@ module Minitest
         @test_results = {}
         @ids = {}
         @events = []
-
-        $stdout = StringIO.new()
-
-        if ENV['RBCI_REMOTE_TESTS'] != 'true'
-          FastCI.minitest_ws.on(:enq_request) do
-            tests
-          end
-
-          FastCI.minitest_ws.on(:deq) do |api_tests|
-            test_results
-          end
-        end
       end
 
       def start
@@ -63,20 +51,18 @@ module Minitest
       end
       
       def before_test(test)
-        $stdout = StringIO.new()
       end
 
       def prerecord(klass, name)
         description = test_description(name)
         path = test_path(klass.name)
 
-        test_results[path] ||= { run_time: 0.0, file_status: 'pending', test_count: 0, test_counters: { failed: 0, passed: 0, pending: 0 }, '1' => { description: klass.name } }
-        test_results[path][:test_count] += 1
+        test_results[path] ||= { '1' => {} }
 
         id = (test_results[path]['1'].keys.size + 1).to_s
         ids[description] = id
 
-        test_results[path]['1'][id] ||= { status: 'pending', description: description }
+        test_results[path]['1'][id] ||= { status: 'pending' }
         test_results[path]['1'][id][:start] = Minitest.clock_time
 
         tests[path] ||= { run_time: 0.0, file_status: 'pending', test_count: 0, test_counters: { failed: 0, passed: 0, pending: 0 }, '1' => {} }
@@ -85,7 +71,6 @@ module Minitest
       end
 
       def record(result)
-        test_finished(result)
         description = test_description(result.name)
         id = ids[description]
         path = test_path(result.klass)
@@ -93,8 +78,8 @@ module Minitest
         test_results[path]['1'][id][:end] = Minitest.clock_time
         test_results[path]['1'][id][:run_time] = test_results[path]['1'][id][:end] - test_results[path]['1'][id][:start]
         test_results[path]['1'][id][:status] = result_status(result).to_s
-        test_results[path][:test_counters][result_status(result)] += 1
-        test_results[path][:run_time] += test_results[path]['1'][id][:run_time]
+        test_results[path]['1'][id].delete(:start)
+        test_results[path]['1'][id].delete(:end)
       end
 
       def report
@@ -108,13 +93,6 @@ module Minitest
               file_status = 'failed'
             end
           end
-          test_results[path][:file_status] = file_status
-        end
-
-        if ENV['RBCI_REMOTE_TESTS'] == 'true'
-          send_events
-        else
-          FastCI.minitest_await
         end
       end
 
@@ -131,16 +109,7 @@ module Minitest
           end
         end
 
-        pass = results.any? {|reult| !result }
-
-        if pass
-          @events << ['run_minitest'.upcase, { succeed_after: 1 }]
-        else
-          @events << ['run_minitest'.upcase, { failed_after: 1 }]
-        end
-        send_events if ENV['RBCI_REMOTE_TESTS'] == 'true'
-
-        return pass
+        return results.any? {|reult| !result }
       end
 
       def method_missing(method, *args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_ci
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nesha Zoric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console