gcov2x 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e9963bfe5c1d5e50a80853ce8e9772123efd9f
-  data.tar.gz: 7c201f588c22f3f5c2296e3e45874518cf084ad8
+  metadata.gz: a051bec21f907b37d3ff469c65e53854dbd711b5
+  data.tar.gz: 651d542e2a2afc95ebf79c9ad6c9e88ce88d8c94
 SHA512:
-  metadata.gz: c2551f66a91913ef11c5a54e877bb7801a7ced9b320e1349a51505deaa09d226c09402aa9d4131f7735031b62f62257184d4102cfc5bff8400357fe7b5d054d4
-  data.tar.gz: 57b0e1c8d95ccc1ae41eb0859abbe792306da800f953a6c42139e33e9868d8c33576bc82dd153ebeae2d2c2dc63b310058d8fbad34652772a6dfb40928861332
+  metadata.gz: 71db31ffc9c095e681ce72d9784851ecdf14793f53cc6a292fdde681cae9fccc4f1f3609f6d5365b9b25659bdb87c9c2ed8d5920af8f66249f5844f80e801305
+  data.tar.gz: b7aa7ba5fc36665e383c13102da3ae9fd5bd3646b09f84fcb0057b4242e254de88b54bc2b8ca32fe8948b5d1b7f198a6bf67882c29f305a5c0d4fb79e8eaf7f6

data/Gemfile

@@ -9,3 +9,4 @@ gem "mixlib-cli"
 gem 'gyoku', '~> 1.0'
 gem 'rake'
 gem 'rubygems-tasks'
+gem 'simplecov', :require => false, :group => :test

data/Gemfile.lock

