covered 0.18.5 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c053a5a25549ed70d6b370eac4eaac7d88ea03063c6fc644fb74bf52df261bf
-  data.tar.gz: 79147df15ce0e4e0cbef2dc43d9439e8cfd426baf3f673c102b477ee55fd00ef
+  metadata.gz: 22da5b4e371b8fb06056b96b3f6a9a0d7755a1684e9e4371d45beae886ba9616
+  data.tar.gz: c841065dece4f121afd7e4b3fe070327c0de15c5fedd972e089950eccf11375b
 SHA512:
-  metadata.gz: 3651915f1b93ad34fb707002e22e85218c5859d0a8ef888c2c8f7c463e8371d9c81bf46c922d3a7e8c65873d540c66bf3bc5ffdbf2c661da7ecf0c13fcf3c13a
-  data.tar.gz: 7237d068d82b93da44eba1f84c681b5632baee5fa81bad25f61af10917397e4deb2bb836ef6f41e79bb7a536a1f667951323c399682cbbd3d35a96a421b4d1fa
+  metadata.gz: c63bdb36d6fb7573cf9bd82fe2bc6f441729470d40b2b5043c164b4ff6d8d6e43513a88692443942613bbb307964814d5b7510325d1da53bdac93b2301d50328
+  data.tar.gz: eb1812bc6debd69bd01004ab0042aa45167a56788fecee49f2f1710689a1cd6fa6d99026352d5a45eaecb0f904720763d7cc3de600a870ac1fdb656a70b80406

data/lib/covered/capture.rb

@@ -8,85 +8,33 @@ require_relative 'wrapper'
 require 'coverage'
 
 module Covered
-	def self.coverage_with_eval?
-		if ::Coverage.respond_to?(:supported?)
-			::Coverage.supported?(:eval)
-		end
-	end
-	
-	unless self.coverage_with_eval?
-		class Capture < Wrapper
-			def initialize(output)
-				super(output)
-				
-				begin
-					@trace = TracePoint.new(:line, :call, :c_call) do |trace|
-						if trace.event == :call
-							# Ruby doesn't always mark call-sites in sub-expressions, so we use this approach to compute a call site and mark it:
-							if location = caller_locations(2, 1).first and path = location.path
-								@output.mark(path, location.lineno, 1)
-							end
-						end
-						
-						if path = trace.path
-							@output.mark(path, trace.lineno, 1)
-						end
-					end
-				rescue
-					warn "Line coverage disabled: #{$!}"
-					@trace = nil
-				end
-			end
+	class Capture < Wrapper
+		def enable
+			super
 			
-			def enable
-				super
-				
-				@trace&.enable
-			end
-			
-			def disable
-				@trace&.disable
-				
-				super
-			end
-			
-			def execute(source, binding: TOPLEVEL_BINDING)
-				enable
-				
-				eval(source.code!, binding, source.path)
-			ensure
-				disable
-			end
+			::Coverage.start(lines: true, eval: true)
 		end
-	else
-		class Capture < Wrapper
-			def enable
-				super
-				
-				::Coverage.start(lines: true, eval: true)
-			end
-			
-			def disable
-				results = ::Coverage.result
+		
+		def disable
+			results = ::Coverage.result
 
-				results.each do |path, result|
-					lines = result[:lines]
+			results.each do |path, result|
+				lines = result[:lines]
 
-					lines.each_with_index do |count, lineno|
-						@output.mark(path, lineno+1, count) if count
-					end
+				lines.each_with_index do |count, lineno|
+					@output.mark(path, lineno+1, count) if count
 				end
-		
-				super
-			end
-
-			def execute(source, binding: TOPLEVEL_BINDING)
-				enable
-				
-				eval(source.code!, binding, source.path)
-			ensure
-				disable
 			end
+	
+			super
+		end
+		
+		def execute(source, binding: TOPLEVEL_BINDING)
+			enable
+			
+			eval(source.code!, binding, source.path, source.line_offset)
+		ensure
+			disable
 		end
 	end
 end

data/lib/covered/config.rb

@@ -75,8 +75,6 @@ module Covered
 		
 		# Override this method to implement your own policy.
 		def make_policy(policy)
-			policy.cache!
-			
 			# Only files in the root would be tracked:
 			policy.root(@root)
 			
@@ -88,8 +86,6 @@ module Covered
 			
 			policy.persist!
 			
-			policy.source
-			
 			policy.reports!(@coverage)
 		end
 	end

data/lib/covered/files.rb

@@ -18,6 +18,10 @@ module Covered
 		
 		attr_accessor :paths
 		
+		def [](path)
+			@paths[path]
+		end
+		
 		def empty?
 			@paths.empty?
 		end

data/lib/covered/persist.rb

@@ -16,7 +16,7 @@ module Covered
 		def initialize(output, path = DEFAULT_PATH)
 			super(output)
 			
-			@path = path
+			@path = self.expand_path(path)
 			@touched = Set.new
 		end
 		
