simplecov-lcov 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc8a6e79e2c447469190f8627959b7cc705e7261
-  data.tar.gz: 7b2d488756eaf1f269b16f91301ad93e343c08a3
+SHA256:
+  metadata.gz: a02bb3733cd050cf8c6bb7390937c12a6658cf3d31d824a3a24d5769f0f475d6
+  data.tar.gz: 866c5bd282a2ba4727118755795d1da6f812b0b17c3de99276615883b3bcb0c0
 SHA512:
-  metadata.gz: 2752794178b5b410f587f5db080fff262dd0fb5d85233518e4bf0f58d9baaaefd1f814f356b7ea8d8db9f00810572b1311c55a32310e463f0d5887372c89a148
-  data.tar.gz: 0e41a7b80310684bf577d31e2c6ea0685001c5b62de7d60e175c62305b1e533183d4725e7478624316c43dea06af56baf772de988b309fdc0b4680791a9c6639
+  metadata.gz: cded646d4f8e1e1a785032ee6d2a796a49e58d55563aee0677276d1f784fcabada077a0790ceda1fd0b569f71618526efa9da6d4165f0c49c49e67a07297acdc
+  data.tar.gz: 349765f559c2a6e42a66be7a75d4b20f8ec8613114e338f3bb749bf1b2eec52f9e6d0ebfb6af18515e43e3c7a0af82aed9becba0241119b1beeed09762f77c1e

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - ruby-2.2.8
-  - ruby-2.3.5
   - ruby-2.4.2
   - ruby-2.5.0
   - ruby-head

data/Gemfile

@@ -8,9 +8,9 @@ source 'http://rubygems.org'
 group :development do
   gem 'rspec'
   gem 'rdoc'
+  gem 'rake'
   gem 'bundler'
-  gem 'jeweler', '~> 2.3.0'
-  gem 'simplecov'
+  gem 'simplecov', '~> 0.18'
   gem 'coveralls', require: false
   gem 'activesupport'
 end

data/README.markdown

