covered 0.16.9 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0eb7604139813f68b3d05cda0b32f4cc3cd4de049b7f383481cc7e849eb7a67
-  data.tar.gz: 1129024c3c747e549da59b45acf8bfb426883385272295bf31dd0a7bb8331fcb
+  metadata.gz: d8f090b2435fd102d59fa7c4d7521c3175c63525a41a9031df94437186473d4d
+  data.tar.gz: 451c5de36ca41d1036a2114427bf06e52c558d70600a010da17253a5fce351e6
 SHA512:
-  metadata.gz: 383bf343bf3fc1ab39cfe105da6e704c4818f75ccb85456b4d9f9d495021809d923287da9080a5385327c32f214ee51be3fc9e1d28b6573e49dd50e86e89b42d
-  data.tar.gz: 9ad476c9ac2882eeefa12981b183ebb30015fa4b68f377ad41bb67d453d2d7f498145eefe9cfe54a12955d524290868f1b946323166fcf1c21f8525148ca6bbe
+  metadata.gz: d69196d6806beed48922c14cd215182fee51319a95e1484f43ab3132d7c71d6caadf058a1391859d80d0830a3c0d52708ff3f96b202fa9fc2107f804eedf9126
+  data.tar.gz: 79fbd2fef4c24c606b8534ae55a95dd42a33db25b975a8dd1370f553d2d19876ad71ee5734a8c7c1958c93687631d925d0c714a3c49d53adf3629463a1e38478

data/lib/covered/capture.rb

@@ -43,10 +43,10 @@ module Covered
 			super
 		end
 		
-		def execute(path, source, binding: TOPLEVEL_BINDING)
+		def execute(source, binding: TOPLEVEL_BINDING)
 			enable
 			
-			eval(source, binding, path)
+			eval(source.code!, binding, source.path)
 		ensure
 			disable
 		end

data/lib/covered/coverage.rb

@@ -21,8 +21,38 @@ module Covered
 	end
 	
 	class Coverage
-		def initialize(path, counts = [])
-			@path = path
+		Source = Struct.new(:path, :code, :line_offset) do
+			def to_s
+				"\#<#{self.class} path=#{path}>"
+			end
+			
+			def read(&block)
+				if block_given?
+					File.open(self.path, "r", &block)
+				else
+					File.read(self.path)
+				end
+			end
+			
+			def code!
+				self.code || self.read
+			end
+			
+			def code?
+				!!self.code
+			end
+		end
+		
+		def self.source(path, code = nil, line_offset = 1)
+			Source.new(path, code, line_offset)
+		end
+		
+		def self.for(path, code = nil, line_offset = 1)
+			self.new(Source.new(path, code, line_offset))
+		end
+		
+		def initialize(source, counts = [])
+			@source = source
 			@counts = counts
 			@total = 0
 			
@@ -32,18 +62,19 @@ module Covered
 			@executed_lines = nil
 		end
 		
-		attr :path
+		def path
+			@source.path
+		end
+		
+		attr_accessor :source
+		
 		attr :counts
 		attr :total
 		
 		attr :annotations
 		
 		def read(&block)
-			if block_given?
-				File.open(@path, "r", &block)
-			else
-				File.read(@path)
-			end
+			@source.read(&block)
 		end
 		
 		def freeze

data/lib/covered/files.rb

@@ -23,15 +23,15 @@ module Covered
 		end
 		
 		def mark(path, lineno, value)
-			coverage = (@paths[path] ||= Coverage.new(path))
+			coverage = (@paths[path] ||= Coverage.for(path))
 			
 			coverage.mark(lineno, value)
 			
 			return coverage
 		end
 		
-		def add(path, source = nil)
-			@paths[path] ||= Coverage.new(path)
+		def add(source)
+			@paths[source.path] ||= Coverage.new(source)
 		end
 		
 		def each(&block)
@@ -73,7 +73,7 @@ module Covered
 			end
 			
 			paths.each do |path|
