coveralls_reborn 0.22.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55f0c6a60495529b2f17ec669e53349429fe67118650ebbafcd32a39321c0c5c
-  data.tar.gz: 47eef8a83e435e6b91b27f4f121ba025021bbff6bca8d52c1ddf21599244b699
+  metadata.gz: 59cf0bf0bed37f09d99147f9378f01bd64904a61c9f37b0fc22fe9fbb4faf36a
+  data.tar.gz: '0082dd37bc4b95e04cd971e599f014566bc17078174ca3c29c5d65e615f6c2c9'
 SHA512:
-  metadata.gz: 11b1f829d3afccaca4d4dd4048a9618c70adcae02bf7d05cfa50826886646f3a1cd4e18b45ea7804c3bc34325678c27b9520f240d8527e0c9b0c19b3dfd92bb9
-  data.tar.gz: e653bf5519256740d3f1b00d769f227b1ddf04feb3477edc0e61f64bfcc60006509ee376b46a36247bb60efeb06936d193aa3690dde9d859da9d6856280543ed
+  metadata.gz: 25ff04c1efe1e2889d56feae2960f02609c3a8b857717bfbcc061b413303861b68994827a1f881c377ee4fdfac51e4a282e4ffb6ec3306adba9c8f60c631d0b9
+  data.tar.gz: 10207daf744bb396ba7e1a4d4059e0b0987d28ed7805d615d45321591f17436b55a2d8d7e7978bc92992a828a15cce6276387fa1bd020b9c6c8f980da4f6897e

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,14 @@
 # Changelog
 
+## 0.23.1 / 2021-11-15
+
+* [ENHANCEMENT] Require MFA to publish gems
+* [ENHANCEMENT] Update development dependencies
+
+## 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

data/Gemfile

@@ -6,7 +6,7 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :jruby do
-  gem 'jruby-openssl', '~> 0.10.2'
+  gem 'jruby-openssl', '~> 0.11.0'
 end
 
 gem 'byebug', '~> 11.1', platforms: %i[mri mingw x64_mingw]
@@ -14,10 +14,10 @@ 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.13'
-gem 'rubocop-performance', '~> 1.11'
-gem 'rubocop-rake', '~> 0.5.1'
-gem 'rubocop-rspec', '~> 2.2'
+gem 'rubocop', '~> 1.23'
+gem 'rubocop-performance', '~> 1.12'
+gem 'rubocop-rake', '~> 0.6.0'
+gem 'rubocop-rspec', '~> 2.6'
 gem 'truthy', '~> 1.0'
 gem 'vcr', '~> 6.0'
-gem 'webmock', '~> 3.12'
+gem 'webmock', '~> 3.14'

data/README.md

@@ -1,11 +1,46 @@
-# [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://secure.travis-ci.org/tagliala/coveralls-ruby-reborn.svg?branch=main)](https://travis-ci.org/tagliala/coveralls-ruby-reborn) [![Gem Version](https://badge.fury.io/rb/coveralls_reborn.svg)](https://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)
+### [Read the docs →](https://docs.coveralls.io/ruby-and-rails)
 
 An up-to-date fork of [lemurheavy/coveralls-ruby](https://github.com/lemurheavy/coveralls-ruby)
 
 Add to your `Gemfile`:
 
 ```rb
-gem 'coveralls_reborn', '~> 0.22.0', require: false
+gem 'coveralls_reborn', '~> 0.23.1', 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

@@ -19,6 +19,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Coveralls::VERSION
 
+  gem.metadata['rubygems_mfa_required'] = 'true'
+
   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/main/CHANGELOG.md'
   gem.metadata['source_code_uri'] = 'https://github.com/tagliala/coveralls-ruby-reborn'
@@ -31,4 +33,5 @@ Gem::Specification.new do |gem|
   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/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.22.0'
+  VERSION = '0.23.1'
 end

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

@@ -18,7 +18,15 @@ describe Coveralls::SimpleCov::Formatter do
       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, 1, 1, 0, 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] }
     }
 
@@ -74,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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls_reborn
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -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
@@ -111,10 +125,11 @@ 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,6 +162,7 @@ homepage: https://coveralls.io
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/tagliala/coveralls-ruby-reborn/issues
   changelog_uri: https://github.com/tagliala/coveralls-ruby-reborn/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/tagliala/coveralls-ruby-reborn

data/.travis.yml

@@ -1,33 +0,0 @@
-os: linux
-dist: focal
-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.5.9
-  - 2.6.7
-  - 2.7.3
-  - 3.0.1
-  - ruby-head
-  - jruby-9.2.17.0
-
-jobs:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.2.17.0
-  include:
-    - rvm: 2.5.9
-      gemfile: Gemfile
-      script: bundle exec rake rubocop
-      name: RuboCop
-  fast_finish: true
-
-script: bundle exec rake spec