@@ -7,9 +7,7 @@ Custom SimpleCov formatter to generate a lcov style coverage.
 [![Gem Version](https://badge.fury.io/rb/simplecov-lcov.svg)](http://badge.fury.io/rb/simplecov-lcov)
 [![Inline docs](http://inch-ci.org/github/fortissimo1997/simplecov-lcov.svg?branch=master)](http://inch-ci.org/github/fortissimo1997/simplecov-lcov)
 [![Code Climate](https://codeclimate.com/github/fortissimo1997/simplecov-lcov.png)](https://codeclimate.com/github/fortissimo1997/simplecov-lcov)
-[![Dependency Status](https://gemnasium.com/fortissimo1997/simplecov-lcov.svg)](https://gemnasium.com/fortissimo1997/simplecov-lcov)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/fortissimo1997/simplecov-lcov/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/fortissimo1997/simplecov-lcov/?branch=master)
-[![simplecov-lcov API Documentation](https://www.omniref.com/ruby/gems/simplecov-lcov.png)](https://www.omniref.com/ruby/gems/simplecov-lcov)
 
 ## Usage
 

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+require 'bundler/gem_tasks'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -11,20 +12,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = 'simplecov-lcov'
-  gem.homepage = 'http://github.com/fortissimo1997/simplecov-lcov'
-  gem.license = 'MIT'
-  gem.summary = %Q{Custom SimpleCov formatter to generate a lcov style coverage.}
-  gem.description = %Q{Custom SimpleCov formatter to generate a lcov style coverage.}
-  gem.email = 'fortissimo1997@gmail.com'
-  gem.authors = ['fortissimo1997']
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/simplecov-lcov.rb

@@ -83,7 +83,29 @@ module SimpleCov
 
       def format_file(file)
         filename = file.filename.gsub("#{SimpleCov.root}/", './')
-        "SF:#{filename}\n#{format_lines(file)}\nend_of_record\n"
+        pieces = []
+        pieces << "SF:#{filename}"
+        pieces << format_lines(file)
+
+        if SimpleCov.branch_coverage?
+          branch_data = format_branches(file)
+          pieces << branch_data if branch_data.length > 0
+          pieces << "BRF:#{file.total_branches.length}"
+          pieces << "BRH:#{file.covered_branches.length}"
+        end
+        pieces << "end_of_record"
+        pieces << ""
+        pieces.join("\n")
+      end
+
+      def format_branches(file)
+        branch_idx = 0
+        filtered_branches(file)
+          .map do |branch|
+            branch_idx += 1
+            format_branch(branch, branch_idx)
+          end
+          .join("\n")
       end
 
       def format_lines(file)
@@ -96,6 +118,15 @@ module SimpleCov
         file.lines.reject(&:never?).reject(&:skipped?)
       end
 
+      def filtered_branches(file)
+        file.branches.reject(&:skipped?)
+      end
+
+      def format_branch(branch, branch_idx)
+        taken = branch.coverage == 0 ? '-' : branch.coverage
+        "BRDA:#{branch.report_line},0,#{branch_idx},#{taken}"
+      end
+
       def format_line(line)
         "DA:#{line.number},#{line.coverage}"
       end

data/simplecov-lcov.gemspec

@@ -1,17 +1,14 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 # stub: simplecov-lcov 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "simplecov-lcov".freeze
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["fortissimo1997".freeze]
-  s.date = "2018-02-10"
+  s.date = "2020-02-18"
   s.description = "Custom SimpleCov formatter to generate a lcov style coverage.".freeze
   s.email = "fortissimo1997@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -35,14 +32,16 @@ Gem::Specification.new do |s|
     "spec/configuration_spec.rb",
     "spec/fixtures/app/models/user.rb",
     "spec/fixtures/hoge.rb",
+    "spec/fixtures/lcov/spec-fixtures-app-models-user.rb.branch.lcov",
     "spec/fixtures/lcov/spec-fixtures-app-models-user.rb.lcov",
+    "spec/fixtures/lcov/spec-fixtures-hoge.rb.branch.lcov",
     "spec/fixtures/lcov/spec-fixtures-hoge.rb.lcov",
     "spec/simplecov-lcov_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/fortissimo1997/simplecov-lcov".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "3.0.3".freeze
   s.summary = "Custom SimpleCov formatter to generate a lcov style coverage.".freeze
 
   if s.respond_to? :specification_version then
@@ -52,16 +51,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.18"])
       s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
       s.add_development_dependency(%q<activesupport>.freeze, [">= 0"])
     else
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, [">= 0"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, ["~> 0.18"])
       s.add_dependency(%q<coveralls>.freeze, [">= 0"])
       s.add_dependency(%q<activesupport>.freeze, [">= 0"])
     end
@@ -69,8 +68,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, [">= 0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, ["~> 0.18"])
     s.add_dependency(%q<coveralls>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])
   end

data/spec/fixtures/app/models/user.rb

@@ -7,10 +7,19 @@ class User
   end
 
   def bar
-    puts 'bar'
+    @a = 'bar'
   end
 
   def baz(b)
-    puts b
+    @a = b
+  end
+
+  def uncovered
+    @a = 'baz'
   end
 end
+
+User.new.foo
+User.new.foo
+User.new.bar
+User.new.baz 'hello'

data/spec/fixtures/hoge.rb

@@ -7,6 +7,14 @@ class Hoge
   end
 
   def bar
-    puts 'bar'
+    @a = 0.9 > 0.5 ? 'foo' : 'not foo'
+    @a = 'bar'
+  end
+
+  def uncovered
+    @a = 'baz'
   end
 end
+
+Hoge.new(1)
+Hoge.new(2).bar

data/spec/fixtures/lcov/spec-fixtures-app-models-user.rb.branch.lcov

@@ -0,0 +1,17 @@
+SF:./spec/fixtures/app/models/user.rb
+DA:4,1
+DA:5,1
+DA:6,2
+DA:9,1
+DA:10,1
+DA:13,1
+DA:14,1
+DA:17,1
+DA:18,0
+DA:22,1
+DA:23,1
+DA:24,1
+DA:25,1
+BRF:0
+BRH:0
+end_of_record

data/spec/fixtures/lcov/spec-fixtures-app-models-user.rb.lcov

@@ -1,13 +1,15 @@
 SF:./spec/fixtures/app/models/user.rb
-DA:4,2
-DA:5,2
+DA:4,1
+DA:5,1
 DA:6,2
-DA:7,2
-DA:9,0
-DA:10,0
-DA:11,0
+DA:9,1
+DA:10,1
 DA:13,1
-DA:14,0
-DA:15,0
-DA:16,1
+DA:14,1
+DA:17,1
+DA:18,0
+DA:22,1
+DA:23,1
+DA:24,1
+DA:25,1
 end_of_record

data/spec/fixtures/lcov/spec-fixtures-hoge.rb.branch.lcov

@@ -0,0 +1,16 @@
+SF:./spec/fixtures/hoge.rb
+DA:4,1
+DA:5,1
+DA:6,2
+DA:9,1
+DA:10,1
+DA:11,1
+DA:14,1
+DA:15,0
+DA:19,1
+DA:20,1
+BRDA:10,0,1,1
+BRDA:10,0,2,-
+BRF:2
+BRH:1
+end_of_record

data/spec/fixtures/lcov/spec-fixtures-hoge.rb.lcov

@@ -1,10 +1,12 @@
 SF:./spec/fixtures/hoge.rb
 DA:4,1
-DA:5,2
+DA:5,1
 DA:6,2
-DA:7,1
-DA:9,0
-DA:10,0
-DA:11,0
-DA:12,1
+DA:9,1
+DA:10,1
+DA:11,1
+DA:14,1
+DA:15,0
+DA:19,1
+DA:20,1
 end_of_record

data/spec/simplecov-lcov_spec.rb

@@ -3,23 +3,20 @@ require 'active_support/core_ext/kernel/reporting'
 
 module SimpleCov::Formatter
   describe LcovFormatter do
-    describe '#format' do
-      let(:expand_path) {
-        lambda do |filename|
-          File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename))
-        end
-      }
+    let(:branch_coverage_enabled) { false }
+    before do
+      SimpleCov.clear_coverage_criteria
+      SimpleCov.enable_coverage :branch if branch_coverage_enabled
+      ENV['COVERAGE'] && SimpleCov.start do
+        add_filter '/.rvm/'
+      end
 
-      let(:simplecov_result_hash) {
-        {
-        expand_path.call('hoge.rb') => [nil, nil, nil, 1, 2, 2, 1, nil, 0, 0, 0, 1],
-        expand_path.call('app/models/user.rb') => [nil, nil, nil, 2, 2, 2, 2, nil, 0, 0, 0, nil, 1, 0, 0, 1]
-        }
-      }
+      load 'fixtures/app/models/user.rb'
+      load 'fixtures/hoge.rb'
+    end
 
-      let(:simplecov_result) {
-        SimpleCov::Result.new(simplecov_result_hash)
-      }
+    describe '#format' do
+      let(:simplecov_result) { SimpleCov.result }
 
       context 'generating report per file' do
         before {
@@ -50,6 +47,32 @@ module SimpleCov::Formatter
           }
           it { expect(File.read(output_path)).to eq(fixture) }
         end
+
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.5")
+          describe 'branch coverage enabled' do
+            let(:branch_coverage_enabled) { true }
+
+            describe 'spec-fixtures-hoge.rb.branch.lcov' do
+              let(:output_path) {
+                File.join(LcovFormatter.config.output_directory, 'spec-fixtures-hoge.rb.lcov')
+              }
+              let(:fixture) {
+                File.read("#{File.dirname(__FILE__)}/fixtures/lcov/spec-fixtures-hoge.rb.branch.lcov")
+              }
+              it { expect(File.read(output_path)).to eq(fixture) }
+            end
+
+            describe 'spec-fixtures-app-models-user.rb.branch.lcov' do
+              let(:output_path) {
+                File.join(LcovFormatter.config.output_directory, 'spec-fixtures-app-models-user.rb.lcov')
+              }
+              let(:fixture) {
+                File.read("#{File.dirname(__FILE__)}/fixtures/lcov/spec-fixtures-app-models-user.rb.branch.lcov")
+              }
+              it { expect(File.read(output_path)).to eq(fixture) }
+            end
+          end
+        end
       end
 
       context 'generating single file report' do

data/spec/spec_helper.rb

@@ -17,9 +17,6 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   Coveralls::SimpleCov::Formatter
 ])
 
-ENV['COVERAGE'] && SimpleCov.start do
-  add_filter '/.rvm/'
-end
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-lcov
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - fortissimo1997
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,9 @@ files:
 - spec/configuration_spec.rb
 - spec/fixtures/app/models/user.rb
 - spec/fixtures/hoge.rb
+- spec/fixtures/lcov/spec-fixtures-app-models-user.rb.branch.lcov
 - spec/fixtures/lcov/spec-fixtures-app-models-user.rb.lcov
+- spec/fixtures/lcov/spec-fixtures-hoge.rb.branch.lcov
 - spec/fixtures/lcov/spec-fixtures-hoge.rb.lcov
 - spec/simplecov-lcov_spec.rb
 - spec/spec_helper.rb
@@ -155,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Custom SimpleCov formatter to generate a lcov style coverage.