gcov2x 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d688ca8f1b4d87a11eefe33917c15c194db646
-  data.tar.gz: 23ceb0bd68c3f8bd06fcf993d40e2d4c67e35f09
+  metadata.gz: bc193fe4a3be29c0863a092df1ada25ab1ffb660
+  data.tar.gz: 5608d02ef2b141296b09cf08de5b7bc76473d8f4
 SHA512:
-  metadata.gz: c88533951e3585ab3ff227086576bcbdb5ec0c92f0a6e3635143bf206a4a63f6d251f765c52b99f261511c28f3ad1b87614025396b35cc12c82e0162b311893f
-  data.tar.gz: 98dd31b4a441f6b2c37a92ef71fa9c5b54da9aec7e8dbe0532491edf403e8333de8ab4b27c9dc556d6876226c73c8401a9f543c63ff183a3da4d3ba0091a8fb3
+  metadata.gz: bb6c7cf682665c724e8d1dfd273990dbd14e7a3fc9b296f56bd8e644cece9363f6e7d694b9314f14b6bd2961ae9014f1e43e2cbc2d0cd69584cacc8890a123da
+  data.tar.gz: d2be48bb64447d436613d47ad06a3088e3a39a8b1633cbb7276d8ab78735e1f9852cc0f2512ce481d26d9b27bf25ab802d00aab3e49e4f70a54fc69308dfcbc3

data/bin/gcov2x

@@ -7,6 +7,7 @@ require_relative '../lib/ansii_formatter'
 require_relative '../lib/xml_formatter'
 require_relative '../lib/html_formatter'
 require_relative '../lib/json_formatter'
+require_relative '../lib/version'
 
 class Util
   def Util.opt_wrap(s, width=61)
@@ -17,6 +18,10 @@ end
 class CGOV_CLI
   include Mixlib::CLI
   
+  banner "gcov2x v#{GCOV::VERSION}
+
+ Usage:"
+
   option :filter,
   :long => "--filter FILTER",
   :description => Util.opt_wrap("A semicolon-separated list of regex filters which specify which files NOT to include in the conversion. Will filter on the actual filename (replacing any mangling done by llvm-cov using #'s) as well as the 'Source' meta attribute in the GCOV data. 

data/lib/file.rb

@@ -104,8 +104,10 @@ module GCOV
           file._add_line line
         end # each line
       end# file_handle
-      file._update_stats
-      files << file
+      if file
+        file._update_stats
+        files << file
+      end # if file
       files
     end
 

data/lib/project.rb

@@ -81,28 +81,24 @@ module GCOV
           hash[:filter] = [ hash[:filter] ]
         end
         
-        filenames.select{ |filename| 
-          hash[:filter].nil? or hash[:filter].empty? or hash[:filter].select{|f| f.match(GCOV::File.demangle(filename) ) }.empty?  
-        }.map{|filename| GCOV::File.load filename }.each do |files|
+        filenames.map{|filename| GCOV::File.load filename }.each do |files|
           files.each do |file|
             if hash[:filter].nil? or hash[:filter].empty? or hash[:filter].select{|f| f.match(::Pathname.new(file.meta['Source']).cleanpath.to_s) }.empty?
               self << file
             end # if
           end # each file
-        end # each file(s)
-      end
-    end
+        end # each files
+      end # add_files
+    end # #add_dir
 
     def add_file path, hash={}
       add_files do
-        if hash[:filter].nil? or !hash[:filter].match(GCOV::File.demangle(path)) 
-          files = GCOV::File.load(path)
-          files.each do |file|
-            if hash[:filter].nil? or !hash[:filter].match( ::Pathname.new(file.meta['Source']).cleanpath.to_s )
-              self << file
-            end # if
-          end
-        end # if
+        files = GCOV::File.load(path)
+        files.each do |file|
+          if hash[:filter].nil? or hash[:filter].empty? or hash[:filter].select{|f| f.match(::Pathname.new(file.meta['Source']).cleanpath.to_s) }.empty?
+            self << file
+          end # if
+        end # each file
       end # add_files
     end # add_file
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GCOV
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/gcov2x/project_spec.rb

@@ -58,7 +58,39 @@ describe GCOV::Project do
     it "adds the given file" do
       project = GCOV::Project.new
       project.add_file(File.join(File.dirname(__FILE__),"data","test2.cpp.gcov"))
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp") )
+      expect(project.files.count).to eq(1)
+      expect(project.files[0].name).to eq( "test2.cpp" )
+    end
+
+    it "should split concatenated gcov files into multiple objects" do
+      project = GCOV::Project.new
+      project.add_file(File.join(File.dirname(__FILE__),"concat","test_cat.cpp.gcov"))
+      expect(project.files.count).to eq(2)
+      expect(project.files.map(&:name)).to include( "test.cpp" )
+      expect(project.files.map(&:name)).to include( "test1.cpp" )
+    end
+
+
+    it "should filter using given array of expressions" do
+      project = GCOV::Project.new
+      project.add_file(File.join(File.dirname(__FILE__),"data","test2.cpp.gcov"), :filter => [/test2\.cpp/,/test3\.cpp/])
+      expect(project.files.count).to eq(0)
+    end
+
+    it "should filter out concatenated files that match the filter" do
+      project = GCOV::Project.new
+      project.add_file(File.join(File.dirname(__FILE__),"concat","test_cat.cpp.gcov"), :filter => [/test\.cpp$/])
+      expect(project.files.count).to eq(1)
+      expect(project.files.map(&:name)).not_to include( a_string_ending_with("test.cpp") )
+      expect(project.files.map(&:name)).to include( a_string_ending_with("test1.cpp") )
+    end
+
+    it "should not filter out concatenated files that don't match the filter" do
+      project = GCOV::Project.new
+      project.add_file(File.join(File.dirname(__FILE__),"concat","test_cat.cpp.gcov"), :filter => [/test_cat\.cpp\.gcov$/])
+      expect(project.files.count).to eq(2)
+      expect(project.files.map(&:name)).to include( a_string_ending_with("test.cpp") )
+      expect(project.files.map(&:name)).to include( a_string_ending_with("test1.cpp") )
     end
   end
 
@@ -94,6 +126,23 @@ describe GCOV::Project do
       expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test2.cpp") )
       expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test3.cpp") )
     end
+
+    it "should filter out concatenated files that match the filter" do
+      project = GCOV::Project.new
+      project.add_dir(File.join(File.dirname(__FILE__),"concat"), :recursive => true, :filter => [/test\.cpp$/])
+      expect(project.files.count).to eq(1)
+      expect(project.files.map(&:name)).not_to include( a_string_ending_with("test.cpp") )
+      expect(project.files.map(&:name)).to include( a_string_ending_with("test1.cpp") )
+    end
+
+    it "should not filter out concatenated files that don't match the filter" do
+      project = GCOV::Project.new
+      project.add_dir(File.join(File.dirname(__FILE__),"concat"), :recursive => true, :filter => [/test_cat\.cpp/])
+      expect(project.files.count).to eq(2)
+      expect(project.files.map(&:name)).to include( a_string_ending_with("test.cpp") )
+      expect(project.files.map(&:name)).to include( a_string_ending_with("test1.cpp") )
+    end
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcov2x
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mattias Bergbom
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: gcov parser and formatter