fast_ci 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c198e20b22117ce90305fa7c2f82c512ef268097b46c63fcb9cdfaaa9c45aa1d
-  data.tar.gz: cede75f91ab2fad8ee74715660a273ed9a0f229f40beb0875b4edc6ae253d550
+  metadata.gz: 76c1186cf1228f3465acc2228203c51070ac0c80c18f567dec89d7bdcacca0c2
+  data.tar.gz: 15ab92271b656e5020a52f8b98fb1d53f587d7626f3c6035aa426b0cf57707f7
 SHA512:
-  metadata.gz: 04040e4fff496fe2065fc2f120160fc29f253322abe3f6f526f9516e88bd9feb98ddb1319ce161858f204eacc2c59d6dccd2390645b1f168e254a91ad1ccb89e
-  data.tar.gz: 168c07fddb1154357fa647d5d59e61a8a248206f933a96f437ff4ac8d2a485b56c8b15b0cecc05a9974ad181d8cff8cc999129767ae92de4993c6ea20fdbd40c
+  metadata.gz: bab65efe177bb36d558cd3d50977b11cf2422aed04c70791bac94b1f62d5e533099e7cdf0d3123363da31cbed50c57b472b23e00d67a6b3c474b03999d2fc4b3
+  data.tar.gz: db5e94d7764901155fe12199da461dfd7da3a72155de0a1f918f07fe8897202b6c55e3a92b62e08560e1b462979fc8b4c7842bd3f539f7cf012134506ce9a50e

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    fast_ci (1.1.0)
+    fast_ci (1.2.0)
       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.2.0"
 end

data/lib/fast_ci.rb

@@ -124,9 +124,9 @@ module FastCI
       @on[event] = block
     end
 
-    def send_msg(event, payload = {})
+    def send_msg(event, payload = {}, custom_topic = nil)
       FastCI.debug("ws#send_msg: #{event} -> #{payload.inspect}")
-      connection.write({ "topic": topic, "event": event, "payload": payload, "ref": ref })
+      connection.write({ "topic": custom_topic || topic, "event": event, "payload": payload, "ref": ref })
       connection.flush
     end
 
@@ -159,6 +159,20 @@ module FastCI
       end
     end
 
+    def start_heartbeat
+      Async do
+        loop do
+          sleep 30
+          send_heartbeat
+        end
+      end
+    end
+
+    def send_heartbeat
+      FastCI.debug("Sending heartbeat")
+      send_msg("heartbeat", {}, "phoenix")
+    end
+
     def await(retry_count = 0)
       connect_to_ws do
         send_msg("phx_join")
@@ -216,6 +230,7 @@ module FastCI
 
     # https://github.com/bblimke/webmock/blob/b709ba22a2949dc3bfac662f3f4da88a21679c2e/lib/webmock/http_lib_adapters/async_http_client_adapter.rb#L8
     def after_start_connection
+      start_heartbeat
       if defined?(WebMock::HttpLibAdapters::AsyncHttpClientAdapter)
         WebMock::HttpLibAdapters::AsyncHttpClientAdapter.enable!
       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.2.0
 platform: ruby
 authors:
 - Nesha Zoric
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2025-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -174,7 +174,7 @@ metadata:
   homepage_uri: https://github.com/RubyCI/fast_ci_gem
   source_code_uri: https://github.com/RubyCI/fast_ci_gem
   changelog_uri: https://github.com/RubyCI/fast_ci_gem
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for creating FastCI integrations
 test_files: []