covered 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b72bc8a2cb3795c9b240f61f4d65f2d147f4c9ce63115200b6900c0c176f4a7
-  data.tar.gz: 1e450d66f9dff150c7538a4e29586bb6dc10a3983ad11d7cf4ea0dcd625045aa
+  metadata.gz: 207e7d403aa0d5e2e726aea8b87afd7632e951b874d5fea251af9dc8e979b064
+  data.tar.gz: 0e3a010f8cade8119c2b8bfd55556a984208b99cb7b529181f537de3ddf351df
 SHA512:
-  metadata.gz: 0fb3b30a00cb9b69e7400ba155576aa2cea483b1a9324f2b3b90201ad54ed742006a11843cff57b5e5d9e641793719ccb5f97206355f5d73e03b47af581b1565
-  data.tar.gz: a315a3cd4553e4468283317fe2745746e359bcde354469783f6a0686c0befb97c16f32a9620591d03569d0dbd6d38f5f140052f0c80294c794ced806539aa354
+  metadata.gz: 371e5d865b5cc02ffc87f3b457e1b8243d24a56965022482a3fb9c86d7a2a1485ba899b72e012132cd274699a247d19f9d477b71780fd378d11fb52431009690
+  data.tar.gz: fb7be0ffc88ddbe8ad9d5fd2e8bfb09efff89f1d91edef63e4b5d52e6f17b3d1881d5cb0ae0563bffa4e8c221c7bfadaf9bdbb1bc208480290ad860bd0ff74e5

data/covered.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "rainbow"
+	spec.add_dependency "event", "~> 1.5"
 	spec.add_dependency "parser"
 	spec.add_dependency "msgpack"
 	

data/lib/covered/summary.rb

@@ -21,7 +21,7 @@
 require_relative 'statistics'
 require_relative 'wrapper'
 
-require 'rainbow'
+require 'event/terminal'
 
 module Covered
 	class Summary
@@ -29,6 +29,24 @@ module Covered
 			@threshold = threshold
 		end
 		
+		def terminal(output)
+			Event::Terminal.for(output).tap do |terminal|
+				terminal[:path] ||= terminal.style(nil, nil, :bold, :underline)
+				terminal[:brief_path] ||= terminal.style(:yellow)
+				
+				terminal[:uncovered_prefix] ||= terminal.style(:red)
+				terminal[:covered_prefix] ||= terminal.style(:green)
+				terminal[:ignored_prefix] ||= terminal.style(nil, nil, :faint)
+				terminal[:header_prefix] ||= terminal.style(nil, nil, :faint)
+				
+				terminal[:uncovered_code] ||= terminal.style(:red)
+				terminal[:covered_code] ||= terminal.style(:green)
+				terminal[:ignored_code] ||= terminal.style(nil, nil, :faint)
+				
+				terminal[:annotations] ||= terminal.style(:blue)
+			end
+		end
+		
 		def each(wrapper)
 			statistics = Statistics.new
 			
@@ -43,49 +61,64 @@ module Covered
 			return statistics
 		end
 		
-		def print_annotations(output, coverage, line, line_offset)
+		def print_annotations(terminal, coverage, line, line_offset)
 			if annotations = coverage.annotations[line_offset]
-				output.write("#{line_offset}|".rjust(8))
-				output.write("*|".rjust(8))
+				prefix = "#{line_offset}|".rjust(8) + "*|".rjust(8)
+				terminal.write prefix, style: :ignored_prefix
 				
-				output.write line.match(/^\s+/)
-				output.write '# '
-				
-				output.puts Rainbow(annotations.join(", ")).bright
+				terminal.write line.match(/^\s+/)
+				terminal.puts "\# #{annotations.join(", ")}", style: :annotations
+			end
+		end
+		
+		def print_line_header(terminal)
+			prefix = "Line|".rjust(8) + "Hits|".rjust(8)
+			
+			terminal.puts prefix, style: :header_prefix
+		end
+		
+		def print_line(terminal, line, line_offset, count)
+			prefix = "#{line_offset}|".rjust(8) + "#{count}|".rjust(8)
+			
+			if count == nil
+				terminal.write prefix, style: :ignored_prefix
+				terminal.write line, style: :ignored_code
+			elsif count == 0
+				terminal.write prefix, style: :uncovered_prefix
+				terminal.write line, style: :uncovered_code
+			else
+				terminal.write prefix, style: :covered_prefix
+				terminal.write line, style: :covered_code
+			end
+			
+			# If there was no newline at end of file, we add one:
+			unless line.end_with? $/
+				terminal.puts
 			end
 		end
 		
 		# A coverage array gives, for each line, the number of line execution by the interpreter. A nil value means coverage is disabled for this line (lines like else and end).
 		def call(wrapper, output = $stdout)
