cover-up 0.1 → 0.2

data/lib/cover-up.rb

@@ -57,14 +57,14 @@ module CoverUp
     
     # This calculates the percentage of lines that were hit by the code being covered
     def hit_percentage
-      return 0 if self.lines_with_exclusions.to_f == 0.0
-      (self.hit.length.to_f / self.lines_with_exclusions.to_f) * 100.0
+      return 0 if self.lines_without_exclusions.to_f == 0.0
+      (self.hit.length.to_f / self.lines_without_exclusions.to_f) * 100.0
     end
     
     # This calculates the percentage of lines that were missed by the code being covered
     def missed_percentage
-      return 0 if self.lines_with_exclusions.to_f == 0.0
-      (self.missed.length.to_f / self.lines_with_exclusions.to_f) * 100.0
+      return 0 if self.lines_without_exclusions.to_f == 0.0
+      (self.missed.length.to_f / self.lines_without_exclusions.to_f) * 100.0
     end
   end
 end
@@ -77,11 +77,12 @@ def coverage(options = {}, &block)
   trace = {}
   # Let's set a trace function so that every method call can be tracked
   set_trace_func(proc do |event, file, line, id, binding, klass|
-    # We unify the filename to it's absolute path
-    file = File.expand_path(file)
-    # Add the line number that was hit for this file, if it hasn't already been hit
-    trace[file] ||= []
-    trace[file] << line unless trace[file].include?(line)
+    # Ignore certain trace events that we aren't interested in
+    next if event == 'c-call' || event == 'c-return' || event == 'class' || event == 'end'
+    # We log the line, if we were given a logger block that can deal with it
+    options[:logger].call(event, file, line, id, binding, klass) unless options[:logger].nil?
+    # Add the line number that was hit for this file
+    (trace[file] ||= []) << line
   end)
   # Now that we've set up the trace function, we can execute the code (trapping any exceptions)
   begin
@@ -91,6 +92,12 @@ def coverage(options = {}, &block)
   end
   # Once that's run, we stop the trace function
   set_trace_func(nil)
+  # Now let's expand upon any paths in the trace, and make sure we remove duplicate lines
+  coverage = {}
+  trace.keys.each do |key|
+    coverage[File.expand_path(key)] = trace[key].uniq
+  end
+  trace = nil
   # Now we collate the results
   results = []
   # Loop through all files
@@ -111,7 +118,7 @@ def coverage(options = {}, &block)
       # If the line is a comment or an empty line, or it's the last line and it's "end", it's excluded
       if line.strip[0...1] == "#" || line.strip.empty? || (number == lines.length && line.strip == "end")
         excluded << number
-      elsif (trace[file] || []).include?(number)
+      elsif (coverage[file] || []).include?(number)
         # Otherwise, if it was in the trace, it was hit
         hit << number
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cover-up
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - El Draper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 +00:00
+date: 2009-01-18 00:00:00 +00:00
 default_executable: 
 dependencies: []