@@ -3,10 +3,12 @@ GEM
   specs:
     builder (3.2.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     gyoku (1.2.2)
       builder (>= 2.1.2)
     mixlib-cli (1.5.0)
-    rake (10.3.2)
+    multi_json (1.10.1)
+    rake (10.4.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -20,6 +22,11 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     rubygems-tasks (0.2.4)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     terminal-table (1.4.5)
@@ -34,5 +41,6 @@ DEPENDENCIES
   rake
   rspec
   rubygems-tasks
+  simplecov
   term-ansicolor
   terminal-table

data/bin/gcov2x

@@ -63,18 +63,15 @@ filenames = cli.parse_options
 
 fail "Got no filename" unless filenames.is_a? Array and filenames.count > 0
 
-STDERR.puts "filter: #{cli.config[:filter]}"
-
 proj = GCOV::Project.new
 
 filter = case cli.config[:filter]
-         when :xcode then /Developer\/Toolchains\/.*\/usr\/include\//
+         when :xcode then /Developer\/(Toolchains|Platforms)\/.*\/usr\/include\//
          when :linux then /\/usr\/include\//
+         when nil then nil
          else /#{cli.config[:filter]}/
          end
   
-STDERR.puts "filter regex: #{filter}"
-
 filenames.each do |filename|
   if File.directory? filename
     proj.add_dir filename, :recursive => cli.config[:recursive], :filter => filter

data/lib/file.rb

@@ -24,6 +24,7 @@ module GCOV
       @lines = []
       @meta = {}
       @stats = {}
+      _update_stats
     end
 
     def add_lines &block
@@ -42,7 +43,8 @@ module GCOV
         :total_exec => 0,
         :total_lines => 0,
         :lines => 0,
-        :coverage => 0.0 
+        :coverage => 0.0,
+        :hits_per_line => 0.0
       }
 
       @lines.each do |line|
@@ -56,6 +58,8 @@ module GCOV
       @stats[:total_lines] = @stats[:lines] + @stats[:empty_lines]
       @stats[:coverage] = @stats[:exec_lines].to_f / @stats[:lines].to_f
       @stats[:coverage_s] = sprintf("%0.01f%",100.0*@stats[:coverage])
+      @stats[:hits_per_line] = @stats[:total_exec].to_f / @stats[:lines]
+      @stats[:hits_per_line_s] = sprintf("%0.02f",@stats[:hits_per_line])
     end
 
     def <<(line)
@@ -79,6 +83,18 @@ module GCOV
       end
       file
     end
-  end
+
+    def self.demangle filename
+      result = filename
+      if start = result.index(/###/)
+        result = result[start..-1]
+      end
+      
+      result.gsub!( /(###|#|\^|\.gcov$)/, {"###"=>"/","#"=>"/","^"=>"..",".gcov"=>""} ) 
+      result = ::File.realpath(result)
+      result
+    end
+
+  end # class File
 
 end

data/lib/html_formatter.rb

@@ -39,15 +39,23 @@ EOF
       end
     end
 
-    def class_of_stat value, &block
-      fail "class_of_stat needs a block" unless block_given?
-      return ( (yield value) ? "value" : "value_bad" )
+    def class_of_stat value, error_level, warning_level=nil
+      if value <= error_level
+        return "value_error"
+      elsif !warning_level.nil? and value < warning_level
+        return "value_warning"
+      else
+        return "value_ok"
+      end
     end
 
-    def class_of_file file
-      case file.stats[:missed_lines]
-      when 0 then "header good"
-      else "header bad"
+    def class_of_file file, error_level, warning_level=nil
+      if file.stats[:coverage] <= error_level
+        return "header error"
+      elsif !warning_level.nil? and file.stats[:coverage] < warning_level
+        return "header warning"
+      else
+        return "header ok"
       end
     end
 

data/lib/html_view.html.erb

@@ -38,14 +38,18 @@ if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c
              font-family: Sans-serif;
          }
          
-         .container .good {
+         .container .ok {
              background-color:#bbffbb;
          }
          
-         .container .bad {
+         .container .error {
              background-color:#ffbbbb;
          }
 
+         .container .warning {
+             background-color:#ffdd99;
+         }
+
          .container .content {
              display: none;
              padding : 5px;
@@ -124,10 +128,14 @@ if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c
          .stats .value {
          }
          
-         .stats .value_bad {
+         .stats .value_error {
              color:red;
          }
          
+         .stats .value_warning {
+             color:orange;
+         }
+
          .stats .stats_header {
              background-color:#d3d3d3;
              padding: 2px;
@@ -162,17 +170,29 @@ if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c
         </div>
 
         <div class="toplevel">
+            <div class="stats">
+                <div class="stats_header">Project Statistics</div>
+                <div class="stats_line"><div class="title">Files</div><div class="value"><%=@project.files.count%></div></div>
+                <div class="stats_line"><div class="title">Coverage</div><div class="<%= class_of_stat(@project.stats[:coverage], 0.9, 1)%>"><%=@project.stats[:coverage_s]%></div></div>
+                <div class="stats_line"><div class="title">Total lines</div><div class="value"><%=@project.stats[:total_lines]%></div></div>
+                <div class="stats_line"><div class="title">Executable lines</div><div class="value"><%=@project.stats[:lines]%></div></div>
+                <div class="stats_line"><div class="title">Executed lines</div><div class="value"><%=@project.stats[:exec_lines]%></div></div>
+                <div class="stats_line"><div class="title">Missed lines</div><div class="<%= class_of_stat(@project.stats[:missed_lines],0) %>"><%=@project.stats[:missed_lines]%></div></div>
+                <div class="stats_line"><div class="title">Hits per line</div><div class="value"><%=@project.stats[:hits_per_line_s]%></div></div>
+            </div>
+            <br/ >
             <% @project.files.each do |file| %>
                 <div class="container">
-                    <div class="<%=class_of_file file%>"><%=file.meta['Source']%> (<%=file.stats[:coverage_s]%>)</div>
+                    <div class="<%=class_of_file(file,0.9,1)%>"><%=file.meta['Source']%> (<%=file.stats[:coverage_s]%>)</div>
                     <div class="content">
                         <div class="stats">
-                            <div class="stats_header">Statistics</div>
-                            <div class="stats_line"><div class="title">Coverage</div><div class="<%= class_of_stat(file.stats[:coverage]) {|v| v >= 0.9 } %>"><%=file.stats[:coverage_s]%></div></div>
+                            <div class="stats_header">File Statistics</div>
+                            <div class="stats_line"><div class="title">Coverage</div><div class="<%= class_of_stat(file.stats[:coverage], 0.9, 1) %>"><%=file.stats[:coverage_s]%></div></div>
                             <div class="stats_line"><div class="title">Total lines</div><div class="value"><%=file.stats[:total_lines]%></div></div>
                             <div class="stats_line"><div class="title">Executable lines</div><div class="value"><%=file.stats[:lines]%></div></div>
                             <div class="stats_line"><div class="title">Executed lines</div><div class="value"><%=file.stats[:exec_lines]%></div></div>
-                            <div class="stats_line"><div class="title">Missed lines</div><div class="<%= class_of_stat(file.stats[:missed_lines]) {|v| v == 0 } %>"><%=file.stats[:missed_lines]%></div></div>
+                            <div class="stats_line"><div class="title">Missed lines</div><div class="<%= class_of_stat(file.stats[:missed_lines],0) %>"><%=file.stats[:missed_lines]%></div></div>
+                            <div class="stats_line"><div class="title">Hits per line</div><div class="value"><%=file.stats[:hits_per_line_s]%></div></div>
                         </div>
                         <div class="code">
                             <% file.lines.each do |line| %><div class="<%= class_of line %>"><%= encode(line.text) %></div><% end %>

data/lib/line.rb

@@ -29,9 +29,6 @@ module GCOV
       GCOV::Line.new number,count,text
     end
 
-    def to_s
-      "#{@number}:#{@count}:#{@text}"
-    end
   end
 
 end

data/lib/project.rb

@@ -5,54 +5,86 @@ module GCOV
 
   class Project
     
-    attr_reader :files
+    attr_reader :files, :stats
     attr_accessor :name
 
     def initialize name=""
       @name = name
       @files = []
+      @adding = false
     end
 
     def <<(file)
       @files << file
+      _update_stats unless @adding
     end
 
-    def demangle filename
-      result = filename
-      if start = result.index(/###/)
-        result = result[start..-1]
+    def add_files &block
+      # suspend stat updates until done adding files
+      fail "add_files requires a block" unless block_given?
+
+      # guard against nested calls
+      was_adding = @adding
+      @adding = true
+      yield
+      @adding = was_adding
+
+      _update_stats unless @adding
+
+    end
+
+    def _update_stats
+      @stats = { 
+        :missed_lines => 0,
+        :exec_lines => 0,
+        :empty_lines => 0,
+        :total_exec => 0,
+        :total_lines => 0,
+        :lines => 0,
+        :coverage => 0.0,
+        :hits_per_line => 0
+      }
+
+      @files.each do |file|
+        @stats[:missed_lines] += file.stats[:missed_lines]
+        @stats[:exec_lines] += file.stats[:exec_lines]
+        @stats[:total_exec] += file.stats[:total_exec]
+        @stats[:empty_lines] += file.stats[:empty_lines]
       end
-      
-      result.gsub!( /(###|#|\^|\.gcov$)/, {"###"=>"/","#"=>"/","^"=>"..",".gcov"=>""} ) 
-      STDERR.puts "demangled: #{result}"
-      result = ::File.realpath(result)
-      STDERR.puts "realpath: #{result}"
-      result
+        
+      @stats[:lines] = @stats[:exec_lines] + @stats[:missed_lines]
+      @stats[:total_lines] = @stats[:lines] + @stats[:empty_lines]
+      @stats[:coverage] = @stats[:exec_lines].to_f / @stats[:lines].to_f
+      @stats[:coverage_s] = sprintf("%0.01f%",100.0*@stats[:coverage])
+      @stats[:hits_per_line] = @stats[:total_exec].to_f / @stats[:lines]
+      @stats[:hits_per_line_s] = sprintf("%0.02f",@stats[:hits_per_line])
     end
 
     def add_dir path, hash={}
-      if hash[:recursive] == true
-        filenames = Dir["#{path}/**/*.gcov"]
-      else
-        filenames = Dir["#{path}/*.gcov"]
-      end
-      STDERR.puts "filenames: #{filenames}"
-      
-      filenames.select{|filename| ( hash[:filter].nil? or !hash[:filter].match(demangle(filename))) }.map{|filename| GCOV::File.load filename }.each do |file|
-        if hash[:filter].nil? or !hash[:filter].match( ::File.realpath(file.meta['Source']) )
-          self << file
+      add_files do 
+        if hash[:recursive] == true
+          filenames = Dir["#{path}/**/*.gcov"]
+        else
+          filenames = Dir["#{path}/*.gcov"]
         end
-      end # files
-      STDERR.puts "files: #{files.map{|f|f.name}}"
+        
+        filenames.select{|filename| ( hash[:filter].nil? or !hash[:filter].match(GCOV::File.demangle(filename))) }.map{|filename| GCOV::File.load filename }.each do |file|
+          if hash[:filter].nil? or !hash[:filter].match( ::File.realpath(file.meta['Source']) )
+            self << file
+          end
+        end # files
+      end
     end
 
     def add_file path, hash={}
-      if hash[:filter].nil? or !hash[:filter].match(demangle(path)) 
-        file = GCOV::File.load(path)
-        if hash[:filter].nil? or !hash[:filter].match( ::File.realpath(file.meta['Source']) )
-          self << file
+      add_files do
+        if hash[:filter].nil? or !hash[:filter].match(GCOV::File.demangle(path)) 
+          file = GCOV::File.load(path)
+          if hash[:filter].nil? or !hash[:filter].match( ::File.realpath(file.meta['Source']) )
+            self << file
+          end # if
         end # if
-      end # if
+      end # add_files
     end # add_file
 
     def self.load_dir path, hash={}

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GCOV
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/file_spec.rb

@@ -39,7 +39,7 @@ describe GCOV::File do
       expect(file.stats[:exec_lines]).to eq(2)
       expect(file.stats[:missed_lines]).to eq(2)
       expect(file.stats[:coverage]).to eq(0.5)
-      expect(file.stats[:total_exec]).to eq(27)
+      expect(file.stats[:hits_per_line]).to eq(27.0/4)
     end
   end
 
@@ -70,4 +70,12 @@ describe GCOV::File do
       expect(file.meta["Runs"].to_i).to eq(1)
     end
   end
+
+  describe ".demangle" do
+    it "should demangle file names" do
+      demangled = GCOV::File.demangle( "stringutil.cpp.###Applications#Xcode.app#Contents#Developer#Toolchains#XcodeDefault.xctoolchain#usr#bin#^#include#c++#v1#streambuf.gcov" )
+      expect( demangled ).to eq("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/streambuf")
+    end
+  end
+
 end

data/spec/project_spec.rb

@@ -81,4 +81,43 @@ describe GCOV::Project do
   end
 
 
+  describe "#stats" do
+    it "should be computed based on file stats" do
+      project = GCOV::Project.new
+
+      project.add_files do
+        file = GCOV::File.new "myfile.cpp"
+        file.add_lines do
+          file << GCOV::Line.new(1,4,"line 1")
+          file << GCOV::Line.new(2,23,"line 2")
+          file << GCOV::Line.new(3,:none,"line 3")
+          file << GCOV::Line.new(4,:missed,"line 4")
+          file << GCOV::Line.new(5,:none,"line 5")
+        end
+
+        project << file
+
+        file = GCOV::File.new "myfile.cpp"
+        file.add_lines do
+          file << GCOV::Line.new(1,:missed,"line 1")
+          file << GCOV::Line.new(2,40,"line 2")
+          file << GCOV::Line.new(3,:none,"line 3")
+          file << GCOV::Line.new(4,:none,"line 4")
+        end
+
+        project << file
+        
+      end
+      
+      expect(project.stats[:lines]).to eq(5)
+      expect(project.stats[:total_lines]).to eq(9)
+      expect(project.stats[:total_exec]).to eq(67)
+      expect(project.stats[:empty_lines]).to eq(4)
+      expect(project.stats[:exec_lines]).to eq(3)
+      expect(project.stats[:missed_lines]).to eq(2)
+      expect(project.stats[:coverage]).to eq(3.0/5)
+      expect(project.stats[:hits_per_line]).to eq(67.0/5)
+
+    end      
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+require 'simplecov'
+SimpleCov.start
+
 require_relative '../lib/line'
 require_relative '../lib/file'
 require_relative '../lib/project'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcov2x
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Mattias Bergbom