single_cov 0.8.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37412e211f8574c2160896a6703e98b40c7d4940
-  data.tar.gz: f98008886892599241ab7c2e64444e38ac642138
+SHA256:
+  metadata.gz: 93bc47f24f33d85ed88bc31457af86b4279569239a10ca58a7c68559f50c03bb
+  data.tar.gz: 4ff3f11d836b2204eb9273418529fec04d4f6442cfc066cd7ea42f22fc892615
 SHA512:
-  metadata.gz: 37578a95335ffbc37f69c63f21a8cc7b7a32eec86245bcf6a5170ce86216d0f812cfcb478a047e6c9652a66ce9aa8066750768f865b76010c8e63afb212ad49b
-  data.tar.gz: e6a801e4480356c859ab14eb7760dd2967286e90f38165c5cfd8f391fa8a0e04830989daa80ebfb9ad143d36afa5184e066530719e3a30628d83876df945db3c
+  metadata.gz: cd2d503a59f3ee64cd5dca10901f99e53d4b57a0e2700b4ada42187c6924f1a1f56473b297fc7e86648ba858901f89d6fd4fe899dae0726faf0429ca57baf32d
+  data.tar.gz: 74dce791fd81148ecd84d2b247a0daa6db34a40870f3378f58dce4ab8d03f1fc7f1bd6a838a8610760cfc2b426cb7515a348d24bb8cddef94937cdd23d7243a6

data/lib/single_cov/version.rb

@@ -1,3 +1,3 @@
 module SingleCov
-  VERSION = "0.8.4"
+  VERSION = "1.0.0"
 end

data/lib/single_cov.rb

@@ -2,6 +2,7 @@ module SingleCov
   COVERAGES = []
   MAX_OUTPUT = 40
   APP_FOLDERS = ["models", "serializers", "helpers", "controllers", "mailers", "views", "jobs"]
+  BRANCH_COVERAGE_SUPPORTED = (RUBY_VERSION >= "2.5.0")
 
   class << self
     # optionally rewrite the file we guessed with a lambda
@@ -66,18 +67,16 @@ module SingleCov
       end
     end
 
-    def setup(framework, root: nil, branches: false)
+    def setup(framework, root: nil, branches: BRANCH_COVERAGE_SUPPORTED)
       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
+      if branches && !BRANCH_COVERAGE_SUPPORTED
+        raise "Branch coverage needs ruby >= 2.5.0"
       end
 
-      @root = root if root
+      @branches = branches
+      @root = root
 
       case framework
       when :minitest
@@ -104,11 +103,17 @@ module SingleCov
     private
 
     def uncovered_branches(file, coverage, uncovered_lines)
-      found = coverage.each_value.flat_map do |branch_part|
-        branch_part.
-          select { |k, v| v.zero? && !uncovered_lines.include?(k[2]) }.
-          map { |k, _| "#{file}:#{k[2]}:#{k[3]+1}-#{k[4]}:#{k[5]+1}" }
+      # {[branch_id] => {[branch_part] => coverage}} --> {branch_part -> sum-of-coverage}
+      sum = Hash.new(0)
+      coverage.each_value do |branch|
+        branch.each do |k, v|
+          sum[k.slice(2, 4)] += v
+        end
       end
+
+      # show missing coverage
+      found = sum.select { |k, v| v.zero? && !uncovered_lines.include?(k[0]) }.
+        map { |k, _| "#{file}:#{k[0]}:#{k[1]+1}-#{k[2]}:#{k[3]+1}" }
       found.sort!
       found.uniq!
       found

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: single_cov
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-03-03 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.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Actionable code coverage.