covered 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1eaf5277a7fb0e714337382c57b984cac7f85ca1dcf554bad14aa854fa83c5
-  data.tar.gz: 0ffef4a5eca5b677089d094aff7d6ad566a7fa5a6790ca64199a5411a0c08c16
+  metadata.gz: 78b0c761d5570d863e9a5d83188e37f136838b566e984ac949f8e9875c6fbc8a
+  data.tar.gz: 0434dcd73729213ebb510009c435557fa13d411a4b4de7564960b12482a8811e
 SHA512:
-  metadata.gz: 505bac20e09538f38461bf9aecc016ada76557d1f60d1f0cdb4b4279d5505b556f23bdf10d2944f76e410f14cf32a8925e790c6e7ee5756f465169d78184b3f1
-  data.tar.gz: ae1294f4a3833a2394b5a7239c9a044f9bb2208d2e0b96db774cd508413eb092f46b2ab5891418803add487e0e6ee3dd033948c9161201a028f71b42dfe8d910
+  metadata.gz: f2f0b4eae95375d6e3f08df7d5a064660c0453e7c64775841ea193bf57cbde51ed07145b9f2558dec6a67887b278adc00833e87f96f08621359c08599c24941e
+  data.tar.gz: 4daa48fa88d3a028343bc055743ad60eb702c964e2a98f972478c3b0823a4766db135d118bb0b19e48653a907bbf86d08a0077b1bfa41c1844cc34a7b13ca0b2

data/lib/covered/capture.rb

@@ -21,15 +21,26 @@ module Covered
 			::Coverage.result(stop: false, clear: true)
 		end
 		
+		EVAL_PATHS = {
+			"(eval)" => true,
+			"(irb)" => true,
+			"eval" => true
+		}
+		
 		def finish
 			results = ::Coverage.result
 			
 			results.each do |path, result|
-				lines = result[:lines]
+				next if EVAL_PATHS.include?(path)
+				
 				path = self.expand_path(path)
 				
-				lines.each_with_index do |count, lineno|
-					@output.mark(path, lineno+1, count) if count
+				# 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])
+				else
+					# warn "Skipping coverage for #{path.inspect} because it doesn't exist!"
+					# Ignore.
 				end
 			end
 			

data/lib/covered/files.rb

@@ -34,10 +34,13 @@ module Covered
 			end
 			
 			def mark(lineno, value = 1)
-				if @counts[lineno]
-					@counts[lineno] += value
-				else
-					@counts[lineno] = value
+				Array(value).each_with_index do |value, index|
+					offset = lineno + index
+					if @counts[offset]
+						@counts[offset] += value
+					else
+						@counts[offset] = value
+					end
 				end
 			end
 			

data/lib/covered/summary.rb

@@ -29,6 +29,7 @@ module Covered
 				terminal[:ignored_code] ||= terminal.style(nil, nil, :faint)
 				
 				terminal[:annotations] ||= terminal.style(:blue)
+				terminal[:error] ||= terminal.style(:red)
 			end
 		end
 		
@@ -82,36 +83,49 @@ module Covered
 			end
 		end
 		
+		def print_coverage(terminal, coverage)
+			line_offset = 1
+			counts = coverage.counts
+			
+			coverage.read do |file|
+				print_line_header(terminal)
+				
+				file.each_line do |line|
+					count = counts[line_offset]
+					
+					print_annotations(terminal, coverage, line, line_offset)
+					
+					print_line(terminal, line, line_offset, count)
+					
+					line_offset += 1
+				end
+			end
+		end
+		
+		def print_error(terminal, error)
+			terminal.puts "Error: #{error.message}", style: :error
+			terminal.puts error.backtrace
+		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)
+		def call(wrapper, output = $stdout, **options)
 			terminal = self.terminal(output)
 			
 			statistics = self.each(wrapper) do |coverage|
-				line_offset = 1
-				
 				path = wrapper.relative_path(coverage.path)
 				terminal.puts ""
 				terminal.puts path, style: :path
 				
-				counts = coverage.counts
-				
-				coverage.read do |file|
-					print_line_header(terminal)
-					
-					file.each_line do |line|
-						count = counts[line_offset]
-						
-						print_annotations(terminal, coverage, line, line_offset)
-						
-						print_line(terminal, line, line_offset, count)
-						
-						line_offset += 1
-					end
+				begin
+					print_coverage(terminal, coverage, **options)
+				rescue => error
+					print_error(terminal, error)
 				end
 				
 				coverage.print(output)
 			end
 			
+			terminal.puts
 			statistics.print(output)
 		end
 	end
@@ -150,49 +164,35 @@ module Covered
 	end
 	
 	class PartialSummary < Summary
-		def call(wrapper, output = $stdout, before: 4, after: 4)
-			terminal = self.terminal(output)
+		def print_coverage(terminal, coverage, before: 4, after: 4)
+			return if coverage.zero?
 			
-			statistics = self.each(wrapper) do |coverage|
-				line_offset = 1
-				
-				path = wrapper.relative_path(coverage.path)
-				terminal.puts ""
-				terminal.puts path, style: :path
-				
-				counts = coverage.counts
-				last_line = nil
+			line_offset = 1
+			counts = coverage.counts
+			last_line = nil
+			
+			coverage.read do |file|
+				print_line_header(terminal)
 				
-				unless coverage.zero?
-					print_line_header(terminal)
+				file.each_line do |line|
+					range = Range.new([line_offset - before, 0].max, line_offset+after)
 					
-					coverage.read do |file|
-						file.each_line do |line|
-							range = Range.new([line_offset - before, 0].max, line_offset+after)
-							
-							if counts[range]&.include?(0)
-								count = counts[line_offset]
-								
-								if last_line and last_line != line_offset-1
-									terminal.puts ":".rjust(16)
-								end
-								
-								print_annotations(terminal, coverage, line, line_offset)
-								print_line(terminal, line, line_offset, count)
-								
-								last_line = line_offset
-							end
-							
-							line_offset += 1
+					if counts[range]&.include?(0)
+						count = counts[line_offset]
+						
+						if last_line and last_line != line_offset-1
+							terminal.puts ":".rjust(16)
 						end
+						
+						print_annotations(terminal, coverage, line, line_offset)
+						print_line(terminal, line, line_offset, count)
+						
+						last_line = line_offset
 					end
+					
+					line_offset += 1
 				end
-				
-				coverage.print(output)
 			end
-			
-			terminal.puts
-			statistics.print(output)
 		end
 	end
 	

data/lib/covered/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -43,7 +43,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -176,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.