gcovtools 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23db08fd06b16c6c51a25767527a5477c79bbe2
-  data.tar.gz: 473f253ed3f31443a38e48031c4c6b4e268065f7
+  metadata.gz: 79704c773c2995234b02d73c6c212496072f11bd
+  data.tar.gz: 802a71bba4d7bcc7de02bf907ce982310b448ebb
 SHA512:
-  metadata.gz: 3dbf18325ed0c4daa8192d37b09621c5cf6c9481ca0eea193e49fd4ecd7fd94929d43bb938bb7084d8cbc20f08321f9a042681f3c83af97ebefcf6b99b521bd6
-  data.tar.gz: b64383a654f12cbd33c013ce690eb12c8495da5919d119b5b52a8c670f5859d2dc25baad5622756143a8d62c2a277b9dcdcb5b8e5f04904be317f95717125867
+  metadata.gz: d73d680866da1d8733b8273cc2162491f03060e4d4413fc152d428a22b83f531f5ff32521c4f2797d427d7a186963498e336e1ea4c404b1ed682b862dcc54161
+  data.tar.gz: 010fa7a669e91646b9e8b9d073318eeb6ca4e9491cf011cf6356a1aba9757ab1ec39d75d42542de98f1d2f405a35d44cbac68a865eb9dfe793cc3dfa652c232e

data/lib/line.rb

@@ -19,6 +19,13 @@ module GCOVTOOLS
       end
     end
 
+    def self.closing_brace_patterns
+      [
+       /^}[ ;]*$/, # brace followed by any number of spaces and semi-colons (methods/classes/closures)
+       /^}[ ;]*\/\/.*$/, # brace + [semicolon(s)] + inline comment (e.g. end of class/method)
+      ]
+    end
+
     def self.parse line
       match = /^[ ]*([0-9]+|-|#####):[ ]*([0-9]+):(.*)/.match(line)
       fail "Invalid line: #{line}" unless match.to_a.count == 4
@@ -29,7 +36,8 @@ module GCOVTOOLS
               when "#####" then :missed
               else count.to_i
               end
-      count = :none if count == :missed and text.strip == "}"
+ 
+      count = :none if count == :missed and Line.closing_brace_patterns.select{|re| re.match(text.strip) }.count > 0
       GCOVTOOLS::Line.new number,count,text
     end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GCOVTOOLS
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/gcovtools/line_spec.rb

@@ -63,6 +63,45 @@ describe GCOVTOOLS::Line do
       expect(line.text).to eq("}                                  ")
     end
 
+    it "should ignore missed closing brace with semicolon" do
+      line = GCOVTOOLS::Line.parse "    #####:   1:};"
+      expect(line.number).to eq(1)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("};")
+      line = GCOVTOOLS::Line.parse "    #####:   89:    };  "
+      expect(line.number).to eq(89)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("    };  ")
+      line = GCOVTOOLS::Line.parse "    #####:   999:                                    };"
+      expect(line.number).to eq(999)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("                                    };")
+      line = GCOVTOOLS::Line.parse "    #####:   5:};                                  "
+      expect(line.number).to eq(5)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("};                                  ")
+    end
+
+
+    it "should ignore missed closing brace with semicolon and inline comment" do
+      line = GCOVTOOLS::Line.parse "    #####:   1:}; // class Foo"
+      expect(line.number).to eq(1)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("}; // class Foo")
+      line = GCOVTOOLS::Line.parse "    #####:   89:    }; //class Foo  "
+      expect(line.number).to eq(89)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("    }; //class Foo  ")
+      line = GCOVTOOLS::Line.parse "    #####:   999:                                    }; // class Foo"
+      expect(line.number).to eq(999)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("                                    }; // class Foo")
+      line = GCOVTOOLS::Line.parse "    #####:   5:};                 // class Foo                 "
+      expect(line.number).to eq(5)
+      expect(line.count).to eq(:none)
+      expect(line.text).to eq("};                 // class Foo                 ")
+    end
+
   end
 
   describe "#state" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcovtools
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mattias Bergbom