covered 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff6650fc286675cf539c997a67b002a7375b5d471556415746c33694f31ac55
-  data.tar.gz: 36aeabb31c74c4a268610e71f5c0bfd0c8ac811e51148c4b6497527268eb77a6
+  metadata.gz: 42eca672ae3b6b6589c0022ce5de6b610134c9eb3cf9e4edf3b1fb530e6101ab
+  data.tar.gz: 558c12dade107d324740f9dfdcc59c125ca0c847779f502f4901c9fb202de72a
 SHA512:
-  metadata.gz: 7f35c3702309e5673b6f5763686186c02ecf40a080403ddafc82e791ac55babad0bffe677b72a89b9051b5d29d1220950ec282a66f6354fde65f50980b1c5f8f
-  data.tar.gz: a5a5b7e6baf404aac6a0158555656a0759ed2f03aa15730f830ef47a9cc92d73bb63ae4a69bf5c93c64d783b004fbad5d72b4ae40490da7de791de8b87af4cd1
+  metadata.gz: c1fafd5d915b3e1c3e9f43b568e4564eab02a5049ab65b667bdd39a1ed25294c2a1ddb7d1e424e6b6433ff0d1163d5687a30b731fe6a614bfcb2f40cd25f2c34
+  data.tar.gz: df90259692dfa61889afce1eda933fed4d37c3974dcc9675bcfa0f91e6dac0fba8c0b87fd7ee1b667157c409e4f058dfde6c8dff1d5f1aecd34826477495b80a

data/covered.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "rainbow"
 	spec.add_dependency "parser"
+	spec.add_dependency "msgpack"
 	
 	spec.add_dependency "async-rest"
 	

data/lib/covered/files.rb

@@ -19,13 +19,14 @@
 # THE SOFTWARE.
 
 require_relative 'coverage'
+require_relative 'wrapper'
 
 require 'set'
 
 module Covered
-	class Files < Wrapper
-		def initialize(output = nil)
-			super(output)
+	class Files < Base
+		def initialize(*)
+			super
 			
 			@paths = {}
 		end
@@ -88,26 +89,6 @@ module Covered
 		end
 	end
 	
-	class Filter < Wrapper
-		def accept?(path)
-			true
-		end
-		
-		def mark(path, lineno, value)
-			super if accept?(path)
-		end
-		
-		def each(&block)
-			super do |coverage|
-				if accept?(coverage.path)
-					yield coverage
-				else
-					puts "Skipping #{coverage.path} #{self.class}"
-				end
-			end
-		end
-	end
-	
 	class Skip < Filter
 		def initialize(output, pattern)
 			super(output)
@@ -119,11 +100,11 @@ module Covered
 		
 		if Regexp.instance_methods.include? :match?
 			# This is better as it doesn't allocate a MatchData instance which is essentially useless.
-			def accept? path
+			def match? path
 				!@pattern.match?(path)
 			end
 		else
-			def accept? path
+			def match? path
 				!(@pattern =~ path)
 			end
 		end
@@ -138,7 +119,7 @@ module Covered
 		
 		attr :pattern
 		
-		def accept?(path)
+		def match?(path)
 			@pattern === path
 		end
 	end
@@ -164,7 +145,7 @@ module Covered
 			end
 		end
 		
-		def accept?(path)
+		def match?(path)
 			path.start_with?(@path)
 		end
 	end

data/lib/covered/persist.rb

@@ -0,0 +1,134 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'wrapper'
+
+require 'msgpack'
+require 'time'
+require 'set'
+
+module Covered
+	class Persist < Wrapper
+		def initialize(output, path = ".covered.msgpack")
+			super(output)
+			
+			@path = path
+			
+			@touched = Set.new
+		end
+		
+		def apply(record)
+			# The file must still exist:
+			return unless path = expand_path(record[:path])
+			return unless File.exist? path
+			
+			# 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]
+			
+			record[:coverage].each_with_index do |count, index|
+				@output.mark(path, index, count) if count
+			end
+		end
+		
+		def serialize(coverage)
+			{
+				# 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,
+			}
+		end
+		
+		def load!(path = @path)
+			return unless File.exist?(@path)
+			
+			# Load existing coverage information and mark all files:
+			File.open(@path, "r") do |file|
+				file.flock(File::LOCK_SH)
+				
+				make_unpacker(file).each(&self.method(:apply))
+			end
+		end
+		
+		def save!(path = @path)
+			# Dump all coverage:
+			File.open(@path, "w") do |file|
+				file.flock(File::LOCK_EX)
+				
+				packer = make_packer(file)
+				
+				self.each do |coverage|
+					packer.write(serialize(coverage))
+				end
+				
+				packer.flush
+			end
+		end
+		
+		def mark(file, line, count)
+			@touched << file
+		
+			super
+		end
+		
+		def enable
+			super
+			
+			load!
+		end
+		
+		def disable
+			super
+			
+			# @touched.each do |path|
+			# 	if @output.accept?(path)
+			# 		puts "Updated #{path} coverage."
+			# 	end
+			# end
+			
+			save!
+		end
+		
+		# def each
+		# 	super do |coverage|
+		# 		if @touched.include?(coverage.path)
+		# 			yield coverage
+		# 		end
+		# 	end
+		# end
+		
+		def make_packer(io)
+			packer = MessagePack::Packer.new(io)
+			packer.register_type(0x00, Symbol, :to_msgpack_ext)
+			packer.register_type(0x01, Time) {|object| object.to_s}
+			
+			return packer
+		end
+		
+		def make_unpacker(io)
+			unpacker = MessagePack::Unpacker.new(io)
+			unpacker.register_type(0x00, Symbol, :from_msgpack_ext)
+			unpacker.register_type(0x01, Time, :parse)
+			
+			return unpacker
+		end
+	end
+end