+			terminal = self.terminal(output)
+			
 			statistics = self.each(wrapper) do |coverage|
 				line_offset = 1
 				
 				path = wrapper.relative_path(coverage.path)
-				output.puts "", Rainbow(path).bold.underline
+				terminal.puts ""
+				terminal.puts path, style: :path
 				
 				counts = coverage.counts
 				
 				coverage.read do |file|
+					print_line_header(terminal)
+					
 					file.each_line do |line|
 						count = counts[line_offset]
 						
-						print_annotations(output, coverage, line, line_offset)
-						
-						output.write("#{line_offset}|".rjust(8))
-						output.write("#{count}|".rjust(8))
+						print_annotations(terminal, coverage, line, line_offset)
 						
-						if count == nil
-							output.write Rainbow(line).faint
-						elsif count == 0
-							output.write Rainbow(line).red
-						else
-							output.write Rainbow(line).green
-						end
-						
-						# If there was no newline at end of file, we add one:
-						unless line.end_with? $/
-							output.puts
-						end
+						print_line(terminal, line, line_offset, count)
 						
 						line_offset += 1
 					end
@@ -100,24 +133,26 @@ module Covered
 	
 	class BriefSummary < Summary
 		def call(wrapper, output = $stdout, before: 4, after: 4)
+			terminal = self.terminal(output)
+			
 			ordered = []
 			
 			statistics = self.each(wrapper) do |coverage|
 				ordered << coverage unless coverage.complete?
 			end
 			
-			output.puts
+			terminal.puts
 			statistics.print(output)
 			
 			if ordered.any?
-				output.puts "", "Least Coverage:"
+				terminal.puts "", "Least Coverage:"
 				ordered.sort_by!(&:missing_count).reverse!
 				
 				ordered.first(5).each do |coverage|
 					path = wrapper.relative_path(coverage.path)
 					
-					output.write Rainbow(path).orange
-					output.puts ": #{coverage.missing_count} lines not executed!"
+					terminal.write path, style: :brief_path
+					terminal.puts ": #{coverage.missing_count} lines not executed!"
 				end
 			end
 		end
@@ -125,16 +160,21 @@ module Covered
 	
 	class PartialSummary < Summary
 		def call(wrapper, output = $stdout, before: 4, after: 4)
+			terminal = self.terminal(output)
+			
 			statistics = self.each(wrapper) do |coverage|
 				line_offset = 1
 				
 				path = wrapper.relative_path(coverage.path)
-				output.puts "", Rainbow(path).bold.underline
+				terminal.puts ""
+				terminal.puts path, style: :path
 				
 				counts = coverage.counts
 				last_line = nil
 				
 				unless coverage.zero?
+					print_line_header(terminal)
+					
 					coverage.read do |file|
 						file.each_line do |line|
 							range = Range.new([line_offset - before, 0].max, line_offset+after)
@@ -143,28 +183,11 @@ module Covered
 								count = counts[line_offset]
 								
 								if last_line and last_line != line_offset-1
-									output.puts ":".rjust(16)
+									terminal.puts ":".rjust(16)
 								end
 								
-								print_annotations(output, coverage, line, line_offset)
-								
-								prefix = "#{line_offset}|".rjust(8) + "#{count}|".rjust(8)
-								
-								if count == nil
-									output.write prefix
-									output.write Rainbow(line).faint
-								elsif count == 0
-									output.write Rainbow(prefix).background(:darkred)
-									output.write Rainbow(line).red
-								else
-									output.write Rainbow(prefix).background(:darkgreen)
-									output.write Rainbow(line).green
-								end
-								
-								# If there was no newline at end of file, we add one:
-								unless line.end_with? $/
-									output.puts
-								end
+								print_annotations(terminal, coverage, line, line_offset)
+								print_line(terminal, line, line_offset, count)
 								
 								last_line = line_offset
 							end
@@ -177,7 +200,7 @@ module Covered
 				coverage.print(output)
 			end
 			
-			output.puts
+			terminal.puts
 			statistics.print(output)
 		end
 	end

data/lib/covered/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: covered
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: event
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A modern approach to code coverage.