covered 0.16.0 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd761cd8a63400d76fbc57d7b12ecde5965e65d5f102e8e00922324fe1122211
-  data.tar.gz: 46f677a145a2000644179350e533c71afa918e7c189738e7e1885a7c825c898e
+  metadata.gz: b3ec9e58976df4dd7611cd55dd8f7c3e21267147453e1ea6be3339a8bfc98d6f
+  data.tar.gz: 7ff2d500f8b308186f1db4609c5b1f14594ead77b77c77df54efc5953586a6e5
 SHA512:
-  metadata.gz: 6877f782692afc1640bae6f6755fc5e68f7fdbcbe1e815ac7c255005dfbf7e523fa2fb4ff92aee45d65a5745dda502d1ad5bbedd0b2ae25d63335933a348eb7b
-  data.tar.gz: 631fa71834807f84cf3aac8b22803d3659ac1b3ac732e2ccf86f5a9e6096501e929b1a993d6eddec817dee18810f91453093d2261a57fa311055cf841b3da93f
+  metadata.gz: e835b21f824253f8aef9aa500f01d7a0d4235cdb17f5799858d6e66deb2afe3970e63a4761c1c0f9d97cf2522e56ead2226103e12cc87a6a6b2079add132ffcb
+  data.tar.gz: e81491a1f50577050c58cdc0ae11e0b230097456d71ac544c640a977927a685aa7844ef24c886385c7ab6aa1f490182c7963c0833776655c71c06b583c3ac322

checksums.yaml.gz.sig

@@ -1,4 +1,3 @@
-�־�L�+��h
-F���'���·��Θ%��@����/�?7Ȗ�F�N:d��n+�u�}�`��M�Zx�P�Z�M]ܧ�=X5ns�QT_l<Ş�f
�ݪJ	��	ht��q�2�o��+��!c0a]���;�] �	�����-��Q)��3����D�U�{��y��vz"3W�ܧ�C9W��G_��X����v}^d�˿vA��L��U�rc�E�[�ctݠ4��
-	�0�-yFxjG�Kl?]Yc�AM�ظk�nd�ȷ���O��HnX-�~Y�����_k�J�H`4R�r̶�������ߩ�vM�:��z�R(��Պ�Nk��h߷��
-b1y��<�I�C�8�IF�؍�'��n�F�
+�Tz���-捈�؄�إ�GgG�'�������������ØD����6�/�H ����\m^�|�MEkH�e[�����B���)��t~�]y;\�C�Q����;l�.������EII���87c��o�z�C��r���
+��ʜ��к��|l�G�W�Z�ꖠB����1�!��˛��/|�h�Q�aI������P̳��L�
+^јwg���SMO/�jm��CWܚ�vT$B�VO����t�?�[�ܡ���

data/bake/covered/validate.rb

@@ -2,23 +2,25 @@
 def initialize(context)
 	super
 	
-	require_relative '../../lib/covered/policy/default'
+	require_relative '../../lib/covered/config'
 end
 
 # Validate the coverage of multiple test runs.
 # @parameter paths [Array(String)] The coverage database paths.
 # @parameter minumum [Float] The minimum required coverage in order to pass.
 def validate(paths: nil, minimum: 1.0)
+	config = Covered::Config.load
+	
 	paths&.each do |path|
 		# It would be nice to have a better algorithm here than just ignoring mtime - perhaps using checksums?
-		Covered::Persist.new($covered.output, path).load!(ignore_mtime: true)
+		Covered::Persist.new(config.output, path).load!(ignore_mtime: true)
 	end
 	
-	$covered.flush
+	config.flush
 	
 	statistics = Covered::Statistics.new
 	
-	$covered.each do |coverage|
+	config.each do |coverage|
 		statistics << coverage
 	end
 	

data/lib/covered/cache.rb

@@ -32,7 +32,7 @@ module Covered
 		
 		def mark(path, lineno, count = 1)
 			if @marks
-				@marks << path << lineno << count
+				@marks.push(path, lineno, count)
 			else
 				super
 			end

data/lib/covered/config.rb

@@ -34,9 +34,11 @@ module Covered
 			end
 		end
 		
-		def self.load(root: Dir.pwd, coverage: ENV['COVERAGE'])
-			return nil unless coverage
-			
+		def self.coverage
+			ENV['COVERAGE']
+		end
+		
+		def self.load(root: Dir.pwd, coverage: self.coverage)
 			derived = Class.new(self)
 			
 			if path = self.path(root)
@@ -54,10 +56,20 @@ module Covered
 			@policy = nil
 		end
 		
+		def record?
+			!!@coverage
+		end
+		
+		attr :coverage
+		
 		def policy
 			@policy ||= Policy.new.tap{|policy| make_policy(policy)}.freeze
 		end
 		
+		def output
+			policy.output
+		end
+		
 		def enable
 			policy.enable
 		end
@@ -74,6 +86,10 @@ module Covered
 			policy.call(output)
 		end
 		
+		def each(&block)
+			policy.each(&block)
+		end
+		
 		# Override this method to implement your own policy.
 		def make_policy(policy)
 			policy.cache!

data/lib/covered/minitest.rb

@@ -34,7 +34,7 @@ module Covered
 	end
 end
 
-if $covered
+if $covered.record?
 	class << Minitest
 		prepend Covered::Minitest
 	end

data/lib/covered/policy.rb

@@ -123,7 +123,7 @@ module Covered
 		end
 		
 		def reports!(coverage)
-			if coverage
+			if coverage.is_a?(String)
 				names = coverage.split(',')
 				
 				names.each do |name|
@@ -134,7 +134,7 @@ module Covered
 						@reports << Autoload.new(name)
 					end
 				end
-			else
+			elsif coverage
 				@reports << Covered::BriefSummary.new
 			end
 		end

data/lib/covered/rspec.rb

@@ -57,7 +57,7 @@ module Covered
 	end
 end
 
-if $covered
+if $covered.record?
 	RSpec::Core::Configuration.prepend(Covered::RSpec::Policy)
 
 	RSpec.configure do |config|

data/lib/covered/source.rb

@@ -68,12 +68,32 @@ module Covered
 		
 		attr :paths
 		
+		EXECUTABLE = {
+			send: true,
+			yield: true,
+			# Line trace point is not triggered for return statements.
+			# return: true,
+			def: true,
+			if: true,
+			lvasgn: true,
+			ivasgn: true,
+			cvasgn: true,
+			gvasgn: true,
+			match_pattern: true
+		}
+		
 		def executable?(node)
-			node.type == :send || node.type == :yield
+			EXECUTABLE[node.type]
 		end
 		
+		IGNORE = {
+			arg: true,
+			# Ruby doesn't appear to execute rescue lines.
+			rescue: true
+		}
+		
 		def ignore?(node)
-			node.nil? or node.type == :arg
+			node.nil? || IGNORE[node.type]
 		end
 		
 		def expand(node, coverage, level = 0)

data/lib/covered/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Covered
-	VERSION = "0.16.0"
+	VERSION = "0.16.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -39,7 +39,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A modern approach to code coverage.