covered 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f641ef55ad67441aee4c21d0f7221b955f17340baf9e51d7c133c58c5343ae
-  data.tar.gz: 43ccf1cf59d39fef08a271a2a3b97c4756b9e08916a4fb31efcd5903d8ff14cc
+  metadata.gz: e865810f0e3c42f28a7bf1569449240d46f6304a0803b2d34006c3d8ecb4b17a
+  data.tar.gz: b0da723e52175e6766fae5c9d4e9c61b4619fd19867ee6ce0970008c61bc7330
 SHA512:
-  metadata.gz: cf1576281c6fb28953788771f793c88ed0cb96b26795d78fbbd15a60f216140c69f24b3a5621279e5bde25fb00e77bb3a8c398f2512c465d7fa62f85ff35a792
-  data.tar.gz: bfe434cc0c0d3162e87192b714d3459341178649907e187ec9d3aa93e2567f9eea98b9e0cc8831379a647913b9d1862d51e3dc852c42a7ffb37277f04640ff5b
+  metadata.gz: 4858522284e9e50cff92558194a7caf5a08604b45602bd83b6137d71e0a6537a3569bae82270efde1f3ee6fefa58015fbcac036c8eba36a72f52f3f41cfc1078
+  data.tar.gz: ee3779802478b0d9097e8ec00c93a2cc25c6a01e72963c762f0e463759b5284b43820d3213b0927e9402db77c31a639f04ac4fc3beceab5b9f199a3b84028c30

checksums.yaml.gz.sig

