covered 0.15.2 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 112c85633150c4f05435b29a2867a51a711a9f216fdbe850c0356b0371ab4e49
-  data.tar.gz: 2efa0d7a7d07ca3125237c55b4e1d34fd4835e5f9d963344f1c7b4b9405d37eb
+  metadata.gz: b81262b921d5bf71ca05d985d28c806967de336642687e6541507ac55f9eb5ce
+  data.tar.gz: 4afab1fb523ee9403e6a70c9fc84cb301152f32a8c273367fac79c994cd5e7b8
 SHA512:
-  metadata.gz: 054c6dca966431d180da1ff4e98afadea19400ec2ea28a2f7b4a3096ae6affdcc0082f939bb612cc3440861b4e1bd55e1b88dc03b7a93205ec19d2e3935fb5fd
-  data.tar.gz: f9ea6aacbb0993749c4e808f09c8b6bcccfa5d7f6c640fcdf83a79a7432fffd893008ccb6aed9314801f1c79446dcb82bdfc919e55c1564ca5691920a6371073
+  metadata.gz: a59901d7eaca8f7494879453b9df6e024ebe97fa039d5be732edc51c8f9acd258db76a2bc35f4b4a500d69bab68a184da3b70c63a375c5f2f7670c8aeb0e8f15
+  data.tar.gz: 2092189dd748a544104b63597018b31913b1ec4bbea477a2907cdd01fb8dfcd5dbe842b5d341d58601e9fba62e5a2e2e2077fec572a5375dc98343ca8b6758d6

data/bake/covered/validate.rb

@@ -22,5 +22,7 @@ def validate(paths: nil, minimum: 1.0)
 		statistics << coverage
 	end
 	
+	statistics.print($stderr)
+	
 	statistics.validate!(minimum)
 end

data/lib/covered/cache.rb

@@ -32,7 +32,7 @@ module Covered
 		
 		def mark(path, lineno, count = 1)
 			if @marks
-				@marks << path << lineno << count
+				@marks.push(path, lineno, count)
 			else
 				super
 			end

data/lib/covered/config.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+# Copyright, 2022, 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 'policy'
+
+module Covered
+	class Config
+		PATH = "config/covered.rb"
+		
+		def self.path(root)
+			path = ::File.join(root, PATH)
+			
+			if ::File.exist?(path)
+				return path
+			end
+		end
+		
+		def self.load(root: Dir.pwd, coverage: ENV['COVERAGE'])
+			return nil unless coverage
+			
+			derived = Class.new(self)
+			
+			if path = self.path(root)
+				config = Module.new
+				config.module_eval(::File.read(path), path)
+				derived.prepend(config)
+			end
+			
+			return derived.new(root, coverage)
+		end
+		
+		def initialize(root, coverage)
+			@root = root
+			@coverage = coverage
+			@policy = nil
+		end
+		
+		def policy
+			@policy ||= Policy.new.tap{|policy| make_policy(policy)}.freeze
+		end
+		
+		def enable
+			policy.enable
+		end
+		
+		def disable
+			policy.disable
+		end
+		
+		def flush
+			policy.flush
+		end
+		
+		def call(output)
+			policy.call(output)
+		end
+		
+		# Override this method to implement your own policy.
+		def make_policy(policy)
+			policy.cache!
+			
+			# Only files in the root would be tracked:
+			policy.root(@root)
+			
+			# We will ignore any files in the test or spec directory:
+			policy.skip(/^.*\/(test|spec|vendor|config)\//)
+			
+			# We will include all files under lib, even if they aren't loaded:
+			policy.include("lib/**/*.rb")
+			
+			policy.persist!
+			
+			policy.source
+			
+			policy.reports!(@coverage)
+		end
+	end
+end

data/lib/covered/minitest.rb

@@ -19,10 +19,11 @@
 # THE SOFTWARE.
 
 require_relative 'policy'
-require_relative 'policy/default'
 
 require 'minitest'
 
+$covered = Covered::Config.load
+
 module Covered
 	module Minitest
 		def run(*)
@@ -33,7 +34,7 @@ module Covered
 	end
 end
 
-if ENV['COVERAGE']
+if $covered
 	class << Minitest
 		prepend Covered::Minitest
 	end

data/lib/covered/policy.rb

@@ -26,16 +26,6 @@ require_relative "cache"
 require_relative "persist"
 
 module Covered
-	def self.policy(&block)
-		policy = Policy.new
-		
-		policy.instance_eval(&block)
-		
-		policy.freeze
-		
-		return policy
-	end
-	
 	class Policy < Wrapper
 		def initialize
 			super(Files.new)
@@ -132,7 +122,7 @@ module Covered
 			end
 		end
 		
-		def reports!(coverage = ENV['COVERAGE'])
+		def reports!(coverage)
 			if coverage
 				names = coverage.split(',')
 				

data/lib/covered/rspec.rb

@@ -18,11 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'policy'
-require_relative 'policy/default'
+require_relative 'config'
 
 require 'rspec/core/formatters'
 
+$covered = Covered::Config.load
+
 module Covered
 	module RSpec
 		class Formatter
@@ -56,7 +57,7 @@ module Covered
 	end
 end
 
-if ENV['COVERAGE']
+if $covered
 	RSpec::Core::Configuration.prepend(Covered::RSpec::Policy)
 
 	RSpec.configure do |config|

data/lib/covered/source.rb

@@ -68,8 +68,17 @@ module Covered
 		
 		attr :paths
 		
+		EXECUTABLE = {
+			send: true,
+			yield: true,
+			return: true,
+			lvar: true,
+			ivar: true,
+			def: true
+		}
+		
 		def executable?(node)
-			node.type == :send || node.type == :yield
+			EXECUTABLE[node.type]
 		end
 		
 		def ignore?(node)

data/lib/covered/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -39,7 +39,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -163,6 +163,7 @@ files:
 - lib/covered.rb
 - lib/covered/cache.rb
 - lib/covered/capture.rb
+- lib/covered/config.rb
 - lib/covered/coverage.rb
 - lib/covered/coveralls.rb
 - lib/covered/files.rb
@@ -170,7 +171,6 @@ files:
 - lib/covered/minitest.rb
 - lib/covered/persist.rb
 - lib/covered/policy.rb
-- lib/covered/policy/default.rb
 - lib/covered/rspec.rb
 - lib/covered/source.rb
 - lib/covered/statistics.rb

data/lib/covered/policy/default.rb

@@ -1,44 +0,0 @@
-# Copyright, 2019, 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 '../policy'
-
-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