covered 0.28.5 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e334ba3c73dc1b32ce1e9491d299391c7a61bb5b1b97ccbd9bc6714e8d3dde
-  data.tar.gz: 3cae6b72958a0cc467a812e33fecc05da115ae97c02999aa27786714186a2f0b
+  metadata.gz: 4d29a2eaa9fe3d3c29ea8a111f6375b193e81fc38b7edd2a33df00c47ede4e46
+  data.tar.gz: 1625f3a42082d69c7b4f47b8b639f51f07ccfe32d27efd2bcb5cd630b49360cb
 SHA512:
-  metadata.gz: cfc2a3eca1dd46c39ed3432950872adea86a3ee138f982c11dba1e45f858faa86c9fb9f39ae7dd3fed558bc8d90c2d1ba4dcd6d229b6088d9a587a17033d08ce
-  data.tar.gz: 28a14c5e7a85f45a590415124fcc88bc1bf503e0dff67a7374c756f35579165bc08406faf1cdf4939502009ebafcddf18225e106737f039eedc7e755885e9535
+  metadata.gz: 1a61d788de7508e8e7d7179d11e61ffb898d7c422ff75d452433db10ce4b9b01002f7384fc4bf3558413c6648690a722f07dd240894eb914a44b080a8a961a11
+  data.tar.gz: 57defb22ee94b826c68af5869faadba29a0b0a0ec32a524b61e2d0b8b5805740f3cee29c43ad4736d7de90de40e0e08b66f99dfe099511c5769780e2dca60f48

data/lib/covered/capture.rb

@@ -5,23 +5,36 @@
 
 require_relative "wrapper"
 
-require "coverage"
+require "ruby/coverage"
 
 module Covered
 	# Captures Ruby coverage data and forwards it to another coverage output.
 	class Capture < Wrapper
+		# Initialize capture with independent tracer state.
+		def initialize(...)
+			super
+			
+			@tracer = nil
+			@files = {}
+		end
+		
 		# Start Ruby coverage collection.
 		def start
 			super
 			
-			::Coverage.start(lines: true, eval: true)
+			@files = {}
+			@tracer = build_tracer
+			@tracer.start
 		end
 		
 		# Clear any collected coverage data without stopping coverage.
 		def clear
 			super
 			
-			::Coverage.result(stop: false, clear: true)
+			@tracer&.stop
+			@files = {}
+			@tracer = build_tracer
+			@tracer.start
 		end
 		
 		EVAL_PATHS = {
@@ -33,22 +46,25 @@ module Covered
 		# Stop coverage collection and add the collected results to the output.
 		# Ignores Ruby's anonymous eval paths and files that no longer exist.
 		def finish
-			results = ::Coverage.result
+			@tracer&.stop
 			
-			results.each do |path, result|
+			@files.each do |path, lines|
 				next if EVAL_PATHS.include?(path)
 				
 				path = self.expand_path(path)
 				
 				# Skip files which don't exist. This can happen if `eval` is used with an invalid/incorrect path:
 				if File.exist?(path)
-					@output.mark(path, 1, result[:lines])
+					@output.mark(path, 0, lines)
 				else
 					# warn "Skipping coverage for #{path.inspect} because it doesn't exist!"
 					# Ignore.
 				end
 			end
 			
+			@tracer = nil
+			@files = {}
+			
 			super
 		end
 		
@@ -63,5 +79,19 @@ module Covered
 		ensure
 			finish
 		end
+		
+		private
+		
+		def build_tracer
+			::Ruby::Coverage::Tracer.new do |path, iseq|
+				@files[path] ||= begin
+					lines = []
+					::Ruby::Coverage.executable_lines(iseq).each do |line|
+						lines[line] = 0
+					end
+					lines
+				end
+			end
+		end
 	end
 end

data/lib/covered/config.rb

@@ -190,9 +190,7 @@ module Covered
 			
 			ENV["RUBYOPT"] = rubyopt
 			
-			unless ENV["COVERED_ROOT"]
-				ENV["COVERED_ROOT"] = @root
-			end
+			ENV["COVERED_ROOT"] = @root
 			
 			# Don't report coverage in child processes:
 			ENV.delete("COVERAGE")

data/lib/covered/coverage.rb

@@ -84,10 +84,10 @@ module Covered
 		# @parameter line_number [Integer] The first line number to mark.
 		# @parameter value [Integer | Array(Integer)] The execution count or counts to add.
 		def mark(line_number, value = 1)
-			# As currently implemented, @counts is base-zero rather than base-one.
-			# Line numbers generally start at line 1, so the first line, line 1, is at index 1. This means that index[0] is usually nil.
 			Array(value).each_with_index do |value, index|
 				offset = line_number + index
+				next if offset < 1
+				
 				if @counts[offset]
 					@counts[offset] += value
 				else

data/lib/covered/forks.rb

@@ -17,7 +17,7 @@ module Covered
 		
 		# Stop tracking coverage and remove the fork handler state.
 		def finish
-			Handler.finish
+			Handler.finish(self)
 			
 			super
 		end
@@ -27,26 +27,30 @@ module Covered
 			LOCK = Mutex.new
 			
 			class << self
-				# @attribute [Covered::Forks | Nil] The currently registered coverage wrapper.
-				attr :coverage
+				# The currently registered coverage wrapper.
+				# @returns [Covered::Forks | Nil]
+				def coverage
+					LOCK.synchronize do
+						@coverages&.last
+					end
+				end
 				
 				# Register coverage for fork handling.
 				# @parameter coverage [Covered::Forks] The coverage wrapper to use in forked children.
-				# @raises [ArgumentError] If coverage is already registered.
 				def start(coverage)
 					LOCK.synchronize do
-						if @coverage
-							raise ArgumentError, "Coverage is already being tracked!"
-						end
-						
-						@coverage = coverage
+						(@coverages ||= []) << coverage
 					end
 				end
 				
 				# Clear the registered coverage.
-				def finish
+				def finish(coverage = nil)
 					LOCK.synchronize do
-						@coverage = nil
+						if coverage
+							@coverages&.delete(coverage)
+						else
+							@coverages&.pop
+						end
 					end
 				end
 				

data/lib/covered/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Covered
-	VERSION = "0.28.5"
+	VERSION = "0.29.0"
 end

data/readme.md

@@ -34,6 +34,10 @@ Please see the [project documentation](https://socketry.github.io/covered/) for
 
 Please see the [project releases](https://socketry.github.io/covered/releases/index) for all releases.
 
+### v0.29.0
+
+  - Prefer `ruby-coverage` over `coverage` for improved coverage tracking.
+
 ### v0.28.5
 
   - Make coverage validation quiet when no reports are configured.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.29.0
+
+  - Prefer `ruby-coverage` over `coverage` for improved coverage tracking.
+
 ## v0.28.5
 
   - Make coverage validation quiet when no reports are configured.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.28.5
+  version: 0.29.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -73,6 +73,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-coverage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 executables: []
 extensions: []
 extra_rdoc_files: []