coveralls_reborn 0.19.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc12f5b88635ba1f1ccef5bbb0bf35582968a2596ec8560f68dd331b8484dbb
-  data.tar.gz: 150ab6de22220b3b5621f96db48338999fcc8f03d9656d08764f51a783e5672f
+  metadata.gz: 8d60acce3dea2248f73864689d5ad1fdfda5da46bb17b9666bf8bb94b911b070
+  data.tar.gz: 5c235845bb44951d9a53961aa6a9e4cd3dbed865d3d54d7bd3d7f5e1b7b535d6
 SHA512:
-  metadata.gz: d9e6dd6bbdca328fd172be5af7fddc549e3c9ecd3cb1d95f39bde3514fda2878cd56c37c41449f91e01e2a2499b6ecee6999c4519fcb80e6fc197215c9d2604e
-  data.tar.gz: 98b81b28d1dcc376c24f19acaa7e1f41194df8e63d12d92277a8a048629930fd3c406010e431039b924f4a589c38a83625ce9c70224976e56a97614b2a37ff6e
+  metadata.gz: 52c45871f2b938204024cc0479d2663a49818fd4a675cf56b315a767576658663c32beb136d9ac30a5bb853ff97bc434f8f9ca621a5d420d9e4719c2d5e139ab
+  data.tar.gz: ca395d514b29d860a8462847cfc20419e5ae0300b964d9d51491e55f046cd0b6cb5f5bc651036ffc2b48a7ad2bfb8c93bc69f3997fab5879c58c20810e81405c

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10

data/.github/workflows/rubocop.yml

@@ -0,0 +1,29 @@
+name: Rubocop
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  rubocop:
+    name: Rubocop
+    runs-on: ${{ matrix.os }}
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        ruby-version: ['2.5']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Ruby linter
+      run: bundle exec rubocop

data/.github/workflows/ruby.yml

