covered 0.14.1 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65050cba58d4c4af27b6361adb1e398d7cc17190f5cd9f437b75ebe551fd47d9
-  data.tar.gz: 9e27906a329ce6748ef8023ba4ef7e14747ca612516052396369cd23798ae2be
+  metadata.gz: 8b53c13ab215d5a93f7a092321dc70b8538909a76da3e841b8ce6c2f8a7fcdc3
+  data.tar.gz: 6f01972bf2729eb4549612acfe8dc7ad37bb8aaf927460257ae4a060cee8e001
 SHA512:
-  metadata.gz: f2e15acaf1a9ccf76fca83a1fe9c2b0d5189b32ce60e9b2583b0f87a5c8296575f1669d96b9dddffaf9e9cc7d5ebd2192f675665c6f55ef73176eeb50bf2251d
-  data.tar.gz: 64e9dff68ef4a4efee7e903aff00ce60358a3c15853e487009c56828bffa1f510a2d0dd762b08973fc58ccccb948179aa5787badd4ffed07a094d1ccaaf5a721
+  metadata.gz: bde94163994801bf64fd7a61014361c754f7c18be4f766eb2728d93b8ff01c83ffc1bcc0917346d10ec720d95aa3c15eae208e3ebbec56c97ca394843dc715f3
+  data.tar.gz: 3ccfcc2ae535e65a6ca0de483c5a150104f1e414f9a5679d9e0d9b63420b9416db28df6e24cf5aaeb6d2a964d70af3d3828823eb35523b4ea240fd4b3872b66c

data/bake/covered/validate.rb

@@ -0,0 +1,25 @@
+
+def initialize(context)
+	super
+	
+	require_relative '../../lib/covered/policy/default'
+end
+
+# Validate the coverage of multiple test runs.
+# @parameter paths [Array(String)] The coverage database paths.
+# @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!
+	end
+	
+	$covered.flush
+	
+	statistics = Covered::Statistics.new
+		
+	$covered.each do |coverage|
+		statistics << coverage
+	end
+	
+	statistics.validate!(minimum)
+end

data/lib/covered/cache.rb

@@ -0,0 +1,65 @@
+# 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 'coverage'
+
+module Covered
+	class Cache < Wrapper
+		def initialize(output)
+			super(output)
+			
+			@marks = nil
+		end
+		
+		def mark(path, lineno, count = 1)
+			if @marks
+				@marks << path << lineno << count
+			else
+				super
+			end
+		end
+		
+		def enable
+			@marks = []
+			
+			super
+		end
+		
+		def flush
+			if @marks
+				@marks.each_slice(3) do |path, lineno, count|
+					@output.mark(path, lineno, count)
+				end
+				
+				@marks = nil
+			end
+			
+			super
+		end
+		
+		def disable
+			super
+			
+			flush
+		end
+	end
+end

data/lib/covered/capture.rb

@@ -31,9 +31,12 @@ module Covered
 				@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:
-						location = caller_locations(2, 1).first
-						@output.mark(location.path, location.lineno, 1)
-					elsif path = trace.path
+						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
@@ -56,35 +59,6 @@ module Covered
 		end
 	end
 	
-	class Cache < Wrapper
-		def initialize(output)
-			super(output)
-			@marks = []
-		end
-		
-		def mark(path, lineno, count = 1)
-			@marks << path << lineno << count
-		end
-		
-		def enable
-			super
-		end
-		
-		def flush
-			@marks.each_slice(3) do |path, lineno, count|
-				@output.mark(path, lineno, count)
-			end
-			
-			@marks.clear
-		end
-		
-		def disable
-			super
-			
-			flush
-		end
-	end
-	
 	# class Capture < Wrapper
 	# 	def enable
 	# 		super

data/lib/covered/persist.rb

@@ -23,6 +23,7 @@ require_relative 'wrapper'
 require 'msgpack'
 require 'time'
 require 'set'
+require 'console'
 
 module Covered
 	class Persist < Wrapper
@@ -32,7 +33,6 @@ module Covered
 			super(output)
 			
 			@path = path
-			
 			@touched = Set.new
 		end
 		
@@ -66,6 +66,8 @@ module Covered
 			File.open(@path, "rb") do |file|
 				file.flock(File::LOCK_SH)
 				
+				Console.logger.debug(self) {"Loading from #{@path}..."}
+				
 				make_unpacker(file).each(&self.method(:apply))
 			end
 		end
