covered 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b84eee5b7608c146ccec6a4feaf61935965cedf006c1e7ffb4b887700d2a864
-  data.tar.gz: 6f853b88a9bc70c48bacd819d5e49d8cf643079f724138aa3b9fea2994c6bc1d
+  metadata.gz: 8ab7cb43335f9a1a56aefb96ceeca0258c84462ddf5657eeaed13e8662eb74e3
+  data.tar.gz: 68de7fc8c253d5237769e4b0a41383de404c37d6923a73d508401ace75c3f64a
 SHA512:
-  metadata.gz: 516dfd68e9d8e74a76a2916edb4248d14c40f1174f801d74f21629495184123e120b83d332ae7bb895391f4f53122769d6f3a2486ebbec5ee94c0e58ffb7c643
-  data.tar.gz: 9fbc9360d7c86b0d53859c5a46a4488c92a8141abe83f97e7e0790b6becbe807c561cbb25b1e86d08689eefa96da4e0b20e2e42c8514cf44e8dc1f64f2a64d2d
+  metadata.gz: 611f47e4457cbcf2e2b8ed0e3d29c9ef66168c4358c1fd2466278ed0663a222dcef15af62a8a28a0e36d802cdfccafc20ece100a78e6a7a2247e7f45105727f9
+  data.tar.gz: c1707dbc6141f38bc2782276237de511eb1750e7d5591382c15a8dad7a2cb381c1a45d4150f505f95d1abbb1c1bd113e9ebb805f817d4ebd1d219d99d30cbd53

data/README.md

@@ -1,12 +1,12 @@
-# Covered [![Build Status](https://travis-ci.com/ioquatix/covered.svg)](hhttps://travis-ci.com/ioquatix/covered)
+# Covered [![Build Status](https://travis-ci.com/ioquatix/covered.svg)](https://travis-ci.com/ioquatix/covered)
 
-Covered uses modern Ruby features to generate comprehensive coverage, including support for templates which are compiled into Ruby. **This only works with Ruby 2.6 and it's experimental support for RubyVM::AST**
+Covered uses modern Ruby features to generate comprehensive coverage, including support for templates which are compiled into Ruby. **This only works with Ruby 2.6 and its experimental support for RubyVM::AbstractSyntaxTree**
 
 ![Screenshot](media/example.png)
 
 ## Motivation
 
-Existing Ruby coverage tools are unable to handle `eval`ed code. This is because the `coverage` module built into Ruby doesn't expose the necessary hooks to capture it. With Ruby 2.6, `RubyVM::AST.parse(source)` came in to existance, which gives us a fine grained tool for computing initial source coverage (i.e. what lines are executable), and thus making it possible to compute coverage for "templates".
+Existing Ruby coverage tools are unable to handle `eval`ed code. This is because the `coverage` module built into Ruby doesn't expose the necessary hooks to capture it. With Ruby 2.6, `RubyVM::AST.parse(source)` came into existence, which gives us a fine grained tool for computing initial source coverage (i.e. what lines are executable), and thus making it possible to compute coverage for "templates".
 
 It's still tricky to do it correctly, but it is feasible now to compute coverage of web application "views" by using this technique. This gem is an exploration to see what is possible.
 

data/covered.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 
-	spec.required_ruby_version = '~> 2.6.a'
+	spec.required_ruby_version = '~> 2.6.0.rc1'
 
 	spec.add_dependency "rainbow"
 	
 	spec.add_development_dependency "trenni", "~> 3.6"
 	
-	spec.add_development_dependency "bundler", "~> 1.16"
+	spec.add_development_dependency "bundler", "~> 2.0"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/covered/source.rb

@@ -26,14 +26,14 @@ require 'thread'
 module Covered
 	# The source map, loads the source file, parses the AST to generate which lines contain executable code.
 	class Source < Wrapper
-		EXECUTABLE = /NODE_(.?CALL|.VAR|.ASGN|DEFN)/.freeze
+		EXECUTABLE = /(.?CALL|.VAR|.ASGN|DEFN)/.freeze
 		
 		# Deviate from the standard policy above, because all the files are already loaded, so we skip NODE_FCALL.
-		DOGFOOD = /NODE_([V]?CALL|.VAR|.ASGN|DEFN)/.freeze
+		DOGFOOD = /([V]?CALL|.VAR|.ASGN|DEFN)/.freeze
 		
 		# Ruby trace points don't trigger for argument execution.
 		# Constants are loaded when the file loads, so they are less interesting.
-		IGNORE = /NODE_(ARGS|CDECL)/.freeze
+		IGNORE = /(ARGS|CDECL)/.freeze
 		
 		def initialize(output, executable: EXECUTABLE, ignore: IGNORE)
 			super(output)
@@ -69,12 +69,12 @@ module Covered
 		end
 		
 		def executable?(node)
-			node.type =~ @executable
+			node.type.to_s =~ @executable
 		end
 		
 		def ignore?(node)
 			# NODE_ARGS Ruby doesn't report execution of arguments in :line tracepoint.
-			node.type =~ @ignore
+			node.nil? or node.type.to_s =~ @ignore
 		end
 		
 		def expand(node, counts)
@@ -82,8 +82,11 @@ module Covered
 			
 			counts[node.first_lineno] ||= 0 if executable?(node)
 			
+			# puts "#{node.inspect} #{node.to_s} -> #{node.children.inspect}"
 			node.children.each do |child|
-				next if child.nil? or ignore?(child)
+				next unless child.is_a? RubyVM::AbstractSyntaxTree::Node
+				
+				next if ignore?(child)
 				
 				expand(child, counts)
 			end
@@ -93,9 +96,9 @@ module Covered
 			# puts "Parse #{path}"
 			
 			if source = @paths[path]
-				RubyVM::AST.parse(source)
+				RubyVM::AbstractSyntaxTree.parse(source)
 			elsif File.exist?(path)
-				RubyVM::AST.parse_file(path)
+				RubyVM::AbstractSyntaxTree.parse_file(path)
 			else
 				warn "Couldn't parse #{path}, file doesn't exist?"
 			end

data/lib/covered/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.6.a
+      version: 2.6.0.rc1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A modern approach to code coverage.