ruby_ci 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08df68ec0f6719aa07d3505b7471a7e95caea8d5be3e120b08e11f53a148aee6'
-  data.tar.gz: 0217ed880ef0117d6bce4af23d77482f29113d4847c2101cce7144a7da458bbd
+  metadata.gz: d34d2bb75becc90c41cf2366ef0c7d6bb6ccbcc5b33e6c6e460d7a3a5fd6976f
+  data.tar.gz: c0846f4d4ed597b738d09687d8a14697e1dff4403fbbf852ab483f70df172b5a
 SHA512:
-  metadata.gz: cb15a2b5a52cb7f961d4602aac9eb4283301fec44badf1d218bc0b5c180dbb1f8644e1e585cf016fd0173defbebe8cdf829818ec21e0a8040e24f63eb6d78069
-  data.tar.gz: f28fd122467ac0803965cc2eec1e8227ffb41175d9366f9f596c61f247918843257277dfe351af06c32b91bead9d4ae32114680ffa2e00cbec663c846d2c7fdd
+  metadata.gz: ee9dcf45a74418a994a369c2de76b213c0181462a7ad14ef88782cd0e9cab2f18fb4eb011920a26650f0ac68f6bad32203828a8a617d3675297e66a6656f84ef
+  data.tar.gz: f4135d4de92276f7572ef08810fb0873375a28354fd4f7841305ebd6930d26a1d8f9aceb9d25b00dc5a74c28b90365c0b4a3d0554a5b35a2759423e76ab9be8f

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/extract_definitions.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module RubyCI
+  class  ExtractDescriptions
+    def call(example_group, count: false)
+      data = {}
+
+      data[scoped_id(example_group)] = {
+        description: description(example_group),
+        line_number: line_number(example_group),
+      }
+
+      if count
+        data[:test_count] ||= 0
+        data[:test_count] += RSpec.world.example_count([example_group])
+      end
+
+      example_group.examples.each do |ex|
+        data[scoped_id(example_group)][scoped_id(ex)] = {
+          line_number: line_number(ex),
+          description: description(ex),
+        }
+      end
+
+      example_group.children.each do |child|
+        data[scoped_id(example_group)].merge! call(child)
+      end
+
+      data
+    end
+
+    def scoped_id(example_group)
+      example_group.metadata[:scoped_id].split(":").last
+    end
+
+    def line_number(example_group)
+      example_group.metadata[:line_number]
+    end
+
+    def description(example_group)
+      example_group.metadata[:description]
+    end
+  end
+end

data/lib/ruby_ci/rspec_formatter.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module RubyCI
+  class RspecFormatter
+    attr_reader :current_test_key
+
+    def initialize
+      @output = {}
+      @is_failed = false
+    end
+
+    def passed?
+      !@is_failed
+    end
+
+    def current_test_key=(value)
+      @current_test_key = value
+    end
+
+    def example_finished(notification)
+      example =  notification.example
+      metadata = example.metadata
+
+      *example_group_ids, example_id = metadata[:scoped_id].split(":")
+
+      file_output = @output[current_test_key] ||= {}
+
+      example_group = example_group_ids.reduce(file_output) do |output, scope_id|
+        output[scope_id] ||= {}
+        output[scope_id]
+      end
+
+      example_group[example_id] = {
+        run_time: example.execution_result.run_time,
+        status: example.execution_result.status
+      }
+
+      if example.execution_result.status == :failed
+        @is_failed = true
+        example_group[example_id][:fully_formatted] =
+          notification.fully_formatted(0, ::RSpec::Core::Formatters::ConsoleCodes)
+      elsif metadata[:retry_attempts] && metadata[:retry_attempts] > 0
+        example_group[example_id][:retry_attempts] = metadata[:retry_attempts]
+        example_group[example_id][:fully_formatted] =
+          example.set_exception metadata[:retry_exceptions].first.to_s
+      end
+
+      example_group[example_id]
+    end
+
+    def dump_and_reset
+      output = @output
+      @output = {}
+      output
+    end
+  end
+end

data/lib/ruby_ci/runner_prepend.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+require_relative "rspec_formatter"
+require_relative "extract_definitions"
+
+module RubyCI
+  module RunnerPrepend
+    def run_specs(example_groups)
+      examples_count = @world.example_count(example_groups)
+
+      example_groups = example_groups.reduce({}) do |acc, ex_group|
+        if acc[ex_group.file_path]
+          acc[ex_group.file_path] << ex_group
+        else
+          acc[ex_group.file_path] = [ex_group]
+        end
+        acc
+      end
+
+      RubyCI.configure { |c| c.run_key = "rspec" }
+
+      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)
+
+            next if data[:test_count] == 0
+
+            if example_group_descriptions[file]
+              example_group_descriptions[file].merge!(data) do |k, v1, v2|
+                v1 + v2
+              end
+            else
+              example_group_descriptions[file] = data
+            end
+          end
+        example_group_descriptions
+        end
+      end
+
+      examples_passed = @configuration.reporter.report(examples_count) do |reporter|
+        @configuration.with_suite_hooks do
+          if examples_count == 0 && @configuration.fail_if_no_examples
+            return @configuration.failure_exit_code
+          end
+
+          formatter = RubyCI::RspecFormatter.new
+
+          reporter.register_listener(formatter, :example_finished)
+
+          RubyCI.rspec_ws.on(:deq) do |tests|
+            tests.each do |test|
+              file, scoped_id = test.split(":", 2)
+              Thread.current[:rubyci_scoped_ids] = scoped_id
+              example_groups[file].each do |file_group|
+                formatter.current_test_key = test
+
+                file_group.run(reporter)
+              end
+            end
+
+            formatter.dump_and_reset
+          end
+
+          RubyCI.rspec_await
+
+          formatter.passed?
+        end
+      end
+
+      exit_code(examples_passed)
+    end
+
+    def exit_code(examples_passed=false)
+      return @configuration.error_exit_code || @configuration.failure_exit_code if @world.non_example_failure
+      return @configuration.failure_exit_code unless examples_passed
+
+      0
+    end
+  end
+end

data/lib/ruby_ci/version.rb

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

data/lib/ruby_ci.rb

@@ -20,12 +20,20 @@ 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 rspec_await
+      rspec_ws.await
+    end
+
+    def minitest_await
+      minitest_ws.await
     end
 
     def debug(msg)
@@ -35,13 +43,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 +157,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 +173,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

data/ruby_ci.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "console", "~> 1.15.0"
   spec.add_dependency "async-websocket", '<= 0.20.0'
   spec.add_development_dependency "pry"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ale ∴
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -57,9 +71,14 @@ 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/version.rb
 - ruby_ci.gemspec
 homepage: https://github.com/RubyCI/ruby_ci_gem