covered 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b906f699dc0a8c5ab648200ae5330cf12a0da31e5c6966bb105d1df387c7179
-  data.tar.gz: 6692c75aa8764654a5a278e248bf4b9f224a10e84363a7cbf0dfc68ba5d84be6
+  metadata.gz: f8203a4eb44d2d3313e21789fa0c12d9c3922526908e8a4410dfa74a51f8a50e
+  data.tar.gz: 7bbf343d12b0cd93f96eb7ff25f192b819e2e55db17ff996b317dc2c7da693b9
 SHA512:
-  metadata.gz: 6656a91ce7b29c67c66dd9e1d63f9c38231b1bfbdedae4ce29b638468d55d0476d308522ecf24d07fee905081653d192cd90d73cf1772b59fd7534f87bfd2cbb
-  data.tar.gz: 21f2d81e59417f81bcf63c7c95e0a6023c67bd68985811f3e2184c1fdbd447be5dd4e74b373546ea5eb307365799b5bf9ea24d2243301cbd9c2abe5112f8382f
+  metadata.gz: f580db7f466a44626c1d764ee427fa32c926370095843af0b4f09d818cf84024a1543bb3d6f3d6e88818f1d3a7b5a249166ab8a5321266942b3b5ec67fecd444
+  data.tar.gz: feca325f1e366a9083dfc9cd55d94d5cb3121c0bf8c621b22137be32460fa64587bb53de0b9ce02f7d35e783f9dbcf590a178c4c8f70b8dbb68e44b99cf069db

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 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-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: A modern approach to code coverage.