covered 0.28.5 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e334ba3c73dc1b32ce1e9491d299391c7a61bb5b1b97ccbd9bc6714e8d3dde
-  data.tar.gz: 3cae6b72958a0cc467a812e33fecc05da115ae97c02999aa27786714186a2f0b
+  metadata.gz: 0c4bbf71292213867fe6b7edfd7e35b65eedbbb6bfe1a5f985fadb2535af22ee
+  data.tar.gz: 96b6183060c491be6ca61d1e6c5397bae731024b6c67a53852872f49d282db31
 SHA512:
-  metadata.gz: cfc2a3eca1dd46c39ed3432950872adea86a3ee138f982c11dba1e45f858faa86c9fb9f39ae7dd3fed558bc8d90c2d1ba4dcd6d229b6088d9a587a17033d08ce
-  data.tar.gz: 28a14c5e7a85f45a590415124fcc88bc1bf503e0dff67a7374c756f35579165bc08406faf1cdf4939502009ebafcddf18225e106737f039eedc7e755885e9535
+  metadata.gz: 620ad151084106eaabb854b255a571e52613050d1cd44eb6bbe3af86b17c94088dcdd7f82d1e57748a09fa8ea7de41d06b617d03e88ae51a0354bfcfcd7c53b8
+  data.tar.gz: cc520d2837f572ecdf76b53bd9c61058b948cf84036ef988ae17f6b6bbba8e2822191e826486fd5583e2c16c8a04640cbcd632829b4198193aba13fa35e1ce6d

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

@@ -51,6 +51,16 @@ module Covered
 			@annotations = annotations
 		end
 		
+		# Initialize a copy of this coverage object.
+		# @parameter other [Covered::Coverage] The coverage object to copy.
+		def initialize_copy(other)
+			super
+			
+			@source = other.source.dup
+			@counts = other.counts.dup
+			@annotations = other.annotations.transform_values(&:dup)
+		end
+		
 		# @attribute [Covered::Source] The covered source metadata.
 		attr_accessor :source
 		
@@ -84,10 +94,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/statistics.rb

@@ -28,6 +28,17 @@ module Covered
 		class Aggregate
 			include Ratio
 			
+			# Build aggregate statistics from coverage objects.
+			# @parameter coverages [Enumerable(Covered::Coverage)] The coverage objects to summarize.
+			# @returns [Covered::Statistics::Aggregate] The aggregate statistics.
+			def self.for(coverages)
+				self.new.tap do |aggregate|
+					coverages.each do |coverage|
+						aggregate << coverage
+					end
+				end
+			end
+			
 			# Initialize empty aggregate statistics.
 			def initialize
 				@count = 0
@@ -35,8 +46,7 @@ module Covered
 				@executed_count = 0
 			end
 			
-			# Total number of files added.
-			# @returns [Integer] The number of coverage objects added.
+			# @attribute [Integer] The total number of coverage instances added.
 			attr :count
 			
 			# The number of lines which could have been executed.
@@ -67,22 +77,28 @@ module Covered
 			
 			# Add coverage to these aggregate statistics.
 			# @parameter coverage [Covered::Coverage] The coverage object to add.
+			# @returns [Covered::Statistics::Aggregate] This aggregate.
 			def << coverage
 				@count += 1
 				
 				@executable_count += coverage.executable_count
 				@executed_count += coverage.executed_count
+				
+				self
 			end
 		end
 		
 		# Initialize empty coverage statistics.
 		def initialize
-			@total = Aggregate.new
+			@total = nil
 			@paths = Hash.new
 		end
 		
-		# @attribute [Covered::Statistics::Aggregate] The total aggregate statistics.
-		attr :total
+		# The total aggregate statistics.
+		# @returns [Covered::Statistics::Aggregate] The total aggregate statistics.
+		def total
+			@total ||= Aggregate.for(@paths.values)
+		end
 		
 		# @attribute [Hash(String, Covered::Coverage)] Coverage statistics indexed by path.
 		attr :paths
@@ -96,20 +112,29 @@ module Covered
 		# The total number of executable lines.
 		# @returns [Integer] The total executable line count.
 		def executable_count
-			@total.executable_count
+			total.executable_count
 		end
 		
 		# The total number of executed lines.
 		# @returns [Integer] The total executed line count.
 		def executed_count
-			@total.executed_count
+			total.executed_count
 		end
 		
 		# Add coverage to these statistics.
 		# @parameter coverage [Covered::Coverage] The coverage object to add.
 		def << coverage
-			@total << coverage
-			(@paths[coverage.path] ||= coverage.empty).merge!(coverage)
+			if current = @paths[coverage.path]
+				current.merge!(coverage)
+				
+				@total = nil
+			else
+				coverage = @paths[coverage.path] = coverage.dup
+				
+				@total << coverage if @total
+			end
+			
+			self
 		end
 		
 		# Get coverage for the given path.
@@ -124,7 +149,7 @@ module Covered
 		def as_json
 			{
 				total: total.as_json,
-				paths: @paths.map{|path, coverage| [path, coverage.as_json]}.to_h,
+				paths: paths.map{|path, coverage| [path, coverage.as_json]}.to_h,
 			}
 		end
 		
@@ -151,7 +176,7 @@ module Covered
 		# Print a human-readable coverage summary.
 		# @parameter output [IO] The output stream.
 		def print(output)
-			output.puts "#{count} files checked; #{@total.executed_count}/#{@total.executable_count} lines executed; #{@total.percentage.to_f.round(2)}% covered."
+			output.puts "#{count} files checked; #{total.executed_count}/#{total.executable_count} lines executed; #{total.percentage.to_f.round(2)}% covered."
 			
 			if self.complete?
 				output.puts "🧘 #{COMPLETE.sample}"

data/lib/covered/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Covered
-	VERSION = "0.28.5"
+	VERSION = "0.29.1"
 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.1
 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: []