@@ -51,6 +51,7 @@ module Covered
 		def serialize(coverage)
 			{
 				# We want to use relative paths so that moving the repo won't break everything:
+				pid: Process.pid,
 				path: relative_path(coverage.path),
 				mtime: File.mtime(coverage.path).to_f,
 				counts: coverage.counts,

data/lib/covered/policy.rb

@@ -5,9 +5,7 @@
 
 require_relative "summary"
 require_relative "files"
-require_relative "source"
 require_relative "capture"
-require_relative "cache"
 require_relative "persist"
 
 module Covered
@@ -29,32 +27,24 @@ module Covered
 			super
 		end
 		
-		def source(*args)
-			@output = Source.new(@output, *args)
+		def include(...)
+			@output = Include.new(@output, ...)
 		end
 		
-		def include(*args)
-			@output = Include.new(@output, *args)
+		def skip(...)
+			@output = Skip.new(@output, ...)
 		end
 		
-		def skip(*args)
-			@output = Skip.new(@output, *args)
+		def only(...)
+			@output = Only.new(@output, ...)
 		end
 		
-		def only(*args)
-			@output = Only.new(@output, *args)
+		def root(...)
+			@output = Root.new(@output, ...)
 		end
 		
-		def root(*args)
-			@output = Root.new(@output, *args)
-		end
-		
-		def cache!
-			@output = Cache.new(@output)
-		end
-		
-		def persist!
-			@output = Persist.new(@output)
+		def persist!(...)
+			@output = Persist.new(@output, ...)
 		end
 		
 		def capture
@@ -92,8 +82,8 @@ module Covered
 				return klass.new
 			end
 			
-			def call(*args)
-				self.new.call(*args)
+			def call(...)
+				self.new.call(...)
 			end
 			
 			def to_s
@@ -128,9 +118,9 @@ module Covered
 			end
 		end
 		
-		def call(*args)
+		def call(...)
 			@reports.each do |report|
-				report.call(self, *args)
+				report.call(self, ...)
 			end
 		end
 	end

data/lib/covered/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.19.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -71,20 +71,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +136,6 @@ 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
@@ -160,7 +145,6 @@ files:
 - lib/covered/persist.rb
 - lib/covered/policy.rb
 - lib/covered/rspec.rb
-- lib/covered/source.rb
 - lib/covered/statistics.rb
 - lib/covered/summary.rb
 - lib/covered/sus.rb
@@ -181,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/covered/cache.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
-
-require_relative 'wrapper'
-
-require 'coverage'
-
-module Covered
-	class Cache < Wrapper
-		def initialize(output)
-			super(output)
-			
-			@marks = nil
-		end
-		
-		def mark(path, lineno, count = 1)
-			if @marks
-				@marks.push(path, lineno, count)
-			else
-				super
-			end
-		end
-		
-		def enable
-			@marks = []
-			
-			super
-		end
-		
-		def flush
-			if @marks
-				@marks.each_slice(3) do |path, lineno, count|
-					@output.mark(path, lineno, count)
-				end
-				
-				@marks = nil
-			end
-			
-			super
-		end
-		
-		def disable
-			super
-			
-			flush
-		end
-	end
-end

data/lib/covered/source.rb

@@ -1,163 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
-
-require_relative 'wrapper'
-
-require 'thread'
-require 'parser/current'
-
-module Covered
-	# The source map, loads the source file, parses the AST to generate which lines contain executable code.
-	class Source < Wrapper
-		def initialize(output)
-			super(output)
-			
-			begin
-				@trace = TracePoint.new(:script_compiled) do |trace|
-					instruction_sequence = trace.instruction_sequence
-
-					# We only track source files which begin at line 1, as these represent whole files instead of monkey patches.
-					if instruction_sequence.first_lineno <= 1
-						# Extract the source path and source itself and save it for later:
-						if path = instruction_sequence.path and script = trace.eval_script
-							self.add(Coverage::Source.new(path, script, instruction_sequence.first_lineno))
-						end
-					end
-				end
-			rescue
-				warn "Script coverage disabled: #{$!}"
-				@trace = nil
-			end
-		end
-		
-		def enable
-			super
-			
-			@trace&.enable
-		end
-		
-		def disable
-			@trace&.disable
-			
-			super
-		end
-		
-		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)
-			EXECUTABLE[node.type]
-		end
-		
-		IGNORE = {
-			arg: 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
-		
-		IGNORE_METHOD = {
-			freeze: true
-		}
-		
-		def ignore_method?(name)
-			IGNORE_METHOD[name]
-		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}")
-				elsif node.type == :begin
-					# if last_child = node.children&.last
-					# 	coverage.counts[last_child.location.line] ||= 0
-					# end
-					
-					return expand(node.children, coverage, level + 1)
-				elsif node.type == :send
-					if ignore_method?(node.children[1])
-						# coverage.annotate(node.location.line, "ignoring #{node.type}")
-						return
-					else
-						# coverage.annotate(node.location.line, "accepting selector #{node.type}")
-						coverage.counts[node.location.selector.line] ||= 0
-					end
-				elsif node.type == :resbody
-					return expand(node.children[2], coverage, level + 1)
-				elsif executable?(node)
-					# coverage.annotate(node.location.line, "executable #{node.type}")
-					coverage.counts[node.location.line] ||= 0
-				end
-
-				if ignore_children?(node)
-					# coverage.annotate(node.location.line, "ignoring #{node.type} children")
-				else
-					expand(node.children, coverage, level + 1)
-				end
-			elsif node.is_a? Array
-				node.each do |child|
-					expand(child, coverage, level)
-				end
-			else
-				return false
-			end
-		end
-		
-		def add(source)
-			if coverage = super
-				if top = self.parse(source)
-					self.expand(top, coverage)
-				end
-			end
-			
-			return coverage
-		end
-		
-		def parse(source)
-			if source.code?
-				Parser::CurrentRuby.parse(source.code, source.path, source.line_offset)
-			elsif path = source.path and File.exist?(path)
-				Parser::CurrentRuby.parse_file(path)
-			else
-				# warn "Couldn't parse #{path}, file doesn't exist?"
-			end
-		rescue
-			warn "Couldn't parse #{source}: #{$!}"
-		end
-		
-		def each(&block)
-			@output.each do |coverage|
-				if top = parse(coverage.source)
-					self.expand(top, coverage)
-				end
-				
-				yield coverage.freeze
-			end
-		end
-	end
-end