covered 0.16.5 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866c111f17bb03b47aed6e71a6439f3847e08d0352ba82eac169269d072820c7
-  data.tar.gz: a16bb2c36bcf50f0d26ce4576e741e512a144725a3c2b0f3c8724476fb64c7d4
+  metadata.gz: ab80834ad5a14e4853e865768e7cc51eb38497904e62818e81ce3633ac9f43d2
+  data.tar.gz: ce3a3757b0c08e8f6b09f8d0c3f7273a623ba293f9b56b81b4b5cff7662bf857
 SHA512:
-  metadata.gz: 22f7f294cf342ae163dd9f1ba8f3f812e193f5f233592c274f84bd1d18e99b5ca0041d5391b88a6df3f21032779e5ebcc399131ab03bb295988c9a178f3d26fa
-  data.tar.gz: 35d94a1e76a3640a22ad794c47c41a98562b1343964b5637d477b390875a4997cf054345470e7c2076f81fd182a344793f24bc2ebe67eca190c0737ff4274ef4
+  metadata.gz: c46120d01cc5a48d365f9e3d9dadb39b9f4825b42aee8f667e3a1a3298439f114f5cb29d34cdcf282bb89f2a9982f756892dfd808e406971876e36cfe5028c12
+  data.tar.gz: 58564662a71b2419a3ed02766614c0b26479702e8cb2d17e1efc0beb5b423b7444eb1b779f7ebc8f79fdf158e7f6ab4ce655af8bf75649fce2459d8f74e97c83

data/bake/covered/debug.rb

@@ -0,0 +1,32 @@
+
+def initialize(context)
+	super
+	
+	require_relative '../../lib/covered'
+end
+
+# Debug the coverage of a file. Show which lines should be executable.
+#
+# @parameter paths [Array(String)] The paths to parse.
+# @parameter execute [Boolean] Whether to execute the code.
+def parse(paths: [], execute: false)
+	files = output = Covered::Files.new
+	output = Covered::Source.new(output)
+	
+	paths.each do |path|
+		output.mark(path, 0, 0)
+	end
+	
+	if execute
+		capture = Covered::Capture.new(output)
+		capture.enable
+		paths.each do |path|
+			load path
+		end
+		capture.disable
+		
+		files.paths = files.paths.slice(*paths)
+	end
+	
+	Covered::Summary.new.call(output, $stderr)
+end

data/lib/covered/files.rb

@@ -31,7 +31,7 @@ module Covered
 			@paths = {}
 		end
 		
-		attr :paths
+		attr_accessor :paths
 		
 		def empty?
 			@paths.empty?

data/lib/covered/source.rb

@@ -79,7 +79,7 @@ module Covered
 			ivasgn: true,
 			cvasgn: true,
 			gvasgn: true,
-			match_pattern: true
+			match_pattern: true,
 		}
 		
 		def executable?(node)
@@ -88,34 +88,42 @@ module Covered
 		
 		IGNORE = {
 			arg: true,
-			# Ruby doesn't appear to execute rescue lines.
-			rescue: true
 		}
 		
 		def ignore?(node)
 			node.nil? || IGNORE[node.type]
 		end
 		
+		IGNORE_CHILDREN = {
+			hash: true,
+			array: true,
+		}
+		
+		def ignore_children?(node)
+			IGNORE_CHILDREN[node.type]
+		end
+		
 		def expand(node, coverage, level = 0)
 			if node.is_a? Parser::AST::Node
 				if ignore?(node)
 					# coverage.annotate(node.location.line, "ignoring #{node.type}")
-				else
-					if node.type == :send
-						# We want to mark the line which has the method on it:
-						coverage.counts[node.location.selector.line] ||= 0
-					elsif executable?(node)
-						# coverage.annotate(node.location.line, "executable #{node.type}")
-						coverage.counts[node.location.line] ||= 0
-					# elsif location = node.location
-					# 	coverage.annotate(location.line, "not executable #{node.type}") rescue nil
+				elsif node.type == :begin
+					if last_child = node.children&.last
+						coverage.counts[last_child.location.line] ||= 0
 					end
 					
-					# if node.type == :send
-					# 	coverage.annotate(node.location.line, "ignoring #{node.type} children")
-					# end
-					
 					expand(node.children, coverage, level + 1)
+				elsif node.type == :send
+					coverage.counts[node.location.selector.line] ||= 0
+				elsif executable?(node)
+					# coverage.annotate(node.location.line, "executable #{node.type}")
+					coverage.counts[node.location.line] ||= 0
+				else
+					if ignore_children?(node)
+						# coverage.annotate(node.location.line, "ignoring #{node.type} children")
+					else
+						expand(node.children, coverage, level + 1)
+					end
 				end
 			elsif node.is_a? Array
 				node.each do |child|

data/lib/covered/sus.rb

@@ -18,23 +18,28 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'config'
-
 module Covered
 	module Sus
 		def initialize(...)
 			super
 			
-			@covered = Covered::Config.load(root: self.root)
-			if @covered.record?
-				@covered.enable
+			# Defer loading the coverage configuration unless we are actually running with coverage enabled to avoid performance cost/overhead.
+			if ENV['COVERAGE']
+				require_relative 'config'
+				
+				@covered = Covered::Config.load(root: self.root)
+				if @covered.record?
+					@covered.enable
+				end
+			else
+				@covered = nil
 			end
 		end
 		
 		def after_tests(assertions)
 			super(assertions)
 			
-			if @covered.record?
+			if @covered&.record?
 				@covered.disable
 				@covered.call(self.output.io)
 			end

data/lib/covered/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.16.6
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -161,6 +161,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- bake/covered/debug.rb
 - bake/covered/validate.rb
 - lib/covered.rb
 - lib/covered/cache.rb