@@ -75,6 +77,8 @@ 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|
@@ -87,7 +91,7 @@ module Covered
 		
 		def mark(file, line, count)
 			@touched << file
-		
+			
 			super
 		end
 		
@@ -97,6 +101,12 @@ module Covered
 			load!
 		end
 		
+		def flush
+			load!
+			
+			super
+		end
+		
 		def disable
 			super
 			

data/lib/covered/policy/default.rb

@@ -20,21 +20,25 @@
 
 require_relative '../policy'
 
-$covered = Covered.policy do
-	cache!
-	
-	# Only files in the root would be tracked:
-	root(Dir.pwd)
-	
-	# We will ignore any files in the test or spec directory:
-	skip(/^.*\/(test|spec|vendor)\//)
-	
-	# We will include all files under lib, even if they aren't loaded:
-	include("lib/**/*.rb")
-	
-	persist!
-	
-	source
-	
-	reports!
+if File.exist?("config/coverage.rb")
+	load("config/coverage.rb")
+else
+	$covered = Covered.policy do
+		cache!
+		
+		# Only files in the root would be tracked:
+		root(Dir.pwd)
+		
+		# We will ignore any files in the test or spec directory:
+		skip(/^.*\/(test|spec|vendor)\//)
+		
+		# We will include all files under lib, even if they aren't loaded:
+		include("lib/**/*.rb")
+		
+		persist!
+		
+		source
+		
+		reports!
+	end
 end

data/lib/covered/policy.rb

@@ -22,6 +22,7 @@ require_relative "summary"
 require_relative "files"
 require_relative "source"
 require_relative "capture"
+require_relative "cache"
 require_relative "persist"
 
 module Covered
@@ -42,6 +43,8 @@ module Covered
 			@reports = []
 		end
 		
+		attr :output
+		
 		def freeze
 			return self if frozen?
 			
@@ -91,6 +94,10 @@ module Covered
 			capture.disable
 		end
 		
+		def flush
+			@output.flush
+		end
+		
 		attr :reports
 		
 		class Autoload

data/lib/covered/source.rb

@@ -69,7 +69,7 @@ module Covered
 		attr :paths
 		
 		def executable?(node)
-			node.type == :send
+			node.type == :send || node.type == :yield
 		end
 		
 		def ignore?(node)

data/lib/covered/statistics.rb

@@ -22,6 +22,9 @@ require_relative 'wrapper'
 require_relative 'coverage'
 
 module Covered
+	class CoverageError < StandardError
+	end
+	
 	class Statistics < Wrapper
 		def initialize
 			@count = 0
@@ -51,5 +54,11 @@ module Covered
 			
 			# Could output funny message here, especially for 100% coverage.
 		end
+		
+		def validate!(minimum = 1.0)
+			if self.ratio < minimum
+				raise CoverageError, "Coverage of #{self.percentage.to_f.round(2)}% is less than required minimum of #{(minimum * 100.0).round(2)}%!"
+			end
+		end
 	end
 end

data/lib/covered/version.rb

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

data/lib/covered/wrapper.rb

@@ -26,6 +26,9 @@ module Covered
 		def disable
 		end
 		
+		def flush
+		end
+		
 		def accept?(path)
 			true
 		end
@@ -60,6 +63,10 @@ module Covered
 			@output.disable
 		end
 		
+		def flush
+			@output.flush
+		end
+		
 		def accept?(path)
 			@output.accept?(path)
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -39,7 +39,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -159,18 +159,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/development.yml"
-- ".github/workflows/documentation.yml"
-- examples/coverage/.DS_Store
-- examples/coverage/covered.rb
-- examples/coverage/erb/.covered.db
-- examples/coverage/erb/coverage.rb
-- examples/coverage/erb/template.erb
-- examples/coverage/parser.rb
-- examples/coverage/simplecov.rb
-- examples/coverage/test.rb
-- examples/coverage/tracepoint.rb
+- bake/covered/validate.rb
 - lib/covered.rb
+- lib/covered/cache.rb
 - lib/covered/capture.rb
 - lib/covered/coverage.rb
 - lib/covered/coveralls.rb
@@ -186,8 +177,6 @@ files:
 - lib/covered/summary.rb
 - lib/covered/version.rb
 - lib/covered/wrapper.rb
-- media/.DS_Store
-- media/example.png
 homepage: https://github.com/ioquatix/covered
 licenses:
 - MIT
@@ -208,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A modern approach to code coverage.

data/.github/workflows/development.yml

@@ -1,45 +0,0 @@
-name: Development
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    name: ${{matrix.ruby}} on ${{matrix.os}}
-    runs-on: ${{matrix.os}}-latest
-    continue-on-error: ${{matrix.experimental}}
-    
-    strategy:
-      matrix:
-        os:
-          - ubuntu
-          - macos
-        
-        ruby:
-          - "2.6"
-          - "2.7"
-          - "3.0"
-        
-        experimental: [false]
-        env: [""]
-        
-        include:
-          - os: ubuntu
-            ruby: truffleruby
-            experimental: true
-          - os: ubuntu
-            ruby: jruby
-            experimental: true
-          - os: ubuntu
-            ruby: head
-            experimental: true
-    
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{matrix.ruby}}
-        bundler-cache: true
-    
-    - name: Run tests
-      timeout-minutes: 5
-      run: ${{matrix.env}} bundle exec rspec

data/.github/workflows/documentation.yml

@@ -1,34 +0,0 @@
-name: Documentation
-
-on:
-  push:
-    branches:
-      - main
-
-env:
-  BUNDLE_WITH: maintenance
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.1
-        bundler-cache: true
-    
-    - name: Installing packages
-      run: sudo apt-get install wget
-    
-    - name: Prepare GitHub Pages
-      run: bundle exec bake github:pages:prepare --directory docs
-    
-    - name: Generate documentation
-      timeout-minutes: 5
-      run: bundle exec bake utopia:project:static --force no
-    
-    - name: Deploy GitHub Pages
-      run: bundle exec bake github:pages:commit --directory docs

data/examples/coverage/covered.rb

@@ -1,11 +0,0 @@
-
-ENV['COVERAGE'] ||= 'PartialSummary'
-require 'covered/policy/default'
-
-$covered.enable
-
-require_relative 'test'
-
-$covered.disable
-
-$covered.call($stdout)

data/examples/coverage/erb/coverage.rb

@@ -1,21 +0,0 @@
-
-require 'erb'
-$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)
-
-template_path = File.expand_path("template.erb", __dir__)
-
-ENV['COVERAGE'] ||= 'PartialSummary'
-require 'covered/policy/default'
-
-$covered.enable
-
-template = ERB.new(File.read(template_path)).tap do |template|
-	template.filename = template_path
-end
-
-@items = ["Cats", "Dogs", "Chickens"]
-puts template.result(binding)
-
-$covered.disable
-
-$covered.call($stdout)

