covered 0.17.1 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b906f699dc0a8c5ab648200ae5330cf12a0da31e5c6966bb105d1df387c7179
-  data.tar.gz: 6692c75aa8764654a5a278e248bf4b9f224a10e84363a7cbf0dfc68ba5d84be6
+  metadata.gz: 016df0cc962d1ae6f41781f31c6e96066b68e7f0b2b6a3740f2e0c4f23e4ea93
+  data.tar.gz: d26da5abf8676d28fe87d8560b6a02f9e114639fecdb8a27bb4a69b62d645440
 SHA512:
-  metadata.gz: 6656a91ce7b29c67c66dd9e1d63f9c38231b1bfbdedae4ce29b638468d55d0476d308522ecf24d07fee905081653d192cd90d73cf1772b59fd7534f87bfd2cbb
-  data.tar.gz: 21f2d81e59417f81bcf63c7c95e0a6023c67bd68985811f3e2184c1fdbd447be5dd4e74b373546ea5eb307365799b5bf9ea24d2243301cbd9c2abe5112f8382f
+  metadata.gz: 39d4eeb947f26d7d1c48872a8e6706b123c721a80534eb7c5c4447cbe54b7d96605a20832c2c6d8a7611d429a18d5cbf3572973580b757f58d2b3205f5cb569f
+  data.tar.gz: c35ca843c00c9545f8771b9c58622e8076f9af25a188c3c01c3339581e9f87af2f77b0f22ae69301cf2f4f8118269aaf634cbc24d19a4c80329603c9c0a54879

data/lib/covered/capture.rb

@@ -8,69 +8,85 @@ require_relative 'wrapper'
 require 'coverage'
 
 module Covered
-	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)
+	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
-					
-					if path = trace.path
-						@output.mark(path, trace.lineno, 1)
-					end
+				rescue
+					warn "Line coverage disabled: #{$!}"
+					@trace = nil
 				end
-			rescue
-				warn "Line coverage disabled: #{$!}"
-				@trace = nil
 			end
-		end
-		
-		def enable
-			super
 			
-			@trace&.enable
-		end
-		
-		def disable
-			@trace&.disable
+			def enable
+				super
+				
+				@trace&.enable
+			end
+			
+			def disable
+				@trace&.disable
+				
+				super
+			end
 			
-			super
+			def execute(source, binding: TOPLEVEL_BINDING)
+				enable
+				
+				eval(source.code!, binding, source.path)
+			ensure
+				disable
+			end
 		end
-		
-		def execute(source, binding: TOPLEVEL_BINDING)
-			enable
+	else
+		class Capture < Wrapper
+			def enable
+				super
+				
+				::Coverage.start(lines: true, eval: true)
+			end
 			
-			eval(source.code!, binding, source.path)
-		ensure
-			disable
+			def disable
+				results = ::Coverage.result
+
+				results.each do |path, result|
+					lines = result[:lines]
+
+					lines.each_with_index do |count, lineno|
+						@output.mark(path, lineno+1, count) if count
+					end
+				end
+		
+				super
+			end
+
+			def execute(source, binding: TOPLEVEL_BINDING)
+				enable
+				
+				eval(source.code!, binding, source.path)
+			ensure
+				disable
+			end
 		end
 	end
-	
-	# class Capture < Wrapper
-	# 	def enable
-	# 		super
-	# 
-	# 		::Coverage.start
-	# 	end
-	# 
-	# 	def disable
-	# 		result = ::Coverage.result
-	# 
-	# 		puts result.inspect
-	# 
-	# 		result.each do |path, lines|
-	# 			lines.each_with_index do |lineno, count|
-	# 				@output.mark(path, lineno, count)
-	# 			end
-	# 		end
-	# 
-	# 		super
-	# 	end
-	# end
 end

data/lib/covered/persist.rb

@@ -8,7 +8,6 @@ require_relative 'wrapper'
 require 'msgpack'
 require 'time'
 require 'set'
-require 'console'
 
 module Covered
 	class Persist < Wrapper
@@ -26,7 +25,7 @@ module Covered
 			return unless path = expand_path(record[:path])
 			
 			unless File.exist?(path)
-				Console.logger.debug(self) {"Ignoring coverage, path #{path} does not exist!"}
+				# Ignore this coverage, the file no longer exists.
 				return
 			end
 			
@@ -35,7 +34,7 @@ module Covered
 			
 			unless ignore_mtime
 				if File.mtime(path).to_f > record[:mtime]
-					Console.logger.debug(self) {"Ignoring coverage, path #{path} has been updated: #{File.mtime(path).to_f} > #{record[:mtime]}!"}
+					# Ignore this coverage, the file has been modified since it was recorded.
 					return
 				end
 			end
@@ -66,8 +65,6 @@ module Covered
 			File.open(@path, "rb") do |file|
 				file.flock(File::LOCK_SH)
 				
-				Console.logger.debug(self) {"Loading from #{@path} with #{options}..."}
-				
 				make_unpacker(file).each do |record|
 					self.apply(record, **options)
 				end
@@ -79,8 +76,6 @@ module Covered
 			File.open(@path, "wb") do |file|
 				file.flock(File::LOCK_EX)
 				
-				Console.logger.debug(self) {"Saving to #{@path}..."}
-				
 				packer = make_packer(file)
 				
 				self.each do |coverage|

data/lib/covered/rspec.rb

@@ -4,7 +4,6 @@
 # Copyright, 2018-2022, by Samuel Williams.
 
 require_relative 'config'
-
 require 'rspec/core/formatters'
 
 $covered = Covered::Config.load
@@ -13,6 +12,7 @@ module Covered
 	module RSpec
 		module Policy
 			def load_spec_files
+				$stderr.puts "load_spec_files"
 				$covered.enable
 				
 				super

data/lib/covered/summary.rb

@@ -6,8 +6,6 @@
 require_relative 'statistics'
 require_relative 'wrapper'
 
-require 'console/terminal'
-
 module Covered
 	class Summary
 		def initialize(threshold: 1.0)
@@ -15,6 +13,8 @@ module Covered
 		end
 		
 		def terminal(output)
+			require 'console/terminal'
+			
 			Console::Terminal.for(output).tap do |terminal|
 				terminal[:path] ||= terminal.style(nil, nil, :bold, :underline)
 				terminal[:brief_path] ||= terminal.style(:yellow)

data/lib/covered/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest