covered 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b53c13ab215d5a93f7a092321dc70b8538909a76da3e841b8ce6c2f8a7fcdc3
-  data.tar.gz: 6f01972bf2729eb4549612acfe8dc7ad37bb8aaf927460257ae4a060cee8e001
+  metadata.gz: 112c85633150c4f05435b29a2867a51a711a9f216fdbe850c0356b0371ab4e49
+  data.tar.gz: 2efa0d7a7d07ca3125237c55b4e1d34fd4835e5f9d963344f1c7b4b9405d37eb
 SHA512:
-  metadata.gz: bde94163994801bf64fd7a61014361c754f7c18be4f766eb2728d93b8ff01c83ffc1bcc0917346d10ec720d95aa3c15eae208e3ebbec56c97ca394843dc715f3
-  data.tar.gz: 3ccfcc2ae535e65a6ca0de483c5a150104f1e414f9a5679d9e0d9b63420b9416db28df6e24cf5aaeb6d2a964d70af3d3828823eb35523b4ea240fd4b3872b66c
+  metadata.gz: 054c6dca966431d180da1ff4e98afadea19400ec2ea28a2f7b4a3096ae6affdcc0082f939bb612cc3440861b4e1bd55e1b88dc03b7a93205ec19d2e3935fb5fd
+  data.tar.gz: f9ea6aacbb0993749c4e808f09c8b6bcccfa5d7f6c640fcdf83a79a7432fffd893008ccb6aed9314801f1c79446dcb82bdfc919e55c1564ca5691920a6371073

data/bake/covered/validate.rb

@@ -10,13 +10,14 @@ end
 # @parameter minumum [Float] The minimum required coverage in order to pass.
 def validate(paths: nil, minimum: 1.0)
 	paths&.each do |path|
-		Covered::Persist.new($covered.output, path).load!
+		# It would be nice to have a better algorithm here than just ignoring mtime - perhaps using checksums?
+		Covered::Persist.new($covered.output, path).load!(ignore_mtime: true)
 	end
 	
 	$covered.flush
 	
 	statistics = Covered::Statistics.new
-		
+	
 	$covered.each do |coverage|
 		statistics << coverage
 	end

data/lib/covered/persist.rb

@@ -36,14 +36,24 @@ module Covered
 			@touched = Set.new
 		end
 		
-		def apply(record)
+		def apply(record, ignore_mtime: false)
 			# The file must still exist:
 			return unless path = expand_path(record[:path])
-			return unless File.exist? path
+			
+			unless File.exist?(path)
+				Console.logger.debug(self) {"Ignoring coverage, path #{path} does not exist!"}
+				return
+			end
 			
 			# If the file has been modified since... we can't use the coverage.
 			return unless mtime = record[:mtime]
-			return if File.mtime(path).to_f > record[:mtime]
+			
+			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]}!"}
+					return
+				end
+			end
 			
 			record[:coverage].each_with_index do |count, index|
 				@output.mark(path, index, count) if count
@@ -59,20 +69,22 @@ module Covered
 			}
 		end
 		
-		def load!(path = @path)
+		def load!(**options)
 			return unless File.exist?(@path)
 			
 			# Load existing coverage information and mark all files:
 			File.open(@path, "rb") do |file|
 				file.flock(File::LOCK_SH)
 				
-				Console.logger.debug(self) {"Loading from #{@path}..."}
+				Console.logger.debug(self) {"Loading from #{@path} with #{options}..."}
 				
-				make_unpacker(file).each(&self.method(:apply))
+				make_unpacker(file).each do |record|
+					self.apply(record, **options)
+				end
 			end
 		end
 		
-		def save!(path = @path)
+		def save!
 			# Dump all coverage:
 			File.open(@path, "wb") do |file|
 				file.flock(File::LOCK_EX)

data/lib/covered/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Samuel Williams