minitest-subjective 0.1.0.pre.alpha → 0.1.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5760ba45aa4159efb193a53b8c0a2da6d983881793d60d64a9c0dd25b55a40e
-  data.tar.gz: 3b0fa96c440e22577be2321a9ee6c4ec46d69de0d3bb989e3ca0e104bcfda6c8
+  metadata.gz: b767652d0792b6d1d274de3aa57b4dd011f0729511f7372c0f82980a89ef6e8d
+  data.tar.gz: 0dca826f85a19cbdb35a1acf168a6613cc703834e9db40b8fa3850b284b198fc
 SHA512:
-  metadata.gz: d826c7e3dd1687ff376c8fa29c9ac00e2ede3c11aa8e364219fe79ca9bbedce0e636a53c986e502e76a6756bba4eb3c78375692fd839d0d64976c4173a325b58
-  data.tar.gz: 71a008c282cac260f3f70bf981e970040b8d6860c26a8a0f38df07be5aa90e76f52f643d3a63d1a18b2bada19da76f585fc69782fbccd04557eda02e231b5676
+  metadata.gz: adc4bcbabd441c044266ce93d9729b00f8519eea0c5a875e37ba538fbe324faa2846d329912542a2b020227106fe9b3db9b373f1a50a0bbceb758cbf0a8753f1
+  data.tar.gz: 75019411a22e3e363416321cafa1c9dc25839018e5e45acd3f6765d1109fba40314f1646932e83ff13f583cd4c8d49dee2041a555b4f7c2905ecfc5007d86418

data/lib/minitest/subjective/case_inquirer.rb

@@ -14,9 +14,9 @@ module Minitest
 
       def subject_name
         return class_name unless test?
-        return [class_name_nesting, demodulized_class_name.delete_suffix('Test')].join('::') if rails_test?
+        return [*class_name_nesting, demodulized_class_name.delete_suffix('Test')].join('::') if rails_test?
 
-        [class_name_nesting, demodulized_class_name.delete_prefix('Test')].join('::')
+        [*class_name_nesting, demodulized_class_name.delete_prefix('Test')].join('::')
       end
 
       def test? = rails_test? || minitest_test?
@@ -26,7 +26,7 @@ module Minitest
       end
 
       def rails_test?
-        demodulized_class_name.end_with?('Test') && defined?(::ActiveSupport) && klass < ActiveSupport::TestCase
+        demodulized_class_name.end_with?('Test') && klass < Minitest::Test
       end
 
       def integration_test? = rails_test? && defined?(::ActionDispatch) && klass < ActionDispatch::IntegrationTest
@@ -41,7 +41,7 @@ module Minitest
       def load_subject = safe_constantize(subject_name)
 
       def class_name_nesting
-        class_name.split('::')[0..-2].join('::')
+        class_name.split('::')[0..-2].join('::').then { |nesting| nesting unless nesting.empty? }
       end
 
       def demodulized_class_name

data/lib/minitest/subjective/file_result/line_statistics/line_hits.rb

@@ -6,7 +6,7 @@ module Minitest
       class LineStatistics
         LineHits = Struct.new(:line, :hits, :branches) do
           def self.from_pair(line, hits, branches: nil)
-            new(line:, hits:, branches:)
+            new(line:, hits:, branches: branches&.filter { |range| range.cover?(line) })
           end
 
           def +(other)

data/lib/minitest/subjective/file_result/method_statistics.rb

@@ -24,13 +24,13 @@ module Minitest
         def +(other)
           return self unless other
 
-          self.class.new(method_hits.zip(other.method_hits).collect { |current, new| current + new })
+          self.class.new(method_hits.collect { _1 + other.find_by(klass: _1.klass, name: _1.name, range: _1.range) })
         end
 
         def -(other)
           return self unless other
 
-          self.class.new(method_hits.zip(other.method_hits).collect { |current, new| current - new })
+          self.class.new(method_hits.collect { _1 - other.find_by(klass: _1.klass, name: _1.name, range: _1.range) })
         end
 
         def find_by(**options)