data/lib/covered/policy/default.rb

@@ -30,6 +30,8 @@ $covered = Covered.policy do
 	# We will include all files under lib, even if they aren't loaded:
 	include "lib/**/*.rb"
 	
+	persist!
+	
 	source
 	
 	reports!

data/lib/covered/policy.rb

@@ -22,6 +22,7 @@ require_relative "summary"
 require_relative "files"
 require_relative "source"
 require_relative "capture"
+require_relative "persist"
 
 module Covered
 	def self.policy(&block)
@@ -74,6 +75,10 @@ module Covered
 			@output = Cache.new(@output)
 		end
 		
+		def persist!
+			@output = Persist.new(@output)
+		end
+		
 		def capture
 			@capture ||= Capture.new(@output)
 		end

data/lib/covered/version.rb

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

data/lib/covered/wrapper.rb

@@ -19,50 +19,95 @@
 # THE SOFTWARE.
 
 module Covered
-	class Wrapper
-		include Enumerable
+	class Base
+		def enable
+		end
+		
+		def disable
+		end
+		
+		def accept?(path)
+			true
+		end
+		
+		def mark(path, lineno, value)
+		end
 		
-		def initialize(output = nil)
+		def each
+		end
+		
+		def relative_path(path)
+			path
+		end
+		
+		def expand_path(path)
+			path
+		end
+	end
+	
+	class Wrapper < Base
+		def initialize(output = Base.new)
 			@output = output
 		end
 		
 		attr :output
 		
 		def mark(path, lineno, value)
-			@output.mark(path, lineno, value) if @output
+			@output.mark(path, lineno, value)
 		end
 		
 		def enable
-			@output.enable if @output
+			@output.enable
 		end
 		
 		def disable
-			@output.disable if @output
+			@output.disable
+		end
+		
+		def accept?(path)
+			@output.accept?(path)
+		end
+		
+		def mark(path, lineno, value)
+			@output.mark(path, lineno, value)
 		end
 		
 		# @yield [Coverage] the path to the file, and the execution counts.
 		def each(&block)
-			@output.each(&block) if @output
+			@output.each(&block)
 		end
 		
 		def relative_path(path)
-			if @output
-				@output.relative_path(path)
-			else
-				path
-			end
+			@output.relative_path(path)
 		end
 		
 		def expand_path(path)
-			if @output
-				@output.expand_path(path)
-			else
-				path
-			end
+			@output.expand_path(path)
 		end
 		
 		def to_h
-			collect{|coverage| [coverage.path, coverage]}.to_h
+			@output.to_enum(:each).collect{|coverage| [coverage.path, coverage]}.to_h
+		end
+	end
+	
+	class Filter < Wrapper
+		def mark(path, lineno, value)
+			@output.mark(path, lineno, value) if accept?(path)
+		end
+		
+		# @yield [Coverage] the path to the file, and the execution counts.
+		def each(&block)
+			@output.each do |coverage|
+				yield coverage if accept?(coverage.path)
+			end
+		end
+		
+		def accept?(path)
+			match?(path) and super
+		end
+		
+		def match?(path)
+			true
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  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: async-rest
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,7 @@ files:
 - lib/covered/eval.rb
 - lib/covered/files.rb
 - lib/covered/minitest.rb
+- lib/covered/persist.rb
 - lib/covered/policy.rb
 - lib/covered/policy/default.rb
 - lib/covered/rspec.rb