@@ -0,0 +1,51 @@
+name: Ruby specs
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        experimental: [false]
+
+        include:
+          - ruby-version: 'head'
+            experimental: true
+          - ruby-version: 'jruby-9.2'
+            experimental: true
+
+    continue-on-error: ${{ matrix.experimental }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run specs
+      run: JRUBY_OPTS="--dev --debug" bundle exec rake spec
+    - name: Coveralls Parallel
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}
+        flag-name: run-${{ matrix.ruby-version }}
+        parallel: true
+
+  coverage:
+    name: Coverage
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: true

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 0.23.0 / 2021-09-12
+
+* [FEATURE] Send branches coverage [#27](https://github.com/tagliala/coveralls-ruby-reborn/pull/27/files)
+
+## 0.22.0 / 2021-04-30
+
+* [FEATURE] Drop Ruby 2.4 support
+* [ENHANCEMENT] Test against latest Ruby versions
+
+## 0.21.0 / 2021-03-18
+
+* [FEATURE] Allow GitLab parallel builds [#20](https://github.com/tagliala/coveralls-ruby-reborn/pull/20)
+* [ENHANCEMENT] Test against JRuby 9.2.16.0
+
+## 0.20.0 / 2021-01-09
+
+* [FEATURE] Add Ruby 3 compatibility
+* [FEATURE] Add SimpleCov 0.21.0 compatibility
+* [ENHANCEMENT] Update dependencies
+
 ## 0.19.0 / 2020-12-02
 
 * [FEATURE] Add SimpleCov 0.20.0 compatibility

data/Gemfile

@@ -9,20 +9,15 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.10.2'
 end
 
-group :development do
-  gem 'rake', '~> 13.0'
-  gem 'rspec', '~> 3.10'
-  gem 'rubocop', '~> 1.5'
-  gem 'rubocop-performance', '~> 1.9'
-  gem 'rubocop-rake', '~> 0.5.1'
-  gem 'rubocop-rspec', '~> 2.0'
-  gem 'truthy', '~> 1.0'
-  gem 'vcr', '~> 6.0'
-  gem 'webmock', '~> 3.10'
-end
-
-group :development, :test do
-  gem 'byebug', '~> 11.1', platforms: %i[mri mingw x64_mingw]
-  gem 'pry', '~> 0.13.1'
-  gem 'pry-byebug', '~> 3.9', platforms: %i[mri mingw x64_mingw]
-end
+gem 'byebug', '~> 11.1', platforms: %i[mri mingw x64_mingw]
+gem 'pry', '~> 0.13.1'
+gem 'pry-byebug', '~> 3.9', platforms: %i[mri mingw x64_mingw]
+gem 'rake', '~> 13.0'
+gem 'rspec', '~> 3.10'
+gem 'rubocop', '~> 1.20'
+gem 'rubocop-performance', '~> 1.11'
+gem 'rubocop-rake', '~> 0.6.0'
+gem 'rubocop-rspec', '~> 2.4'
+gem 'truthy', '~> 1.0'
+gem 'vcr', '~> 6.0'
+gem 'webmock', '~> 3.14'

data/LICENSE

@@ -2,7 +2,7 @@ MIT License
 
 Copyright (c) 2018 Wil Gieseler
 
-Copyright (c) 2020 Geremia Taglialatela
+Copyright (c) 2021 Geremia Taglialatela
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-# [Coveralls Reborn](http://coveralls.io) for Ruby [![Coverage Status](https://coveralls.io/repos/github/tagliala/coveralls-ruby-reborn/badge.svg?branch=master)](https://coveralls.io/github/tagliala/coveralls-ruby-reborn?branch=master) [![Build Status](https://secure.travis-ci.org/tagliala/coveralls-ruby-reborn.svg?branch=master)](https://travis-ci.org/tagliala/coveralls-ruby-reborn) [![Gem Version](https://badge.fury.io/rb/coveralls_reborn.svg)](http://badge.fury.io/rb/coveralls_reborn)
+# [Coveralls Reborn](https://coveralls.io) for Ruby [![Coverage Status](https://coveralls.io/repos/github/tagliala/coveralls-ruby-reborn/badge.svg?branch=main)](https://coveralls.io/github/tagliala/coveralls-ruby-reborn?branch=main) ![Build Status](https://github.com/tagliala/coveralls-ruby-reborn/actions/workflows/ruby.yml/badge.svg) [![Gem Version](https://badge.fury.io/rb/coveralls_reborn.svg)](https://badge.fury.io/rb/coveralls_reborn)
 
 ### [Read the docs →](https://docs.coveralls.io/ruby-on-rails)
 
@@ -7,5 +7,40 @@ An up-to-date fork of [lemurheavy/coveralls-ruby](https://github.com/lemurheavy/
 Add to your `Gemfile`:
 
 ```rb
-gem 'coveralls_reborn', '~> 0.19.0', require: false
+gem 'coveralls_reborn', '~> 0.23.0', require: false
 ```
+
+### GitHub Actions
+
+Psst... you don't need this gem on GitHub Actions.
+
+For a Rails application, just add
+
+```rb
+gem 'simplecov-lcov', '~> 0.8.0'
+```
+
+to your `Gemfile` and
+
+```rb
+require 'simplecov'
+
+SimpleCov.start 'rails' do
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
+
+  add_filter %w[version.rb initializer.rb]
+end
+```
+
+at the top of `spec_helper.rb` / `rails_helper.rb` / `test_helper.rb`.
+
+Then follow instructions at [Coveralls GitHub Action](https://github.com/marketplace/actions/coveralls-github-action)

data/Rakefile

@@ -2,7 +2,6 @@
 
 require 'bundler/gem_tasks'
 
-# Travis!
 require 'rubygems'
 require 'rake'
 require 'rspec/core/rake_task'

data/coveralls-ruby.gemspec

@@ -20,15 +20,16 @@ Gem::Specification.new do |gem|
   gem.version       = Coveralls::VERSION
 
   gem.metadata['bug_tracker_uri'] = 'https://github.com/tagliala/coveralls-ruby-reborn/issues'
-  gem.metadata['changelog_uri'] = 'https://github.com/tagliala/coveralls-ruby-reborn/blob/master/CHANGELOG.md'
+  gem.metadata['changelog_uri'] = 'https://github.com/tagliala/coveralls-ruby-reborn/blob/main/CHANGELOG.md'
   gem.metadata['source_code_uri'] = 'https://github.com/tagliala/coveralls-ruby-reborn'
 
-  gem.required_ruby_version = '>= 2.4'
+  gem.required_ruby_version = '>= 2.5'
 
-  gem.add_dependency 'simplecov', '>= 0.18.1', '< 0.21.0'
+  gem.add_dependency 'simplecov', '>= 0.18.1', '< 0.22.0'
   gem.add_dependency 'term-ansicolor', '~> 1.6'
   gem.add_dependency 'thor', '>= 0.20.3', '< 2.0'
   gem.add_dependency 'tins', '~> 1.16'
 
   gem.add_development_dependency 'bundler', '>= 1.16', '< 3'
+  gem.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
 end

data/lib/coveralls/configuration.rb

@@ -107,6 +107,7 @@ module Coveralls
 
       def define_service_params_for_gitlab(config)
         config[:service_name]       = 'gitlab-ci'
+        config[:service_number]     = ENV['CI_PIPELINE_ID']
         config[:service_job_number] = ENV['CI_BUILD_NAME']
         config[:service_job_id]     = ENV['CI_BUILD_ID']
         config[:service_branch]     = ENV['CI_BUILD_REF_NAME']
@@ -179,7 +180,7 @@ module Coveralls
           # Remotes
           remotes = nil
           begin
-            remotes = `git remote -v`.split(/\n/).map do |remote|
+            remotes = `git remote -v`.split("\n").map do |remote|
               splits = remote.split.compact
               { name: splits[0], url: splits[1] }
             end.uniq

data/lib/coveralls/simplecov.rb

@@ -45,6 +45,7 @@ module Coveralls
 
           # Get the coverage
           properties[:coverage] = file.coverage_data['lines']
+          properties[:branches] = branches(file.coverage_data['branches']) if file.coverage_data['branches']
 
           # Skip nocov lines
           file.lines.each_with_index do |line, i|
@@ -57,6 +58,19 @@ module Coveralls
         source_files
       end
 
+      def branches(simplecov_branches)
+        branches_properties = []
+        simplecov_branches.each do |branch_data, data|
+          branch_number = 0
+          line_number = branch_data.split(', ')[2].to_i
+          data.each_value do |hits|
+            branch_number += 1
+            branches_properties.concat([line_number, 0, branch_number, hits])
+          end
+        end
+        branches_properties
+      end
+
       def format(result)
         unless Coveralls.should_run?
           display_result result if Coveralls.noisy?

data/lib/coveralls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coveralls
-  VERSION = '0.19.0'
+  VERSION = '0.23.0'
 end

data/spec/coveralls/configuration_spec.rb

@@ -219,9 +219,11 @@ describe Coveralls::Configuration do
     let(:service_job_number) { 'spec:one' }
     let(:service_job_id) { 1234 }
     let(:service_branch) { 'feature' }
+    let(:service_number) { 5678 }
 
     before do
       allow(ENV).to receive(:[]).with('CI_BUILD_NAME').and_return(service_job_number)
+      allow(ENV).to receive(:[]).with('CI_PIPELINE_ID').and_return(service_number)
       allow(ENV).to receive(:[]).with('CI_BUILD_ID').and_return(service_job_id)
       allow(ENV).to receive(:[]).with('CI_BUILD_REF_NAME').and_return(service_branch)
       allow(ENV).to receive(:[]).with('CI_BUILD_REF').and_return(commit_sha)
@@ -231,6 +233,7 @@ describe Coveralls::Configuration do
       config = {}
       described_class.define_service_params_for_gitlab(config)
       expect(config[:service_name]).to eq('gitlab-ci')
+      expect(config[:service_number]).to eq(service_number)
       expect(config[:service_job_number]).to eq(service_job_number)
       expect(config[:service_job_id]).to eq(service_job_id)
       expect(config[:service_branch]).to eq(service_branch)

data/spec/coveralls/coveralls_spec.rb

@@ -80,6 +80,14 @@ describe Coveralls do
   end
 
   describe '#push!' do
+    let(:coverage_hash) do
+      { 'file.rb'=>{ 'lines'=>[nil] } }
+    end
+
+    before do
+      allow(SimpleCov::ResultMerger).to receive(:merge_valid_results).and_return([['RSpec'], coverage_hash])
+    end
+
     it 'sends existing test results' do
       result = false
       silence do

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

@@ -7,4 +7,10 @@ class Foo
   def bar
     @foo
   end
+
+  def foo
+    if @foo
+      'bar'
+    end
+  end
 end

data/spec/coveralls/simple_cov/formatter_spec.rb

@@ -12,13 +12,25 @@ describe Coveralls::SimpleCov::Formatter do
   end
 
   let(:result) do
-    SimpleCov::Result.new(source_fixture('app/controllers/sample.rb') => [nil, 1, 1, 1, nil, 0, 1, 1, nil, nil],
-                          source_fixture('app/models/airplane.rb')    => [0, 0, 0, 0, 0],
-                          source_fixture('app/models/dog.rb')         => [1, 1, 1, 1, 1],
-                          source_fixture('app/models/house.rb')       => [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil],
-                          source_fixture('app/models/robot.rb')       => [1, 1, 1, 1, nil, nil, 1, 0, nil, nil],
-                          source_fixture('app/models/user.rb')        => [nil, 1, 1, 1, 1, 0, 1, 0, nil, nil],
-                          source_fixture('sample.rb')                 => [nil, 1, 1, 1, nil, 0, 1, 1, nil, nil])
+    options = {
+      source_fixture('app/controllers/sample.rb') => { lines: [nil, 1, 1, 1, nil, 0, 1, 1, nil, nil] },
+      source_fixture('app/models/airplane.rb')    => { lines: [0, 0, 0, 0, 0] },
+      source_fixture('app/models/dog.rb')         => { lines: [1, 1, 1, 1, 1] },
+      source_fixture('app/models/house.rb')       => { lines: [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil] },
+      source_fixture('app/models/robot.rb')       => { lines: [1, 1, 1, 1, nil, nil, 1, 0, nil, nil] },
+      source_fixture('app/models/user.rb')        => {
+        lines: [nil, 1, 1, 0, nil, nil, 1, 0, nil, nil, 1, 0, 0, nil, nil, nil],
+        'branches' => {
+          '[:if, 0, 12, 4, 14, 7]' => {
+            '[:then, 1, 13, 6, 13, 11]' => 1,
+            '[:else, 2, 12, 4, 14, 7]'  => 0
+          }
+        }
+      },
+      source_fixture('sample.rb')                 => { lines: [nil, 1, 1, 1, nil, 0, 1, 1, nil, nil] }
+    }
+
+    SimpleCov::Result.new(options)
   end
 
   describe '#format' do
@@ -70,12 +82,38 @@ describe Coveralls::SimpleCov::Formatter do
     end
 
     describe '#get_source_files' do
-      let(:source_files) { described_class.new.get_source_files(result) }
+      let(:source_files) { instance.get_source_files(result) }
+      let(:instance) do
+        described_class.new.tap do |ins|
+          allow(ins).to receive(:branches)
+        end
+      end
 
       it 'nils the skipped lines' do
         source_file = source_files.first
         expect(source_file[:coverage]).to eq [nil, 1, 1, 1, nil, 0, 1, 1, nil, nil, nil, nil, nil]
       end
+
+      it 'calls #branches when branch coverage is present' do
+        source_files
+        expect(instance).to have_received(:branches).once
+      end
+    end
+
+    describe '#branches' do
+      let(:branch_coverage_parsed) { described_class.new.branches(simplecov_branches_results) }
+      let(:simplecov_branches_results) do
+        {
+          '[:if, 0, 12, 4, 14, 7]' => {
+            '[:then, 1, 13, 6, 13, 11]' => 1,
+            '[:else, 2, 12, 4, 14, 7]'  => 0
+          }
+        }
+      end
+
+      it 'return coveralls required structure' do
+        expect(branch_coverage_parsed).to eq [12, 0, 1, 1, 12, 0, 2, 0]
+      end
     end
 
     describe '#short_filename' do

data/spec/spec_helper.rb

@@ -13,11 +13,25 @@ class InceptionFormatter
 end
 
 def setup_formatter
-  SimpleCov.formatter = if ENV['TRAVIS'] || ENV['COVERALLS_REPO_TOKEN']
-                          InceptionFormatter
-                        else
-                          SimpleCov::Formatter::HTMLFormatter
-                        end
+  if ENV['GITHUB_ACTIONS']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+  end
+
+  SimpleCov.formatter =
+    if ENV['CI'] || ENV['COVERALLS_REPO_TOKEN']
+      if ENV['GITHUB_ACTIONS']
+        SimpleCov::Formatter::MultiFormatter.new([InceptionFormatter, SimpleCov::Formatter::LcovFormatter])
+      else
+        InceptionFormatter
+      end
+    else
+      SimpleCov::Formatter::HTMLFormatter
+    end
 
   SimpleCov.start do
     add_filter do |source_file|
@@ -49,15 +63,8 @@ end
 
 def stub_api_post
   body = '{"message":"","url":""}'
-  stub_request(:post, "#{Coveralls::API::API_BASE}/jobs").with(
-    headers: {
-      'Accept'          => '*/*; q=0.5, application/xml',
-      'Accept-Encoding' => 'gzip, deflate',
-      'Content-Length'  => /.+/,
-      'Content-Type'    => /.+/,
-      'User-Agent'      => 'Ruby'
-    }
-  ).to_return(status: 200, body: body, headers: {})
+  stub_request(:post, "#{Coveralls::API::API_BASE}/jobs")
+    .to_return(status: 200, body: body, headers: {})
 end
 
 def silence(&block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls_reborn
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -21,7 +21,7 @@ dependencies:
         version: 0.18.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 0.18.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: A Ruby implementation of the Coveralls API.
 email:
 - nick@lemurheavy.com
@@ -110,10 +124,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -147,7 +163,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/tagliala/coveralls-ruby-reborn/issues
-  changelog_uri: https://github.com/tagliala/coveralls-ruby-reborn/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/tagliala/coveralls-ruby-reborn/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/tagliala/coveralls-ruby-reborn
 post_install_message:
 rdoc_options: []
@@ -157,14 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.

data/.travis.yml

@@ -1,26 +0,0 @@
-os: linux
-dist: bionic
-language: ruby
-
-cache: bundler
-
-env:
-  global:
-    # --dev improves JRuby startup time
-    # --debug reports proper coverage to SimpleCov
-    # See https://github.com/jruby/jruby/wiki/Improving-startup-time
-    - JRUBY_OPTS="--dev --debug"
-
-rvm:
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - ruby-head
-  - jruby-9.2.13.0
-
-jobs:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.2.13.0
-  fast_finish: true