ruby_ci 0.1.7 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3dc7f160430dc31d9e71e91fa440390233ed36d0101ca70b49d5745257d93a
-  data.tar.gz: 00eca946cfc469f4999a77eb8ba39be8c0354cb91dbad727a1df1e7333dc54b0
+  metadata.gz: e283124f28472dd77c422d918d1add1900eb6b6f220975feca638fd30ec9d17e
+  data.tar.gz: 44b1948327549780caf7dfac69d65cc4838acca1e7f84890ff410b420d85ebe9
 SHA512:
-  metadata.gz: 98bb7204929e650fe2b6866e4475a592f611380752472503bfae719b18de1757d9693ce4c2805a720a3084115ba7ad4fa354354630346fca5725b7c3ebcd1e4c
-  data.tar.gz: 03dd498f0362f994ce65c077a4341c5892fe57ab9f0992a08377761504c772a8d3ac9cf5ae17c84ac3cf9cd11b8ae7ca9b4d968e59e2884de6182031f438ae88
+  metadata.gz: 81016f3033727cbb53fdb989924e62d4f5f8a8f9963cff8f935b656a08b9582b53329f798324d8427e4522540982947c3dc76d58fbdfae40492b60297c08141f
+  data.tar.gz: c499ce521bdc3e5c7a401fb7aa2494df109c0dc9a4796776330c68ad6ffc3bfc5f22d0dc1ecd371c8c2a693116a36f42a5f11e18ec005a42a9e600be62fe7179

data/lib/minitest/reporters/rubyci_reporter.rb

@@ -0,0 +1,95 @@
+module Minitest
+  module Reporters
+    class RubyciReporter
+      attr_accessor :tests, :test_results, :ids
+
+      def initialize
+        @tests = {}
+        @test_results = {}
+        @ids = {}
+
+        RubyCI.minitest_ws.on(:enq_request) do
+          tests
+        end
+
+        RubyCI.minitest_ws.on(:deq) do |api_tests|
+          test_results
+        end
+      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
+
+        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][: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' => {} }
+        tests[path][:test_count] += 1
+        tests[path]['1'][id] ||= { status: 'pending' }
+      end
+
+      def record(result)
+        description = test_description(result.name)
+        id = ids[description]
+        path = test_path(result.klass)
+
+        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]
+      end
+
+      def report
+        test_results.each do |path, file_results|
+          file_status = 'pending'
+          file_results['1'].each do |id, test_result|
+            next if id == :description
+            if (test_result[:status] == 'passed') && (file_status != 'failed')
+              file_status = 'passed'
+            elsif file_status == 'failed'
+              file_status = 'failed'
+            end
+          end
+          test_results[path][:file_status] = file_status
+        end
+
+        RubyCI.minitest_await
+      end
+
+      def method_missing(method, *args)
+        return
+      end
+
+      private
+
+      def test_description(name)
+        test_name = name.split('test_').last
+        test_name = test_name[2..-1] if test_name.starts_with?(': ')
+
+        return test_name.strip
+      end
+
+      def test_path(klass)
+        return "./#{Object.const_source_location(klass)[0].gsub(Regexp.new("^#{::Rails.root}/"), '')}"
+      end
+
+      def result_status(result)
+        if result.passed?
+          :passed
+        elsif result.skipped?
+          :skipped
+        else
+          :failed
+        end
+      end
+    end
+  end
+end

data/lib/minitest/rubyci_plugin.rb

@@ -0,0 +1,9 @@
+require_relative "reporters/rubyci_reporter"
+
+module Minitest
+  def self.plugin_rubyci_init(options)
+    if ENV['RUBY_CI_SECRET_KEY'].present?
+      Minitest.reporter << Minitest::Reporters::RubyciReporter.new
+    end
+  end
+end

data/lib/ruby_ci/runner_prepend.rb

@@ -18,7 +18,7 @@ module RubyCI
 
       RubyCI.configure { |c| c.run_key = "rspec" }
 
-      RubyCI.ws.on(:enq_request) do
+      RubyCI.rspec_ws.on(:enq_request) do
         example_groups.reduce({}) do |example_group_descriptions, (file, example_groups)|
           example_groups.each do |example_group|
             data = RubyCI::ExtractDescriptions.new.call(example_group, count: true)
@@ -47,7 +47,7 @@ module RubyCI
 
           reporter.register_listener(formatter, :example_finished)
 
-          RubyCI.ws.on(:deq) do |tests|
+          RubyCI.rspec_ws.on(:deq) do |tests|
             tests.each do |test|
               file, scoped_id = test.split(":", 2)
               Thread.current[:rubyci_scoped_ids] = scoped_id
@@ -61,7 +61,7 @@ module RubyCI
             formatter.dump_and_reset
           end
 
