covered 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1eaf5277a7fb0e714337382c57b984cac7f85ca1dcf554bad14aa854fa83c5
-  data.tar.gz: 0ffef4a5eca5b677089d094aff7d6ad566a7fa5a6790ca64199a5411a0c08c16
+  metadata.gz: f81a87dfa60bac921785b65464dac44223ea3a449fc4701e205dd0f8d8bfece0
+  data.tar.gz: 7812cbe1c1622620bcc2b8dfcc70e9a97eda3cbb84dc5bea7291ce62009f5ec6
 SHA512:
-  metadata.gz: 505bac20e09538f38461bf9aecc016ada76557d1f60d1f0cdb4b4279d5505b556f23bdf10d2944f76e410f14cf32a8925e790c6e7ee5756f465169d78184b3f1
-  data.tar.gz: ae1294f4a3833a2394b5a7239c9a044f9bb2208d2e0b96db774cd508413eb092f46b2ab5891418803add487e0e6ee3dd033948c9161201a028f71b42dfe8d910
+  metadata.gz: 93b23c3c8ceecffbfb48d1739d0d4fc039f9e0ac90037f0414fb0ee660509d003d52e3618d3bc6ef6151ef4161e81de95e96c780868bac016ad1e7c4fe4ab709
+  data.tar.gz: e933d87ab654a06c99e11ea505c520ed89f60741241dc18246dca8fb6ff7266c3ddb5fa1b47c45f246de2cc5cd1325d165767a31e5e8ec63e57835138e2b6297

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/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'policy'
 

data/lib/covered/files.rb

@@ -34,10 +34,15 @@ module Covered
 			end
 			
 			def mark(lineno, value = 1)
-				if @counts[lineno]
-					@counts[lineno] += value
-				else
-					@counts[lineno] = value
+				# 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 = 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/sus.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 module Covered
 	module Sus

data/lib/covered/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 module Covered
-	VERSION = "0.20.1"
+	VERSION = "0.21.0"
 end

data/license.md

@@ -2,7 +2,6 @@
 
 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.  

data/readme.md

@@ -61,6 +61,10 @@ When running `rspec`, you can specify the kind of coverage analysis you would li
 
 If no `COVERAGE` is specified, coverage tracking will be finishd.
 
+### Template Coverage
+
+Covered supports coverage of templates which are compiled into Ruby code. This is only supported on Ruby 3.2+ due to enhancements in the coverage interface.
+
 ### Partial Summary
 
     COVERAGE=PartialSummary rspec
@@ -73,17 +77,6 @@ This report only shows snippets of source code with incomplete coverage.
 
 This report lists several files in order of least coverage.l
 
-### Coveralls/Travis Integration
-
-You can send coverage information to [Coveralls](https://coveralls.io) by editing your `.travis.yml` file:
-
-    matrix:
-      include:
-        - rvm: 2.6
-          env: COVERAGE=PartialSummary,Coveralls
-
-This will print out a brief report and then upload the coverage data. This integrates transparently with Travis.
-
 ## See Also
 
   - [coveralls-ruby](https://github.com/lemurheavy/coveralls-ruby) – the official Coveralls implementation for Ruby.
@@ -91,32 +84,18 @@ This will print out a brief report and then upload the coverage data. This integ
 
 ## Contributing
 
-1.  Fork it
-2.  Create your feature branch (`git checkout -b my-new-feature`)
-3.  Commit your changes (`git commit -am 'Add some feature'`)
-4.  Push to the branch (`git push origin my-new-feature`)
-5.  Create new Pull Request
-
-## License
+We welcome contributions to this project.
 
-Released under the MIT license.
+1.  Fork it.
+2.  Create your feature branch (`git checkout -b my-new-feature`).
+3.  Commit your changes (`git commit -am 'Add some feature'`).
+4.  Push to the branch (`git push origin my-new-feature`).
+5.  Create new Pull Request.
 
-Copyright, 2018, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
+### Developer Certificate of Origin
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+### Contributor Covenant
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -10,7 +10,6 @@ authors:
 - Felix Yan
 - Shannon Skipper
 - Stephen Ierodiaconou
-- chocolateboy
 autorequire:
 bindir: bin
 cert_chain:
@@ -43,7 +42,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -73,62 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: sus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: trenni
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 description:
 email:
 executables: []
@@ -169,14 +112,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A modern approach to code coverage.