covered 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7debea47cf0febb50f3f84e0f081011000920a6e2946b500034321a4f854054
-  data.tar.gz: c4dec696971409a1b58ba3b1f6b6d07f7af8f1c121def0d764ee4ccad7a0487b
+  metadata.gz: 65050cba58d4c4af27b6361adb1e398d7cc17190f5cd9f437b75ebe551fd47d9
+  data.tar.gz: 9e27906a329ce6748ef8023ba4ef7e14747ca612516052396369cd23798ae2be
 SHA512:
-  metadata.gz: 491d65f3c87087ced3a3767ec14e3e82fddc99d539fd249ec9615f31386b13f97061f9befc97cc5ab700793a42205ae71d212711f7e9472864a392b41970da00
-  data.tar.gz: 48b62e8ff991ae8046aca2a70508a677497748fbd6d6665e09ce9e42055a9ccf42c8212461dad7556014e1a3c8328fbeaf2049259dce670e54a33a34dccf45d3
+  metadata.gz: f2e15acaf1a9ccf76fca83a1fe9c2b0d5189b32ce60e9b2583b0f87a5c8296575f1669d96b9dddffaf9e9cc7d5ebd2192f675665c6f55ef73176eeb50bf2251d
+  data.tar.gz: 64e9dff68ef4a4efee7e903aff00ce60358a3c15853e487009c56828bffa1f510a2d0dd762b08973fc58ccccb948179aa5787badd4ffed07a094d1ccaaf5a721

data/.github/workflows/documentation.yml

@@ -5,28 +5,30 @@ on:
     branches:
       - main
 
+env:
+  BUNDLE_WITH: maintenance
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
     
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
     - uses: ruby/setup-ruby@v1
-      env:
-        BUNDLE_WITH: maintenance
       with:
-        ruby-version: 3.0
+        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
+      run: bundle exec bake utopia:project:static --force no
     
-    - name: Deploy documentation
-      uses: JamesIves/github-pages-deploy-action@4.0.0
-      with:
-        branch: docs
-        folder: docs
+    - name: Deploy GitHub Pages
+      run: bundle exec bake github:pages:commit --directory docs

data/lib/covered/capture.rb

@@ -28,9 +28,13 @@ module Covered
 			super(output)
 			
 			begin
-				@trace = TracePoint.new(:line, :call, :c_call) do |event|
-					if path = event.path
-						@output.mark(path, event.lineno, 1)
+				@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
+						@output.mark(path, trace.lineno, 1)
 					end
 				end
 			rescue

data/lib/covered/persist.rb

@@ -63,7 +63,7 @@ module Covered
 			return unless File.exist?(@path)
 			
 			# Load existing coverage information and mark all files:
-			File.open(@path, "r") do |file|
+			File.open(@path, "rb") do |file|
 				file.flock(File::LOCK_SH)
 				
 				make_unpacker(file).each(&self.method(:apply))
@@ -72,7 +72,7 @@ module Covered
 		
 		def save!(path = @path)
 			# Dump all coverage:
-			File.open(@path, "w") do |file|
+			File.open(@path, "wb") do |file|
 				file.flock(File::LOCK_EX)
 				
 				packer = make_packer(file)

data/lib/covered/source.rb

@@ -35,10 +35,16 @@ module Covered
 			@annotations = {}
 			
 			begin
-				@trace = TracePoint.new(:script_compiled) do |event|
-					if path = event.instruction_sequence.path and source = event.eval_script
-						@mutex.synchronize do
-							@paths[path] = source
+				@trace = TracePoint.new(:script_compiled) do |trace|
+					instruction_sequence = trace.instruction_sequence
+
+					# 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] = source
+							end
 						end
 					end
 				end
@@ -73,13 +79,17 @@ module Covered
 		def expand(node, coverage, level = 0)
 			if node.is_a? Parser::AST::Node
 				if ignore?(node)
-					coverage.annotate(node.location.line, "ignoring #{node.type}")
+					# coverage.annotate(node.location.line, "ignoring #{node.type}")
 				else
 					if executable?(node)
-						# coverage.annotate(node.first_lineno, "executable #{node.type}")
+						# coverage.annotate(node.location.line, "executable #{node.type}")
 						coverage.counts[node.location.line] ||= 0
-					else
-						# coverage.annotate(node.first_lineno, "not executable #{node.type}")
+					elsif node.location
+						# coverage.annotate(node.location.line, "not executable #{node.type}") rescue nil
+					end
+					
+					if node.type == :send
+						# coverage.annotate(node.location.line, "ignoring #{node.type} children")
 					end
 					
 					expand(node.children, coverage, level + 1)

data/lib/covered/version.rb

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

metadata

@@ -1,10 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Samuel Williams
+- Cyril Roelandt
+- Shannon Skipper
+- chocolateboy
 autorequire:
 bindir: bin
 cert_chain:
@@ -36,7 +39,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -70,16 +73,16 @@ dependencies:
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -110,32 +113,18 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +161,7 @@ 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
@@ -196,6 +186,7 @@ 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: