gcov2x 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc193fe4a3be29c0863a092df1ada25ab1ffb660
-  data.tar.gz: 5608d02ef2b141296b09cf08de5b7bc76473d8f4
+  metadata.gz: 740237ee0abec57ac7be4ed0fed51ef80f4f8f17
+  data.tar.gz: 047ebd3dbd900b8f3e15e0628c45ef68d0eadcc3
 SHA512:
-  metadata.gz: bb6c7cf682665c724e8d1dfd273990dbd14e7a3fc9b296f56bd8e644cece9363f6e7d694b9314f14b6bd2961ae9014f1e43e2cbc2d0cd69584cacc8890a123da
-  data.tar.gz: d2be48bb64447d436613d47ad06a3088e3a39a8b1633cbb7276d8ab78735e1f9852cc0f2512ce481d26d9b27bf25ab802d00aab3e49e4f70a54fc69308dfcbc3
+  metadata.gz: 40f12f5c19bbfa268264084d33095a9b2212e0f6861bfdabeb0458c642a82d32be8a482d2e92cf0b8125dc1495b4e428251f96d4bcab09f9a19de94df2559aa6
+  data.tar.gz: bbd4542d5b4c06ab00269cb546838215147f60dac19b0b3e171fcac965242d2b05c3168cf72806df82208f797329600058d5e8ab043f4f46b1583923210e2a4b

data/lib/file.rb

@@ -22,12 +22,17 @@ module GCOV
     def initialize name
       fail "name required" unless name and name.is_a? String
       @name = name
-      @lines = []
+      @lines = {}
       @meta = {}
       @stats = {}
       _update_stats
     end
 
+    # return lines as array, in order by number
+    def lines
+      @lines.sort.map{|key,val|val}
+    end
+
     def add_lines &block
       fail "add_lines requires a block" unless block_given?
       @adding = true
@@ -48,7 +53,7 @@ module GCOV
         :hits_per_line => 0.0
       }
 
-      @lines.each do |line|
+      @lines.each do |index,line|
         @stats[:missed_lines] += (line.state == :missed).to_i
         @stats[:exec_lines] += (line.state == :exec).to_i
         @stats[:total_exec] += (line.count.is_a?(Integer) ? line.count : 0 )
@@ -76,7 +81,7 @@ module GCOV
         key,val = /([^:]+):(.*)$/.match(line.text).to_a[1..2]
         @meta[key] = val
       else
-        @lines << line
+        @lines[line.number] = line
       end
     end
 
@@ -122,6 +127,23 @@ module GCOV
       result
     end
 
+    def merge! other
+      other.lines.each do |line|
+        if @lines.has_key? line.number
+          @lines[line.number].merge! line
+        else
+          @lines[line.number] = line
+        end
+      end
+      _update_stats
+    end
+
+    def merge other
+      result = self.dup
+      result.merge! other
+      result
+    end
+
   end # class File
 
 end

data/lib/line.rb

@@ -3,17 +3,20 @@ module GCOV
 
   class Line
 
-    attr_reader :number, :count, :text, :state
+    attr_reader :number, :count, :text
     
     def initialize number, count, text
       @number = number
       @count = count
       @text = text
-      @state = case @count
-               when :missed then :missed
-               when :none then :none
-               else :exec
-               end
+    end
+
+    def state
+      case @count
+      when :missed then :missed
+      when :none then :none
+      else :exec
+      end
     end
 
     def self.parse line
@@ -29,6 +32,24 @@ module GCOV
       GCOV::Line.new number,count,text
     end
 
+    def merge! other
+      if other.count.is_a? Integer and @count.is_a? Integer
+        @count += other.count
+      elsif other.count.is_a? Integer
+        @count = other.count
+      elsif @count.is_a? Integer
+        nil
+      elsif other.count == :missed or @count == :missed
+        @count = :missed
+      end
+    end
+
+    def merge other
+      result = self.dup
+      result.merge! other
+      result
+    end
+
   end
 
 end

data/lib/project.rb

@@ -10,15 +10,30 @@ module GCOV
 
     def initialize name=""
       @name = name
-      @files = []
+      @files = {}
       @adding = false
     end
 
     def <<(file)
-      @files << file
+      if @files.has_key?file.name
+        @files[file.name].merge! file
+      else
+        @files[file.name] = file
+      end
       _update_stats unless @adding
     end
 
+    def files
+      @files.sort{|a,b| 
+        if ::File.basename(a[0]) < ::File.basename(b[0])
+          -1
+        elsif ::File.basename(a[0]) == ::File.basename(b[0])
+          0
+        else
+          1
+        end }.map{|key,val|val}
+    end
+
     def add_files &block
       # suspend stat updates until done adding files
       fail "add_files requires a block" unless block_given?
@@ -45,7 +60,7 @@ module GCOV
         :hits_per_line => 0
       }
 
-      @files.each do |file|
+      @files.each do |name,file|
         @stats[:missed_lines] += file.stats[:missed_lines]
         @stats[:exec_lines] += file.stats[:exec_lines]
         @stats[:total_exec] += file.stats[:total_exec]
@@ -68,39 +83,44 @@ module GCOV
 
     end
 
-    def add_dir path, hash={}
-      add_files do 
-        if hash[:recursive] == true
-          filenames = Dir["#{path}/**/*.gcov"]
-        else
-          filenames = Dir["#{path}/*.gcov"]
-        end
+    def _add_file path, hash_={}
+      hash = hash_.dup
+      
+      # legacy support
+      if !hash[:filter].nil? and ( hash[:filter].is_a? Regexp )
+        hash[:filter] = [ hash[:filter] ]
+      end
+      
+      files = GCOV::File.load(path)
 
-        # legacy support
-        if !hash[:filter].nil? and ( hash[:filter].is_a? Regexp )
-          hash[:filter] = [ hash[:filter] ]
-        end
-        
-        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 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
+
+    def add_dir path, hash_={}
+      hash = hash_.dup
+      if hash[:recursive] == true
+        filenames = Dir["#{path}/**/*.gcov"]
+      else
+        filenames = Dir["#{path}/*.gcov"]
+      end
+
+      add_files do 
+        filenames.each do |filename|
+          _add_file filename, hash
+        end # each filename
       end # add_files
     end # #add_dir
-
-    def add_file path, hash={}
+    
+    def add_file path, hash_={}
+      hash = hash_.dup
       add_files do
-        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
+        _add_file path, hash
       end # add_files
-    end # add_file
+    end # #add_file
 
     def self.load_dir path, hash={}
       project = GCOV::Project.new

data/lib/version.rb

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

data/spec/gcov2x/file_spec.rb

@@ -62,11 +62,11 @@ describe GCOV::File do
       expect(file.lines.count).to eq(0)
     end
     
-    it "returns the lines it was given" do
+    it "should return the lines it was given, sorted by number" 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(1,4,"line 1")
       end
       expect(file.lines.count).to eq(2)
       expect(file.lines[0].number).to eq(1)
@@ -103,4 +103,38 @@ describe GCOV::File do
     end
   end
 
+  describe "#merge" do
+
+    it "should merge the counts of each line and recompute stats" 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,:missed,"line 5")
+      end
+
+      file2 = GCOV::File.new "myfile.cpp"
+      file2.add_lines do
+        file2 << GCOV::Line.new(1,1,"line 1")
+        file2 << GCOV::Line.new(2,:missed,"line 2")
+        file2 << GCOV::Line.new(3,:none,"line 3")
+        file2 << GCOV::Line.new(4,4,"line 4")
+        file2 << GCOV::Line.new(5,:missed,"line 5")
+      end
+
+      file3 = file.merge file2
+
+      expect(file3.stats[:lines]).to eq(4)
+      expect(file3.stats[:total_lines]).to eq(5)
+      expect(file3.stats[:total_exec]).to eq(32)
+      expect(file3.stats[:empty_lines]).to eq(1)
+      expect(file3.stats[:exec_lines]).to eq(3)
+      expect(file3.stats[:missed_lines]).to eq(1)
+      expect(file3.stats[:coverage]).to eq(0.75)
+      expect(file3.stats[:hits_per_line]).to eq(32.0/4)
+
+    end # it
+  end # describe
 end

data/spec/gcov2x/line_spec.rb

@@ -46,4 +46,48 @@ describe GCOV::Line do
 
   end
 
+  describe "#state" do
+    it "should return :exec if it has positive count" do
+      line = GCOV::Line.new 3,5,"line x"
+      expect(line.state).to eq(:exec)
+    end
+
+    it "should return :missed if it was missed" do
+      line = GCOV::Line.new 3,:missed,"line x"
+      expect(line.state).to eq(:missed)
+    end
+
+    it "should return :none if it is not relevant" do
+      line = GCOV::Line.new 3,:none,"line x"
+      expect(line.state).to eq(:none)
+    end
+  end
+
+  describe "#merge" do
+    it "should add hit counts" do
+      line = GCOV::Line.new 3,4, "abcdef"
+      line2 = GCOV::Line.new 3,1, "abcdef"
+      line3 = line.merge line2
+      expect(line3.count).to eq(5)
+
+      line = GCOV::Line.new 3,:missed, "abcdef"
+      line2 = GCOV::Line.new 3,1, "abcdef"
+      line3 = line.merge line2
+      expect(line3.count).to eq(1)
+
+      line = GCOV::Line.new 3,1, "abcdef"
+      line2 = GCOV::Line.new 3,:missed, "abcdef"
+      line3 = line.merge line2
+      expect(line3.count).to eq(1)
+    end
+
+    it "should give missed (0) presedence over none" do
+      line = GCOV::Line.new 3,:missed, "abcdef"
+      line2 = GCOV::Line.new 3,:none, "abcdef"
+      line3 = line.merge line2
+      expect(line3.count).to eq(:missed)
+    end
+
+  end # describe #merge
+
 end

data/spec/gcov2x/project_spec.rb

@@ -32,8 +32,8 @@ describe GCOV::Project do
       project << GCOV::File.new("foobar.cpp")
       project << GCOV::File.new("boofar.cpp")
       expect(project.files.count).to eq(2)
-      expect(project.files[0].name).to eq("foobar.cpp")
-      expect(project.files[1].name).to eq("boofar.cpp")
+      expect(project.files.map(&:name)).to include(a_string_ending_with("foobar.cpp"))
+      expect(project.files.map(&:name)).to include(a_string_ending_with("boofar.cpp"))
     end
   end
 
@@ -55,7 +55,7 @@ describe GCOV::Project do
   end
 
   describe "#add_file" do
-    it "adds the given file" do
+    it "should add the given file" do
       project = GCOV::Project.new
       project.add_file(File.join(File.dirname(__FILE__),"data","test2.cpp.gcov"))
       expect(project.files.count).to eq(1)
@@ -70,7 +70,6 @@ describe GCOV::Project do
       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/])
@@ -92,7 +91,40 @@ describe GCOV::Project do
       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
+
+    it "should merge file stats for identical filenames" do
+      project = GCOV::Project.new
+      project.add_files do
+        file = GCOV::File.new "myfile.cpp"
+        file.add_lines do
+          file << GCOV::Line.new(0,:none,"Source:myfile.cpp")
+          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(0,:none,"Source:myfile.cpp")
+          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 # add_files
+
+      expect(project.files.count).to eq(1)
+      
+    end # it
+
+  end # describe
 
   describe "#add_dir" do
     it "adds all files in the given directory" do
@@ -162,7 +194,7 @@ describe GCOV::Project do
 
         project << file
 
-        file = GCOV::File.new "myfile.cpp"
+        file = GCOV::File.new "myfile2.cpp"
         file.add_lines do
           file << GCOV::Line.new(1,:missed,"line 1")
           file << GCOV::Line.new(2,40,"line 2")

metadata

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