@@ -1,4 +1,5 @@
-(K�������y6��ȫ�L�4[Q׺��2<�V
-�T{��|���EB��D�Wݒ��%д�+�?T6��y�Z�X�rw.m�H�
-�^�ڠIQ4
-�S ��;&:"�Gw?B^1�5c�S��}_�y����Px��	��SPn�������<`��tS��}O�u�:*Mze�|jm�uД|@f�|А�kf�b�=ٗ�3@�>9?���Q6>���@ftT_��u��~]߼�X��N���E�`B�O���(�ܳ�қ��
+��j�}�Xo7򊡔�)��iD���:J��
+�!kG^]��*��;�8e~
����>��|�~�\(�mZ��Ed��
+B�
+a��ƛ���N�؇�kS
1
+“����ʃ2�

data/bake/covered/debug.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 def initialize(context)
 	super
@@ -23,11 +23,11 @@ def parse(paths: [], execute: false)
 	
 	if execute
 		capture = Covered::Capture.new(output)
-		capture.enable
+		capture.start
 		paths.each do |path|
 			load path
 		end
-		capture.disable
+		capture.finish
 		
 		files.paths = files.paths.slice(*paths)
 	end

data/bake/covered/validate.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 def initialize(context)
 	super
@@ -20,8 +20,6 @@ def validate(paths: nil, minimum: 1.0)
 		Covered::Persist.new(config.output, path).load!(ignore_mtime: true)
 	end
 	
-	config.flush
-	
 	statistics = Covered::Statistics.new
 	
 	config.each do |coverage|

data/lib/covered/autostart.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require_relative 'config'
+
+module Coverage
+	module Autostart
+		# Start recording coverage information.
+		# Usage: RUBYOPT=-rcovered/autostart ruby my_script.rb
+		def self.autostart!
+			config = Covered::Config.load
+			config.start
+			
+			pid = Process.pid
+			
+			at_exit do
+				# Don't break forked children:
+				if Process.pid == pid
+					config.finish
+					
+					if config.report?
+						config.call($stderr)
+					end
+				end
+			end
+		end
+	end
+end
+
+Coverage::Autostart.autostart!

data/lib/covered/capture.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 require_relative 'wrapper'
 
@@ -9,32 +9,39 @@ require 'coverage'
 
 module Covered
 	class Capture < Wrapper
-		def enable
+		def start
 			super
 			
 			::Coverage.start(lines: true, eval: true)
 		end
 		
-		def disable
+		def clear
+			super
+			
+			::Coverage.result(stop: false, clear: true)
+		end
+		
+		def finish
 			results = ::Coverage.result
-
+			
 			results.each do |path, result|
 				lines = result[:lines]
-
+				path = self.expand_path(path)
+				
 				lines.each_with_index do |count, lineno|
 					@output.mark(path, lineno+1, count) if count
 				end
 			end
-	
+			
 			super
 		end
-
+		
 		def execute(source, binding: TOPLEVEL_BINDING)
-			enable
+			start
 			
 			eval(source.code!, binding, source.path, source.line_offset)
 		ensure
-			disable
+			finish
 		end
 	end
 end

data/lib/covered/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require_relative 'policy'
 
@@ -9,8 +9,12 @@ module Covered
 	class Config
 		PATH = "config/covered.rb"
 		
+		def self.root
+			ENV['COVERED_ROOT'] || Dir.pwd
+		end
+		
 		def self.path(root)
-			path = ::File.join(root, PATH)
+			path = ::File.expand_path(PATH, root)
 			
 			if ::File.exist?(path)
 				return path
@@ -21,7 +25,7 @@ module Covered
 			ENV['COVERAGE']
 		end
 		
-		def self.load(root: Dir.pwd, coverage: self.coverage)
+		def self.load(root: self.root, coverage: self.coverage)
 			derived = Class.new(self)
 			
 			if path = self.path(root)
@@ -37,12 +41,16 @@ module Covered
 			@root = root
 			@coverage = coverage
 			@policy = nil
+			
+			@environment = nil
 		end
 		
-		def record?
+		def report?
 			!!@coverage
 		end
 		
+		alias :record? :report?
+		
 		attr :coverage
 		
 		def policy
@@ -53,16 +61,22 @@ module Covered
 			policy.output
 		end
 		
-		def enable
-			policy.enable
-		end
-		
-		def disable
-			policy.disable
+		def start
+			# Save and setup the environment:
+			@environment = ENV.to_h
+			autostart!
+			
+			# Start coverage tracking:
+			policy.start
 		end
 		
-		def flush
-			policy.flush
+		def finish
+			# Finish coverage tracking:
+			policy.finish
+			
+			# Restore the environment:
+			ENV.replace(@environment)
+			@environment = nil
 		end
 		
 		def call(output)
@@ -73,15 +87,22 @@ module Covered
 			policy.each(&block)
 		end
 		
+		def ignore_paths
+			['test/', 'fixtures/', 'spec/', 'vendor/', 'config/']
+		end
+		
+
 		# Override this method to implement your own policy.
 		def make_policy(policy)
-			policy.cache!
-			
 			# Only files in the root would be tracked:
 			policy.root(@root)
 			
+			patterns = ignore_paths.map do |path|
+				File.join(@root, path)
+			end
+			
 			# We will ignore any files in the test or spec directory:
-			policy.skip(/^.*\/(test|fixtures|spec|vendor|config)\//)
+			policy.skip(Regexp.union(patterns))
 			
 			# We will include all files under lib, even if they aren't loaded:
 			policy.include("lib/**/*.rb")
@@ -90,5 +111,26 @@ module Covered
 			
 			policy.reports!(@coverage)
 		end
+		
+		protected
+		
+		REQUIRE_COVERED_AUTOSTART = '-rcovered/autostart'
+		
+		def autostart!
+			if rubyopt = ENV['RUBYOPT'] and !rubyopt.empty?
+				rubyopt = [rubyopt.strip, REQUIRE_COVERED_AUTOSTART].join(' ')
+			else
+				rubyopt = REQUIRE_COVERED_AUTOSTART
+			end
+			
+			ENV['RUBYOPT'] = rubyopt
+			
+			unless ENV['COVERED_ROOT']
+				ENV['COVERED_ROOT'] = @root
+			end
+			
+			# Don't report coverage in child processes:
+			ENV.delete('COVERAGE')
+		end
 	end
 end

data/lib/covered/coverage.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 module Covered
 	module Ratio
@@ -20,45 +20,76 @@ module Covered
 		end
 	end
 	
-	class Coverage
-		Source = Struct.new(:path, :code, :line_offset) do
-			def to_s
-				"\#<#{self.class} path=#{path}>"
-			end
-			
-			def read(&block)
-				if block_given?
-					File.open(self.path, "r", &block)
-				else
-					File.read(self.path)
-				end
-			end
-			
-			# The actual code which is being covered. If a template generates the source, this is the generated code, while the path refers to the template itself.
-			def code!
-				self.code || self.read
-			end
-			
-			def code?
-				!!self.code
+	class Source
+		def self.for(path, code, line_offset)
+			self.new(path, code: code, line_offset: line_offset)
+		end
+		
+		def initialize(path, code: nil, line_offset: 1, modified_time: nil)
+			@path = path
+			@code = code
+			@line_offset = line_offset
+			@modified_time = modified_time
+		end
+		
+		attr_accessor :path
+		attr :code
+		attr :line_offset
+		attr :modified_time
+		
+		def to_s
+			"\#<#{self.class} path=#{path}>"
+		end
+		
+		def read(&block)
+			if block_given?
+				File.open(self.path, "r", &block)
+			else
+				File.read(self.path)
 			end
 		end
 		
-		def self.source(path, code = nil, line_offset = 1)
-			Source.new(path, code, line_offset)
+		# The actual code which is being covered. If a template generates the source, this is the generated code, while the path refers to the template itself.
+		def code!
+			self.code || self.read
 		end
 		
-		def self.for(path, code = nil, line_offset = 1)
-			self.new(Source.new(path, code, line_offset))
+		def code?
+			!!self.code
 		end
 		
-		def initialize(source, counts = [])
+		def serialize(packer)
+			packer.write(self.path)
+			packer.write(self.code)
+			packer.write(self.line_offset)
+			packer.write(self.modified_time)
+		end
+		
+		def self.deserialize(unpacker)
+			path = unpacker.read
+			code = unpacker.read
+			line_offset = unpacker.read
+			modified_time = unpacker.read
+			
+			self.new(path, code: code, line_offset: line_offset, modified_time: modified_time)
+		end
+	end
+	
+	class Coverage
+		include Ratio
+		
+		def self.for(path, **options)
+			self.new(Source.new(path, **options))
+		end
+		
+		def initialize(source, counts = [], annotations = {}, total = nil)
 			@source = source
 			@counts = counts
-			@total = 0
+			@annotations = annotations
 			
-			@annotations = {}
+			@total = total || counts.sum{|count| count || 0}
 			
+			# Memoized metrics:
 			@executable_lines = nil
 			@executed_lines = nil
 		end
@@ -67,6 +98,29 @@ module Covered
 			@source.path
 		end
 		
+		def path= value
+			@source.path = value
+		end
+		
+		def fresh?
+			if @source.modified_time.nil?
+				# We don't know when the file was last modified, so we assume it is fresh:
+				return true
+			end
+			
+			unless File.exist?(@source.path)
+				# The file no longer exists, so we assume it is stale:
+				return false
+			end
+			
+			if @source.modified_time >= File.mtime(@source.path)
+				# The file has not been modified since we last processed it, so we assume it is fresh:
+				return true
+			end
+			
+			return false
+		end
+		
 		attr_accessor :source
 		
 		attr :counts
@@ -84,9 +138,6 @@ module Covered
 			@counts.freeze
 			@annotations.freeze
 			
-			executable_lines
-			executed_lines
-			
 			super
 		end
 		
@@ -102,21 +153,6 @@ module Covered
 			@counts[lineno]
 		end
 		
-		def annotate(lineno, annotation)
-			@annotations[lineno] ||= []
-			@annotations[lineno] << annotation
-		end
-		
-		def mark(lineno, value = 1)
-			@total += value
-			
-			if @counts[lineno]
-				@counts[lineno] += value
-			else
-				@counts[lineno] = value
-			end
-		end
-		
 		def executable_lines
 			@executable_lines ||= @counts.compact
 		end
@@ -137,14 +173,28 @@ module Covered
 			executable_count - executed_count
 		end
 		
-		include Ratio
-		
 		def print(output)
 			output.puts "** #{executed_count}/#{executable_count} lines executed; #{percentage.to_f.round(2)}% covered."
 		end
 		
 		def to_s
-			"\#<#{self.class} path=#{@path} #{percentage.to_f.round(2)}% covered>"
+			"\#<#{self.class} path=#{self.path} #{self.summary.percentage.to_f.round(2)}% covered>"
+		end
+		
+		def serialize(packer)
+			packer.write(@source)
+			packer.write(@counts)
+			packer.write(@annotations)
+			packer.write(@total)
+		end
+		
+		def self.deserialize(unpacker)
+			source = unpacker.read
+			counts = unpacker.read
+			annotations = unpacker.read
+			total = unpacker.read
+			
+			self.new(source, counts, annotations, total)
 		end
 	end
 end

data/lib/covered/files.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 require_relative 'coverage'
 require_relative 'wrapper'
@@ -10,6 +10,55 @@ require 'set'
 
 module Covered
 	class Files < Base
+		class State
+			def self.for(path, **options)
+				self.new(Source.new(path, **options))
+			end
+			
+			def initialize(source)
+				@source = source
+				@counts = []
+				@annotations = {}
+			end
+			
+			def [](lineno)
+				@counts[lineno]
+			end
+			
+			attr :counts
+			attr :annotations
+			
+			def annotate(lineno, annotation)
+				@annotations[lineno] ||= []
+				@annotations[lineno] << annotation
+			end
+			
+			def mark(lineno, value = 1)
+				if @counts[lineno]
+					@counts[lineno] += value
+				else
+					@counts[lineno] = value
+				end
+			end
+			
+			def merge!(coverage)
+				coverage.counts.each_with_index do |count, index|
+					if count
+						@counts[index] ||= 0
+						@counts[index] += count
+					end
+				end
+				
+				@annotations.merge!(coverage.annotations) do |lineno, a, b|
+					Array(a) + Array(b)
+				end
+			end
+			
+			def coverage
+				Coverage.new(@source, @counts, @annotations)
+			end
+		end
+		
 		def initialize(*)
 			super
 			
@@ -19,7 +68,7 @@ module Covered
 		attr_accessor :paths
 		
 		def [](path)
-			@paths[path]
+			@paths[path] ||= State.for(path)
 		end
 		
 		def empty?
@@ -27,19 +76,27 @@ module Covered
 		end
 		
 		def mark(path, lineno, value)
-			coverage = (@paths[path] ||= Coverage.for(path))
-			
-			coverage.mark(lineno, value)
-			
-			return coverage
+			self[path].mark(lineno, value)
 		end
 		
-		def add(source)
-			@paths[source.path] ||= Coverage.new(source)
+		def annotate(path, lineno, value)
+			self[path].annotate(lineno, value)
 		end
 		
-		def each(&block)
-			@paths.each_value(&block)
+		def add(coverage)
+			self[coverage.path].merge!(coverage)
+		end
+		
+		def each
+			return to_enum unless block_given?
+			
+			@paths.each_value do |state|
+				yield state.coverage
+			end
+		end
+		
+		def clear
+			@paths.clear
 		end
 	end
 	

data/lib/covered/forks.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require_relative 'wrapper'
+
+module Covered
+	class Forks < Wrapper
+		def start
+			super
+			
+			Handler.start(self)
+		end
+		
+		def finish
+			Handler.finish
+			
+			super
+		end
+		
+		module Handler
+			LOCK = Mutex.new
+			
+			class << self
+				attr :coverage
+				
+				def start(coverage)
+					LOCK.synchronize do
+						if @coverage
+							raise ArgumentError, "Coverage is already being tracked!"
+						end
+						
+						@coverage = coverage
+					end
+				end
+				
+				def finish
+					LOCK.synchronize do
+						@coverage = nil
+					end
+				end
+				
+				def after_fork
+					return unless coverage = Handler.coverage
+					pid = Process.pid
+					
+					# Any pre-existing coverage is being tracked by the parent process, so discard it.
+					coverage.clear
+					
+					at_exit do
+						# Don't break forked children:
+						if Process.pid == pid
+							coverage.finish
+						end
+					end
+				end
+			end
+			
+			def _fork
+				pid = super
+				
+				if pid.zero?
+					Handler.after_fork
+				end
+				
+				return pid
+			end
+			
+			::Process.singleton_class.prepend(self)
+		end
+		
+		private_constant :Handler
+	end
+end

data/lib/covered/markdown_summary.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2022, by Samuel Williams.
+# Copyright, 2021-2023, by Samuel Williams.
 
 require_relative 'statistics'
 require_relative 'wrapper'
@@ -54,7 +54,7 @@ module Covered
 			end
 		end
 		
-		# A coverage array gives, for each line, the number of line execution by the interpreter. A nil value means coverage is disabled for this line (lines like else and end).
+		# A coverage array gives, for each line, the number of line execution by the interpreter. A nil value means coverage is finishd for this line (lines like else and end).
 		def call(wrapper, output = $stdout)
 			output.puts '# Coverage Report'
 			output.puts

data/lib/covered/minitest.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 # Copyright, 2022, by Adam Daniels.
 
 require_relative 'config'
@@ -13,7 +13,7 @@ $covered = Covered::Config.load
 module Covered
 	module Minitest
 		def run(*)
-			$covered.enable
+			$covered.start
 			
 			super
 		end
@@ -26,7 +26,7 @@ if $covered.record?
 	end
 	
 	Minitest.after_run do
-		$covered.disable
+		$covered.finish
 		$covered.call($stderr)
 	end
 end

data/lib/covered/persist.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2023, by Stephen Ierodiaconou.
 
 require_relative 'wrapper'
 
 require 'msgpack'
 require 'time'
-require 'set'
 
 module Covered
 	class Persist < Wrapper
@@ -16,45 +16,27 @@ module Covered
 		def initialize(output, path = DEFAULT_PATH)
 			super(output)
 			
-			@path = path
-			@touched = Set.new
+			@path = self.expand_path(path)
 		end
 		
 		def apply(record, ignore_mtime: false)
-			# The file must still exist:
-			return unless path = expand_path(record[:path])
-			
-			unless File.exist?(path)
-				# Ignore this coverage, the file no longer exists.
-				return
-			end
-			
-			# If the file has been modified since... we can't use the coverage.
-			return unless mtime = record[:mtime]
-			
-			unless ignore_mtime
-				if File.mtime(path).to_f > record[:mtime]
-					# Ignore this coverage, the file has been modified since it was recorded.
-					return
+			if coverage = record[:coverage]
+				if path = record[:path]
+					path = self.expand_path(path)
+					coverage.path = path
 				end
-			end
-			
-			if source = record[:source]
-				@output.add(source)
-			end
-			
-			record[:counts].each_with_index do |count, index|
-				@output.mark(path, index, count) if count
+				
+				add(coverage)
 			end
 		end
 		
 		def serialize(coverage)
 			{
 				# We want to use relative paths so that moving the repo won't break everything:
+				pid: Process.pid,
 				path: relative_path(coverage.path),
-				mtime: File.mtime(coverage.path).to_f,
-				counts: coverage.counts,
-				source: coverage.source,
+				# relative_path: relative_path(coverage.path),
+				coverage: coverage,
 			}
 		end
 		
@@ -66,21 +48,23 @@ module Covered
 				file.flock(File::LOCK_SH)
 				
 				make_unpacker(file).each do |record|
+					# pp load: record
 					self.apply(record, **options)
 				end
 			end
-		rescue => error
+		rescue
 			raise LoadError, "Failed to load coverage from #{@path}, maybe old format or corrupt!"
 		end
 		
 		def save!
 			# Dump all coverage:
-			File.open(@path, "wb") do |file|
+			File.open(@path, "ab") do |file|
 				file.flock(File::LOCK_EX)
 				
 				packer = make_packer(file)
 				
-				self.each do |coverage|
+				@output.each do |coverage|
+					# pp save: coverage
 					packer.write(serialize(coverage))
 				end
 				
@@ -88,64 +72,52 @@ module Covered
 			end
 		end
 		
-		def mark(file, line, count)
-			@touched << file
-			
-			super
-		end
-		
-		def enable
+		def finish
 			super
 			
-			load!
+			self.save!
 		end
 		
-		def flush
-			load!
+		def each(&block)
+			return to_enum unless block_given?
+			
+			@output.clear
+			self.load!
 			
 			super
 		end
 		
-		def disable
-			super
+		def make_factory
+			factory = MessagePack::Factory.new
+			
+			factory.register_type(0x00, Symbol)
+			
+			factory.register_type(0x01, Time,
+				packer: MessagePack::Time::Packer,
+				unpacker: MessagePack::Time::Unpacker
+			)
+			
+			factory.register_type(0x20, Source,
+				recursive: true,
+				packer: :serialize,
+				unpacker: :deserialize,
+			)
 			
-			# @touched.each do |path|
-			# 	if @output.accept?(path)
-			# 		puts "Updated #{path} coverage."
-			# 	end
-			# end
+			factory.register_type(0x21, Coverage,
+				recursive: true,
+				packer: :serialize,
+				unpacker: :deserialize,
+			)
 			
-			save!
+			return factory
 		end
 		
-		# def each
-		# 	super do |coverage|
-		# 		if @touched.include?(coverage.path)
-		# 			yield coverage
-		# 		end
-		# 	end
-		# end
-		
 		def make_packer(io)
-			packer = MessagePack::Packer.new(io)
-			packer.register_type(0x00, Symbol, :to_msgpack_ext)
-			packer.register_type(0x01, Time) {|object| object.to_s}
-			packer.register_type(0x0F, Coverage::Source) do |object|
-				object.to_a.to_msgpack
-			end
-			
-			return packer
+			return make_factory.packer(io)
 		end
 		
 		def make_unpacker(io)
-			unpacker = MessagePack::Unpacker.new(io)
-			unpacker.register_type(0x00, Symbol, :from_msgpack_ext)
-			unpacker.register_type(0x01, Time, :parse)
-			unpacker.register_type(0x0F) do |data|
-				Coverage::Source.new(*MessagePack.unpack(data))
-			end
-			
-			return unpacker
+			return make_factory.unpacker(io)
 		end
 	end
 end

data/lib/covered/policy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 require_relative "summary"
 require_relative "files"
 require_relative "capture"
-require_relative "cache"
 require_relative "persist"
+require_relative "forks"
 
 module Covered
 	class Policy < Wrapper
@@ -15,6 +15,7 @@ module Covered
 			super(Files.new)
 			
 			@reports = []
+			@capture = nil
 		end
 		
 		attr :output
@@ -28,44 +29,38 @@ module Covered
 			super
 		end
 		
-		def include(*args)
-			@output = Include.new(@output, *args)
+		def include(...)
+			@output = Include.new(@output, ...)
 		end
 		
-		def skip(*args)
-			@output = Skip.new(@output, *args)
+		def skip(...)
+			@output = Skip.new(@output, ...)
 		end
 		
-		def only(*args)
-			@output = Only.new(@output, *args)
+		def only(...)
+			@output = Only.new(@output, ...)
 		end
 		
-		def root(*args)
-			@output = Root.new(@output, *args)
+		def root(...)
+			@output = Root.new(@output, ...)
 		end
 		
-		def cache!
-			@output = Cache.new(@output)
-		end
-		
-		def persist!
-			@output = Persist.new(@output)
+		def persist!(...)
+			@output = Persist.new(@output, ...)
 		end
 		
 		def capture
-			@capture ||= Capture.new(@output)
-		end
-		
-		def enable
-			capture.enable
+			@capture ||= Forks.new(
+				Capture.new(@output)
+			)
 		end
 		
-		def disable
-			capture.disable
+		def start
+			capture.start
 		end
 		
-		def flush
-			@output.flush
+		def finish
+			capture.finish
 		end
 		
 		attr :reports
@@ -87,8 +82,8 @@ module Covered
 				return klass.new
 			end
 			
-			def call(*args)
-				self.new.call(*args)
+			def call(...)
+				self.new.call(...)
 			end
 			
 			def to_s
@@ -123,9 +118,9 @@ module Covered
 			end
 		end
 		
-		def call(*args)
+		def call(...)
 			@reports.each do |report|
-				report.call(self, *args)
+				report.call(self, ...)
 			end
 		end
 	end

data/lib/covered/rspec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 require_relative 'config'
 require 'rspec/core/formatters'
@@ -12,7 +12,7 @@ module Covered
 	module RSpec
 		module Policy
 			def load_spec_files
-				$covered.enable
+				$covered.start
 				
 				super
 			end
@@ -33,7 +33,7 @@ if $covered.record?
 
 	RSpec.configure do |config|
 		config.after(:suite) do
-			$covered.disable
+			$covered.finish
 			$covered.call(config.output_stream)
 		end
 	end

data/lib/covered/statistics.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 require_relative 'wrapper'
 require_relative 'coverage'
@@ -28,6 +28,7 @@ module Covered
 		
 		def << coverage
 			@count += 1
+			
 			@executable_count += coverage.executable_count
 			@executed_count += coverage.executed_count
 		end

data/lib/covered/summary.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 require_relative 'statistics'
 require_relative 'wrapper'
@@ -82,7 +82,7 @@ module Covered
 			end
 		end
 		
-		# A coverage array gives, for each line, the number of line execution by the interpreter. A nil value means coverage is disabled for this line (lines like else and end).
+		# A coverage array gives, for each line, the number of line execution by the interpreter. A nil value means coverage is finishd for this line (lines like else and end).
 		def call(wrapper, output = $stdout)
 			terminal = self.terminal(output)
 			
@@ -116,6 +116,12 @@ module Covered
 		end
 	end
 	
+	class FullSummary < Summary
+		def initialize
+			super(threshold: nil)
+		end
+	end
+	
 	class BriefSummary < Summary
 		def call(wrapper, output = $stdout, before: 4, after: 4)
 			terminal = self.terminal(output)

data/lib/covered/sus.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 module Covered
 	module Sus
 		def initialize(...)
 			super
 			
-			# Defer loading the coverage configuration unless we are actually running with coverage enabled to avoid performance cost/overhead.
+			# Defer loading the coverage configuration unless we are actually running with coverage startd to avoid performance cost/overhead.
 			if ENV['COVERAGE']
 				require_relative 'config'
 				
 				@covered = Covered::Config.load(root: self.root)
 				if @covered.record?
-					@covered.enable
+					@covered.start
 				end
 			else
 				@covered = nil
@@ -25,7 +25,7 @@ module Covered
 			super(assertions)
 			
 			if @covered&.record?
-				@covered.disable
+				@covered.finish
 				@covered.call(self.output.io)
 			end
 		end

data/lib/covered/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2018-2022, by Samuel Williams.
 
 module Covered
-	VERSION = "0.19.0"
+	VERSION = "0.20.0"
 end

data/lib/covered/wrapper.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 module Covered
 	class Base
-		def enable
+		# Start tracking coverage.
+		def start
 		end
 		
-		def disable
+		# Discard any coverage data and restart tracking.
+		def clear
 		end
 		
-		def flush
+		# Stop tracking coverage.
+		def finish
 		end
 		
 		def accept?(path)
@@ -21,9 +24,12 @@ module Covered
 		def mark(path, lineno, value)
 		end
 		
-		def add(source)
+		def add(coverage)
 		end
 		
+		# Enumerate the coverage data.
+		# @yields {|coverage| ...}
+		# 	@parameter coverage [Coverage] The coverage data, including the source file and execution counts.
 		def each
 		end
 		
@@ -43,16 +49,16 @@ module Covered
 		
 		attr :output
 		
-		def enable
-			@output.enable
+		def start
+			@output.start
 		end
 		
-		def disable
-			@output.disable
+		def clear
+			@output.clear
 		end
 		
-		def flush
-			@output.flush
+		def finish
+			@output.finish
 		end
 		
 		def accept?(path)
@@ -63,8 +69,8 @@ module Covered
 			@output.mark(path, lineno, value)
 		end
 		
-		def add(source)
-			@output.add(source)
+		def add(coverage)
+			@output.add(coverage)
 		end
 		
 		# @yield [Coverage] the path to the file, and the execution counts.
@@ -81,7 +87,7 @@ module Covered
 		end
 		
 		def to_h
-			@output.to_enum(:each).collect{|coverage| [coverage.path, coverage]}.to_h
+			to_enum(:each).collect{|coverage| [coverage.path, coverage]}.to_h
 		end
 	end
 	

data/license.md

@@ -1,10 +1,12 @@
 # MIT License
 
-Copyright, 2018-2022, by Samuel Williams.  
+Copyright, 2018-2023, by Samuel Williams.  
 Copyright, 2018, by Shannon Skipper.  
 Copyright, 2018, by chocolateboy.  
 Copyright, 2019, by Cyril Roelandt.  
 Copyright, 2022, by Adam Daniels.  
+Copyright, 2022, by Felix Yan.  
+Copyright, 2023, by Stephen Ierodiaconou.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -59,7 +59,7 @@ When running `rspec`, you can specify the kind of coverage analysis you would li
 
     COVERAGE=Summary rspec
 
-If no `COVERAGE` is specified, coverage tracking will be disabled.
+If no `COVERAGE` is specified, coverage tracking will be finishd.
 
 ### Partial Summary
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Samuel Williams
 - Adam Daniels
 - Cyril Roelandt
+- Felix Yan
 - Shannon Skipper
+- Stephen Ierodiaconou
 - chocolateboy
 autorequire:
 bindir: bin
@@ -41,7 +43,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -136,11 +138,12 @@ files:
 - bake/covered/debug.rb
 - bake/covered/validate.rb
 - lib/covered.rb
-- lib/covered/cache.rb
+- lib/covered/autostart.rb
 - lib/covered/capture.rb
 - lib/covered/config.rb
 - lib/covered/coverage.rb
 - lib/covered/files.rb
+- lib/covered/forks.rb
 - lib/covered/markdown_summary.rb
 - lib/covered/minitest.rb
 - lib/covered/persist.rb
@@ -173,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A modern approach to code coverage.

data/lib/covered/cache.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
-
-require_relative 'wrapper'
-
-require 'coverage'
-
-module Covered
-	class Cache < Wrapper
-		def initialize(output)
-			super(output)
-			
-			@marks = nil
-		end
-		
-		def mark(path, lineno, count = 1)
-			if @marks
-				@marks.push(path, lineno, count)
-			else
-				super
-			end
-		end
-		
-		def enable
-			@marks = []
-			
-			super
-		end
-		
-		def flush
-			if @marks
-				@marks.each_slice(3) do |path, lineno, count|
-					@output.mark(path, lineno, count)
-				end
-				
-				@marks = nil
-			end
-			
-			super
-		end
-		
-		def disable
-			super
-			
-			flush
-		end
-	end
-end