gcov2x 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc831448c19f5be4b75fe23d72e969ae0390ca6
-  data.tar.gz: 735ec1f4a87e97880837faf992899bda1f712f12
+  metadata.gz: 250132fce3ed7347f085dbe31b8f51eacb2a91d8
+  data.tar.gz: 73615a81b7a41d1a4b0ab09ac73f8153ef5ddb54
 SHA512:
-  metadata.gz: 1ea12bc955a2d3984d95934fb02e2b7f96b746aac5d8ba7335b474099cd4c7b5c786459a2ed2f6c9b41f78b430e53e827eeeb9d5f12243a954a21ad552f23d11
-  data.tar.gz: e7ccfe147559bd8a5eae232394bf5ecf472e89aced0707cedd13d3fcb1f362d04b96b3d0260c76c5bf772ff0dce0438125e86d64534d11a39ab238692bce67d5
+  metadata.gz: 2168fcd1772a4a6cd9d58132480d231a9101214d6eb966008da33fdfaf69bb8e051b8d61416445929e4cfdfb311f41089f77f8bab41cd7a90496198e66460858
+  data.tar.gz: 58677468ee5076e3ccfa2b339db16c27c9ec7241918964481c3dd1de78dbd5f8a192f552cff654f8fc63399fdd8e16e90ddab8afabed86655ab87b920bf73a6c

data/bin/gcov2x

@@ -19,11 +19,17 @@ class CGOV_CLI
   
   option :filter,
   :long => "--filter FILTER",
-  :description => Util.opt_wrap("A regex filter which specifies 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. Available presets:
-xcode - Xcode system headers
-linux - Linux system headers
+  :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. 
+Available presets:
+:xcode - Xcode system headers
+:linux - Linux system headers
 "),
-  :proc => Proc.new { |f| (f.size > 0 and f[0] == ":" ? f[1..-1].to_sym : f ) }
+  :proc => Proc.new { |f|
+    values = f.split(';')
+    values = values.map{|f| f.size > 0 and f[0] == ":" ? f[1..-1].to_sym : f }
+    values
+  },
+  :on => :tail
 
   option :format,
   :short => "-f FORMAT",
@@ -66,13 +72,16 @@ fail "Got no filename" unless filenames.is_a? Array and filenames.count > 0
 
 proj = GCOV::Project.new
 
-filter = case cli.config[:filter]
-         when :xcode then /Developer\/(Toolchains|Platforms)\/.*\/usr\/include\//
-         when :linux then /\/usr\/include\//
-         when nil then nil
-         else /#{cli.config[:filter]}/
-         end
-  
+filter = []
+cli.config[:filter].each do |f|
+  filter <<  case f
+              when :xcode then /Developer\/(Toolchains|Platforms)\/.*\/usr\/include\//
+              when :linux then /\/usr\/include\//
+              when nil then nil
+              else /#{f}/
+              end
+end # f
+
 filenames.each do |filename|
   if File.directory? filename
     proj.add_dir filename, :recursive => cli.config[:recursive], :filter => filter

data/lib/project.rb

@@ -67,9 +67,16 @@ module GCOV
         else
           filenames = Dir["#{path}/*.gcov"]
         end
+
+        # legacy support
+        if !hash[:filter].nil? and ( hash[:filter].is_a? Regexp )
+          hash[:filter] = [ hash[:filter] ]
+        end
         
-        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']) )
+        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 |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
         end # files
@@ -80,7 +87,7 @@ module GCOV
       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']) )
+          if hash[:filter].nil? or !hash[:filter].match( ::Pathname.new(file.meta['Source']).cleanpath.to_s )
             self << file
           end # if
         end # if

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GCOV
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/spec/gcov2x/project_spec.rb

@@ -78,6 +78,22 @@ describe GCOV::Project do
       expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp.gcov") )
       expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp.gcov") )
     end
+
+    it "filters using given singular expression" do
+      project = GCOV::Project.new
+      project.add_dir(File.join(File.dirname(__FILE__),"data"), :recursive => true, :filter => /test2\.cpp/)
+      expect(project.files.count).to eq(3)
+      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test2.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp.gcov") )
+    end
+
+    it "filters using given array of expressions" do
+      project = GCOV::Project.new
+      project.add_dir(File.join(File.dirname(__FILE__),"data"), :recursive => true, :filter => [/test2\.cpp/,/test3\.cpp/])
+      expect(project.files.count).to eq(2)
+      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test2.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test3.cpp.gcov") )
+    end
   end
 
 

metadata

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