data/lib/minitest/subjective/file_result.rb

@@ -3,7 +3,6 @@
 require 'minitest/subjective/file_result/branch_statistics'
 require 'minitest/subjective/file_result/line_statistics'
 require 'minitest/subjective/file_result/method_statistics'
-require 'minitest/subjective/formatter'
 
 module Minitest
   module Subjective

data/lib/minitest/subjective/reporter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'minitest/subjective/case_inquirer'
-
 module Minitest
   module Subjective
     class Reporter < Minitest::Reporter # :nodoc:
@@ -18,6 +16,7 @@ module Minitest
 
       def report
         results.each do |subject_name, result|
+          io.puts
           io.puts "Coverage for #{subject_name}:"
           io.puts coverage_headline_for(result)
           io.puts result.to_s unless result.covered?

data/lib/minitest/subjective/setup.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'minitest/subjective'
+
+Minitest::Subjective.start_coverage

data/lib/minitest/subjective/version.rb

@@ -2,6 +2,6 @@
 
 module Minitest
   module Subjective
-    VERSION = '0.1.0-alpha'
+    VERSION = '0.1.0-alpha.2'
   end
 end

data/lib/minitest/subjective.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
-require_relative 'subjective/version'
 require 'coverage'
 require 'forwardable'
 require 'minitest'
+
+require 'minitest/subjective/version'
+require 'minitest/subjective/case_inquirer'
 require 'minitest/subjective/file_result'
-require 'minitest/subjective_plugin'
+require 'minitest/subjective/formatter'
+require 'minitest/subjective/reporter'
+require 'minitest/subjective/result_extensions'
+require 'minitest/subjective/test_extensions'
 
 module Minitest # :nodoc:
   # = \Subjective
@@ -65,6 +70,6 @@ module Minitest # :nodoc:
       end
     end
   end
-
-  load :subjective if respond_to?(:load)
 end
+
+Minitest.load :subjective if Minitest.respond_to?(:load) && !Minitest.respond_to?(:plugin_subjective_init)

data/lib/minitest/subjective_plugin.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'minitest/subjective/reporter'
-require 'minitest/subjective/result_extensions'
-require 'minitest/subjective/test_extensions'
-
 module Minitest # :nodoc:
   class << self
     private
@@ -13,6 +9,8 @@ module Minitest # :nodoc:
 
       ::Zeitwerk::Registry.loaders.each do |loader|
         loader.on_load do |cpath, _value, abspath|
+          next if Gem.path.any? { |path| abspath.start_with?("#{path}/") }
+
           Subjective.record_autoload_for(cpath, abspath)
         end
       end
@@ -28,10 +26,15 @@ module Minitest # :nodoc:
   def self.plugin_subjective_init(options)
     return unless options[:subjective] || ENV['MINITEST_SUBJECTIVE']
 
+    require 'minitest/subjective'
+
     add_zeitwerk_hooks
     Subjective.start_coverage
     Subjective::ResultExtensions.prepend_target
     Subjective::TestExtensions.prepend_target
+    Runnable.runnables
+            .reject { |runnable| [Minitest::Test, Minitest::Spec].include?(runnable) }
+            .each { |runnable| Subjective.record_load_for(runnable) }
     reporter << Subjective::Reporter.new
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-subjective
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha
+  version: 0.1.0.pre.alpha.2
 platform: ruby
 authors:
 - Justin Malčić
@@ -59,6 +59,7 @@ files:
 - lib/minitest/subjective/formatter/colors.rb
 - lib/minitest/subjective/reporter.rb
 - lib/minitest/subjective/result_extensions.rb
+- lib/minitest/subjective/setup.rb
 - lib/minitest/subjective/test_extensions.rb
 - lib/minitest/subjective/version.rb
 - lib/minitest/subjective_plugin.rb