single_cov 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7834a79c1226437c3b1da59799ac89d0f00a1a8d
-  data.tar.gz: f458e6175feba9720a0c260552339b503bc7cbd2
+  metadata.gz: 5ff56ca222179db97c40135c3a77650bdb0e50d1
+  data.tar.gz: b5f22da478910a07fbefe85a0beec998ebea7838
 SHA512:
-  metadata.gz: 0d152668983b6f7d1bad2e6f9a630fc47e71be701f37d1aa4c42a07c7fce0118ae06e4672cea695d68e49f588dad07db5a413666739453f543cb6afecf1631ae
-  data.tar.gz: 4358e509409719d8f7faed8e41574edcc2bf7288452ff5416ba9bbca741f54f94ebe2ddc2e533cb4711d1fb9a2a5b3e566edae444aff2efcf3098a5bbe38b4d8
+  metadata.gz: f0abece5122f6edfa54926df42c59c6fea6e015fd6771a3f73a0dcc1633bf67785fed005578df3dc6e0e1db88c43b3c2fe39c0cebe3ffe9265a685c3560e0372
+  data.tar.gz: e42f89fd4233535a7b9fe6efe6d2a111bab0b6cf13987c25ea19bba559f0ce29f554a9b06d8f1a5b25e2e56f8479fd598a85b207b5ea6278dd5b34f03072664e

data/lib/single_cov/version.rb

@@ -1,3 +1,3 @@
 module SingleCov
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/single_cov.rb

@@ -20,7 +20,13 @@ module SingleCov
     def all_covered?(result)
       errors = COVERAGES.map do |file, expected_uncovered|
         if coverage = result["#{root}/#{file}"]
-          uncovered_lines = coverage.each_with_index.map { |c, i| "#{file}:#{i+1}" if c == 0 }.compact
+          lines = (coverage.is_a?(Hash) ? coverage.fetch(:lines) : coverage)
+          uncovered_lines = line_coverage(file, lines)
+
+          if branches = (coverage.is_a?(Hash) && coverage[:branches])
+            uncovered_lines += branch_coverage(file, branches)
+          end
+
           next if uncovered_lines.size == expected_uncovered
           warn_about_bad_coverage(file, expected_uncovered, uncovered_lines)
         else
@@ -58,10 +64,16 @@ module SingleCov
       end
     end
 
-    def setup(framework, root: nil)
+    def setup(framework, root: nil, branches: false)
       if defined?(SimpleCov)
         raise "Load SimpleCov after SingleCov"
       end
+      if branches && RUBY_VERSION < "2.5.0"
+        warn "Branch coverage needs ruby 2.5.0"
+        @branches = false
+      else
+        @branches = branches
+      end
 
       @root = root if root
 
@@ -89,6 +101,16 @@ module SingleCov
 
     private
 
+    def line_coverage(file, coverage)
+      coverage.each_with_index.map { |c, i| "#{file}:#{i + 1}" if c == 0 }.compact
+    end
+
+    def branch_coverage(file, coverage)
+      coverage.each_value.flat_map do |branch_part|
+        branch_part.select { |_k, v| v == 0 }.map { |k, _| "#{file}:#{k[2]}:#{k[3]+1}-#{k[4]}:#{k[5]+1}" }
+      end
+    end
+
     def default_tests
       glob("{test,spec}/**/*_{test,spec}.rb")
     end
@@ -110,7 +132,11 @@ module SingleCov
     # SimpleCov might start coverage again, but that does not hurt ...
     def start_coverage_recording
       require 'coverage'
-      Coverage.start
+      if @branches
+        Coverage.start(lines: true, branches: true)
+      else
+        Coverage.start
+      end
     end
 
     # not running rake or a whole folder

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: single_cov
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Actionable code coverage.