covered 0.16.3 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ec9e58976df4dd7611cd55dd8f7c3e21267147453e1ea6be3339a8bfc98d6f
-  data.tar.gz: 7ff2d500f8b308186f1db4609c5b1f14594ead77b77c77df54efc5953586a6e5
+  metadata.gz: ab80834ad5a14e4853e865768e7cc51eb38497904e62818e81ce3633ac9f43d2
+  data.tar.gz: ce3a3757b0c08e8f6b09f8d0c3f7273a623ba293f9b56b81b4b5cff7662bf857
 SHA512:
-  metadata.gz: e835b21f824253f8aef9aa500f01d7a0d4235cdb17f5799858d6e66deb2afe3970e63a4761c1c0f9d97cf2522e56ead2226103e12cc87a6a6b2079add132ffcb
-  data.tar.gz: e81491a1f50577050c58cdc0ae11e0b230097456d71ac544c640a977927a685aa7844ef24c886385c7ab6aa1f490182c7963c0833776655c71c06b583c3ac322
+  metadata.gz: c46120d01cc5a48d365f9e3d9dadb39b9f4825b42aee8f667e3a1a3298439f114f5cb29d34cdcf282bb89f2a9982f756892dfd808e406971876e36cfe5028c12
+  data.tar.gz: 58564662a71b2419a3ed02766614c0b26479702e8cb2d17e1efc0beb5b423b7444eb1b779f7ebc8f79fdf158e7f6ab4ce655af8bf75649fce2459d8f74e97c83

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-�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�?�[�ܡ���
+\��=�
�F��wj&���9i�Bkv�{R�)���J�{}ߦ$9�~�c|���K�%��C��L��˦�,�TI���b?VU�(l��RU+�n���v�1p)�F�u�������x�sc��&��+c�"�p�x^���5f,_�q�x�˃����~�2s����vt"מ��E�υ5���sjo�m�4����2��������H��
+Y��gȮ���
JM9��(qm�lZ`�Sb#��MI�vҏ��
+��K�[d<U�	ZDo㥝�	������

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

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'policy'
+require_relative 'config'
 
 require 'minitest'
 

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,31 +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 executable?(node)
-						# coverage.annotate(node.location.line, "executable #{node.type}")
-						coverage.counts[node.location.line] ||= 0
-					elsif node.location
-						# coverage.annotate(node.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
+					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
-					
-					expand(node.children, coverage, level + 1)
 				end
 			elsif node.is_a? Array
 				node.each do |child|

data/lib/covered/sus.rb

@@ -0,0 +1,48 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# 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:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# 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.
+
+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.
+			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?
+				@covered.disable
+				@covered.call(self.output.io)
+			end
+		end
+	end
+end

data/lib/covered/version.rb

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

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.6
 platform: ruby
 authors:
 - Samuel Williams
+- Adam Daniels
 - Cyril Roelandt
 - Shannon Skipper
 - chocolateboy
@@ -13,33 +14,34 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
-  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
-  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
-  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
-  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
-  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
-  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
-  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
-  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
-  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
-  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
-  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
-  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
-  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
-  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
-  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
-  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
-  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
-  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
-  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
-  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
-  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
-  HiLJ8VOFx6w=
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -159,13 +161,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- bake/covered/debug.rb
 - bake/covered/validate.rb
 - lib/covered.rb
 - lib/covered/cache.rb
 - lib/covered/capture.rb
 - lib/covered/config.rb
 - lib/covered/coverage.rb
-- lib/covered/coveralls.rb
 - lib/covered/files.rb
 - lib/covered/markdown_summary.rb
 - lib/covered/minitest.rb
@@ -175,6 +177,7 @@ files:
 - lib/covered/source.rb
 - lib/covered/statistics.rb
 - lib/covered/summary.rb
+- lib/covered/sus.rb
 - lib/covered/version.rb
 - lib/covered/wrapper.rb
 homepage: https://github.com/ioquatix/covered
@@ -197,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A modern approach to code coverage.

data/lib/covered/coveralls.rb

@@ -1,108 +0,0 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# 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:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# 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.
-
-require 'async'
-require 'async/rest/representation'
-
-require 'securerandom'
-
-module Covered
-	class Coveralls
-		class Wrapper < Async::REST::Wrapper::JSON
-			def prepare_request(payload, headers)
-				headers['accept'] ||= @content_type
-				boundary = SecureRandom.hex(32)
-				
-				# This is a pretty messed up API. Don't change anything below. It's fragile.
-				if payload
-					headers['content-type'] = "multipart/form-data, boundary=#{boundary}"
-					
-					Async::HTTP::Body::Buffered.new([
-						"--#{boundary}\r\n",
-						"Content-Disposition: form-data; name=\"json_file\"; filename=\"body.json\"\r\n",
-						"Content-Type: text/plain\r\n\r\n",
-						::JSON.dump(payload),
-						"\r\n--#{boundary}--\r\n",
-					])
-				end
-			end
-		end
-		
-		URL = "https://coveralls.io/api/v1/jobs"
-		
-		def initialize(token: nil, service: nil, job_id: nil)
-			@token = token
-			@service = service
-			@job_id = job_id
-		end
-		
-		def detect_service
-			if token = ENV.fetch('COVERALLS_REPO_TOKEN', @token)
-				return {"repo_token" => token}
-			elsif @service && @job_id
-				return {"service_name" => @service, "service_job_id" => @job_id}
-			elsif job_id = ENV['TRAVIS_JOB_ID']
-				return {"service_name" => "travis-ci", "service_job_id" => job_id}
-			elsif token = ENV['GITHUB_TOKEN']
-				return {"service_name" => "github", "repo_token" => token}
-			else
-				warn "#{self.class} can't detect service! Please specify COVERALLS_REPO_TOKEN."
-			end
-			
-			return nil
-		end
-		
-		def call(wrapper, output = $stderr)
-			if body = detect_service
-				output.puts "Submitting data using #{body.inspect}..."
-				
-				source_files = []
-				
-				wrapper.each do |coverage|
-					path = wrapper.relative_path(coverage.path)
-					
-					source_files << {
-						name: path,
-						source_digest: Digest::MD5.hexdigest(coverage.read),
-						coverage: coverage.to_a,
-					}
-				end
-				
-				body[:source_files] = source_files
-				
-				Async do
-					representation = Async::REST::Representation.new(
-						Async::REST::Resource.for(URL),
-						wrapper: Wrapper.new
-					)
-					
-					begin
-						response = representation.post(body)
-						
-						output.puts "Got response: #{response.read}"
-						
-					ensure
-						representation.close
-					end
-				end
-			end
-		end
-	end
-end