-          RubyCI.await
+          RubyCI.rspec_await
 
           formatter.passed?
         end

data/lib/ruby_ci/simple_cov/reporting.rb

@@ -0,0 +1,39 @@
+module RubyCI
+  module SimpleCov
+    module Reporting
+      def self.included base
+        base.instance_eval do
+          if ENV['RUBY_CI_SECRET_KEY'].present?
+            def write_last_run(result)
+              ::SimpleCov::LastRun.write(result:
+                result.coverage_statistics.transform_values do |stats|
+                  round_coverage(stats.percent)
+                end)
+
+              source = {}
+
+              result.source_files.each do |source_file|
+                source[source_file.filename.gsub(root, '')] = source_file.src
+              end
+
+              result_json = {}
+
+              result.as_json.each do |command, data|
+                result_json[command] = data
+                data['coverage'].clone.each do |src, file_data|
+                  result_json[command]['coverage'].delete(src)
+
+                  file_data['src'] = source[src.gsub(root, '')]
+
+                  result_json[command]['coverage'][src.gsub(root, '')] = file_data
+                end
+              end
+
+              RubyCI.report_simplecov(result_json.to_json)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_ci/simple_cov.rb

@@ -0,0 +1,7 @@
+require_relative "simple_cov/reporting"
+
+module RubyCI
+  module SimpleCov
+    ::SimpleCov.send(:include, RubyCI::SimpleCov::Reporting)
+  end
+end

data/lib/ruby_ci/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCI
-  VERSION = "0.1.7"
+  VERSION = "0.2.1"
 end

data/lib/ruby_ci.rb

@@ -20,12 +20,36 @@ module RubyCI
       yield(configuration)
     end
 
-    def ws
-      @ws ||= WebSocket.new
+    def rspec_ws
+      @rspec_ws ||= WebSocket.new('rspec')
     end
 
-    def await
-      ws.await
+    def minitest_ws
+      @minitest_ws ||= WebSocket.new('minitest')
+    end
+
+    def report_simplecov(results)
+      data = {
+        build_id: RubyCI.configuration.build_id,
+        run_key: 'simplecov',
+        secret_key: RubyCI.configuration.secret_key,
+        branch: RubyCI.configuration.branch,
+        commit: RubyCI.configuration.commit,
+        commit_msg: RubyCI.configuration.commit_msg,
+        author: RubyCI.configuration.author.to_json,
+        content: results
+      }
+
+      uri = URI('https://fast.ruby.ci/api/runs')
+      res = Net::HTTP.post_form(uri, data)
+    end
+
+    def rspec_await
+      rspec_ws.await
+    end
+
+    def minitest_await
+      minitest_ws.await
     end
 
     def debug(msg)
@@ -35,13 +59,14 @@ module RubyCI
 
   class WebSocket
     attr_reader :node_index
-    attr_accessor :connection, :task
+    attr_accessor :connection, :task, :run_key
 
     SUPPORTED_EVENTS = %i[enq_request deq].freeze
 
-    def initialize
+    def initialize(run_key)
       @on = {}
       @ref = 0
+      @run_key = run_key
     end
 
     def on(event, &block)
@@ -148,13 +173,13 @@ module RubyCI
     end
 
     def topic
-      "test_orchestrator:#{RubyCI.configuration.run_key}-#{RubyCI.configuration.build_id}"
+      "test_orchestrator:#{run_key}-#{RubyCI.configuration.build_id}"
     end
 
     def endpoint
       params = URI.encode_www_form({
                                      build_id: RubyCI.configuration.build_id,
-                                     run_key: RubyCI.configuration.run_key,
+                                     run_key: run_key,
                                      secret_key: RubyCI.configuration.secret_key,
                                      branch: RubyCI.configuration.branch,
                                      commit: RubyCI.configuration.commit,
@@ -164,7 +189,7 @@ module RubyCI
 
       url = "wss://#{RubyCI.configuration.api_url}/test_orchestrators/socket/websocket?#{params}"
 
-      Async::HTTP::Endpoint.parse(url)
+      Async::HTTP::Endpoint.parse(url, alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.1
 platform: ruby
 authors:
 - Ale ∴
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -71,12 +71,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/minitest/reporters/rubyci_reporter.rb
+- lib/minitest/rubyci_plugin.rb
 - lib/ruby_ci.rb
 - lib/ruby_ci/configuration.rb
 - lib/ruby_ci/exceptions.rb
 - lib/ruby_ci/extract_definitions.rb
 - lib/ruby_ci/rspec_formatter.rb
 - lib/ruby_ci/runner_prepend.rb
+- lib/ruby_ci/simple_cov.rb
+- lib/ruby_ci/simple_cov/reporting.rb
 - lib/ruby_ci/version.rb
 - ruby_ci.gemspec
 homepage: https://github.com/RubyCI/ruby_ci_gem