-				yield Coverage.new(path)
+				yield Coverage.for(path)
 			end
 		end
 	end

data/lib/covered/persist.rb

@@ -40,7 +40,11 @@ module Covered
 				end
 			end
 			
-			record[:coverage].each_with_index do |count, index|
+			if source = record[:source]
+				@output.add(source)
+			end
+			
+			record[:counts].each_with_index do |count, index|
 				@output.mark(path, index, count) if count
 			end
 		end
@@ -49,8 +53,9 @@ module Covered
 			{
 				# We want to use relative paths so that moving the repo won't break everything:
 				path: relative_path(coverage.path),
-				coverage: coverage.counts,
 				mtime: File.mtime(coverage.path).to_f,
+				counts: coverage.counts,
+				source: coverage.source,
 			}
 		end
 		
@@ -128,6 +133,9 @@ module Covered
 			packer = MessagePack::Packer.new(io)
 			packer.register_type(0x00, Symbol, :to_msgpack_ext)
 			packer.register_type(0x01, Time) {|object| object.to_s}
+			packer.register_type(0x0F, Coverage::Source) do |object|
+				object.to_a.to_msgpack
+			end
 			
 			return packer
 		end
@@ -136,6 +144,9 @@ module Covered
 			unpacker = MessagePack::Unpacker.new(io)
 			unpacker.register_type(0x00, Symbol, :from_msgpack_ext)
 			unpacker.register_type(0x01, Time, :parse)
+			unpacker.register_type(0x0F) do |data|
+				Coverage::Source.new(*MessagePack.unpack(data))
+			end
 			
 			return unpacker
 		end

data/lib/covered/source.rb

@@ -11,16 +11,9 @@ 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
-		Script = Struct.new(:path, :source, :line_offset)
-		
 		def initialize(output)
 			super(output)
 			
-			@paths = {}
-			@mutex = Mutex.new
-			
-			@annotations = {}
-			
 			begin
 				@trace = TracePoint.new(:script_compiled) do |trace|
 					instruction_sequence = trace.instruction_sequence
@@ -28,10 +21,8 @@ module Covered
 					# 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 source = trace.eval_script
-							@mutex.synchronize do
-								@paths[path] = Script.new(path, source, instruction_sequence.first_lineno)
-							end
+						if path = instruction_sequence.path and script = trace.eval_script
+							self.add(Coverage::Source.new(path, script, instruction_sequence.first_lineno))
 						end
 					end
 				end
@@ -135,30 +126,31 @@ module Covered
 			end
 		end
 		
-		def add(path, source = nil)
+		def add(source)
 			if coverage = super
-				top = Parser::CurrentRuby.parse(source)
-				self.expand(top, coverage)
+				if top = self.parse(source)
+					self.expand(top, coverage)
+				end
 			end
 			
 			return coverage
 		end
 		
-		def parse(path)
-			if script = @paths[path]
-				Parser::CurrentRuby.parse(script.source, script.path, script.line_offset)
-			elsif File.exist?(path)
+		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 #{path}: #{$!}"
+			warn "Couldn't parse #{source}: #{$!}"
 		end
 		
 		def each(&block)
 			@output.each do |coverage|
-				if top = parse(coverage.path)
+				if top = parse(coverage.source)
 					self.expand(top, coverage)
 				end
 				

data/lib/covered/version.rb

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

data/lib/covered/wrapper.rb

@@ -21,7 +21,7 @@ module Covered
 		def mark(path, lineno, value)
 		end
 		
-		def add(path, source = nil)
+		def add(source)
 		end
 		
 		def each
@@ -63,8 +63,8 @@ module Covered
 			@output.mark(path, lineno, value)
 		end
 		
-		def add(path, source = nil)
-			@output.add(path, source = nil)
+		def add(source)
+			@output.add(source)
 		end
 		
 		# @yield [Coverage] the path to the file, and the execution counts.

metadata

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