data/examples/coverage/erb/template.erb

@@ -1,7 +0,0 @@
-<% for @item in @items %>
-	<%= @item %>
-<% end %>
-
-<% if 1 == 2 %>
-	Math is broken.
-<% end %>

data/examples/coverage/parser.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pry'
-require 'parser/current'
-
-ast = Parser::CurrentRuby.parse_file('test.rb')
-# ast.location.expression.source
-
-def print_methods(ast)
-	if ast.is_a? Parser::AST::Node
-		if ast.type == :send
-			puts "Calling #{ast.children[1]} on #{ast.location.line}"
-		end
-		
-		ast.children.each do |child|
-			print_methods(child)
-		end
-	end
-end
-
-print_methods(ast)
-
-binding.pry

data/examples/coverage/simplecov.rb

@@ -1,7 +0,0 @@
-
-require 'simplecov'
-
-SimpleCov.command_name 'Example'
-SimpleCov.start
-
-require_relative 'test'

data/examples/coverage/test.rb

@@ -1,16 +0,0 @@
-trace_point = TracePoint.new(:call, :return, :line, :c_call, :c_return, :b_call, :b_return) do |trace|
-	puts [trace.path, trace.lineno].join(":")
-end
-
-trace_point.enable
-
-values = {foo: 10}
-
-def shell_escape(x)
-	x
-end
-
-values.map{|key, value| [
-	key.to_s.upcase,
-	shell_escape(value) # TracePoint is never triggered for this line.
-]}

data/examples/coverage/tracepoint.rb

@@ -1,8 +0,0 @@
-
-trace_point = TracePoint.new(:call, :return, :line, :c_call, :c_return, :b_call, :b_return) do |trace|
-	puts [trace.path, trace.lineno].join(":")
-end
-
-trace_point.enable
-
-require_relative 'test'