coveralls_reborn 0.16.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a3758b2989d5af5c2ff847faa5b031b847a1053a9477b6ef8b62b37b879be49
-  data.tar.gz: 162ff35df0510a7d1e9930902cedf6fa56a5dbf01ebc8cd29b81340bb3947e30
+  metadata.gz: c4d2232d246fa476a22bc9b22b6702827217349cac6346dc4b2bc897f5026c7b
+  data.tar.gz: 3a9b37d0b32c72d0274eac25600e8be10045750c8aad86083020ea11c33304c9
 SHA512:
-  metadata.gz: c9f3ca07822602da301f123d18481c78bd43bf55bbed8dd3e4796c05e559956d8d3b400639258787fbeaaf739932eb438569090832c9f9aec86554a44c5a0042
-  data.tar.gz: ae3c50bb4a0df905536b514673eb32b217e9e35d3205d5414488888b23c887232f26b30d640cd2ea7a41fce8559af251571a541352ee98901118b075ca7627ff
+  metadata.gz: f651a78973c282ceb95dd9380c5a6b7a4bae9656499a07f050ce21aee41e2709df8d2cadb77f49b262eb9ae3b1cb57c5e03b52e7e30d4b66995b3eeb3ff4bf4a
+  data.tar.gz: a0aa913d9d888409197f9981df67d1c62e63e315888c2d98292fe71de4077afa9e2253ad8cbe723aab8afd6dbbfd74f1385420d8eb9f63422a2a2b63766df94e

data/.rubocop.yml

@@ -1,9 +1,9 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
   NewCops: enable
   Exclude:
     - 'spec/coveralls/fixtures/**/*'
@@ -17,7 +17,7 @@ Layout/LineLength:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 39.29
+  Max: 44.11
 
 Metrics/CyclomaticComplexity:
   Max: 19
@@ -43,6 +43,9 @@ RSpec/ExampleLength:
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 RSpec/NestedGroups:
   Max: 4
 

data/.travis.yml

@@ -1,5 +1,5 @@
 os: linux
-dist: bionic
+dist: focal
 language: ruby
 
 cache: bundler
@@ -15,12 +15,13 @@ rvm:
   - 2.4.10
   - 2.5.8
   - 2.6.6
-  - 2.7.1
+  - 2.7.2
+  - 3.0.0
   - ruby-head
-  - jruby-9.2.11.1
+  - jruby-9.2.16.0
 
 jobs:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.2.11.1
+    - rvm: jruby-9.2.16.0
   fast_finish: true

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 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
+
+## 0.18.0 / 2020-09-07
+
+* [ENHANCEMENT] Refactor HTTP client [#10](https://github.com/tagliala/coveralls-ruby-reborn/pull/10)
+* [ENHANCEMENT] Update dependencies
+
+## 0.17.0 / 2020-08-26
+
+* [FEATURE] Add SimpleCov 0.19.0 compatibility
+* [ENHANCEMENT] Update dependencies
+
 ## 0.16.0 / 2020-04-30
 
 * [FEATURE] Remove dependency on json gem [#4](https://github.com/tagliala/coveralls-ruby-reborn/pull/4)

data/Gemfile

@@ -11,13 +11,14 @@ end
 
 group :development do
   gem 'rake', '~> 13.0'
-  gem 'rspec', '~> 3.9'
-  gem 'rubocop', '~> 0.82.0'
-  gem 'rubocop-performance', '~> 1.5'
-  gem 'rubocop-rspec', '~> 1.38'
+  gem 'rspec', '~> 3.10'
+  gem 'rubocop', '~> 1.11'
+  gem 'rubocop-performance', '~> 1.10'
+  gem 'rubocop-rake', '~> 0.5.1'
+  gem 'rubocop-rspec', '~> 2.2'
   gem 'truthy', '~> 1.0'
-  gem 'vcr', '~> 5.1'
-  gem 'webmock', '~> 3.8'
+  gem 'vcr', '~> 6.0'
+  gem 'webmock', '~> 3.12'
 end
 
 group :development, :test do

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://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)
 
 ### [Read the docs →](https://docs.coveralls.io/ruby-on-rails)
 
@@ -7,5 +7,5 @@ An up-to-date fork of [lemurheavy/coveralls-ruby](https://github.com/lemurheavy/
 Add to your `Gemfile`:
 
 ```rb
-gem 'coveralls_reborn', '~> 0.16.0', require: false
+gem 'coveralls_reborn', '~> 0.21.0', require: false
 ```

data/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'

data/bin/coveralls

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'coveralls'

data/coveralls-ruby.gemspec

@@ -20,12 +20,12 @@ 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.add_dependency 'simplecov', '~> 0.18.1'
+  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'

data/lib/coveralls.rb

@@ -66,7 +66,7 @@ module Coveralls
 
     if simplecov_setting
       Coveralls::Output.puts("[Coveralls] Using SimpleCov's '#{simplecov_setting}' settings.", color: 'green')
-      if block_given?
+      if block
         ::SimpleCov.start(simplecov_setting) { instance_eval(&block) }
       else
         ::SimpleCov.start(simplecov_setting)

data/lib/coveralls/api.rb

@@ -53,9 +53,9 @@ module Coveralls
         begin
           require 'webmock'
 
-          allow = WebMock::Config.instance.allow || []
-          WebMock::Config.instance.allow = [*allow].push API_HOST
-        rescue LoadError # rubocop:disable Lint/SuppressedException
+          allow = Array(WebMock::Config.instance.allow)
+          WebMock::Config.instance.allow = allow.push API_HOST
+        rescue LoadError
         rescue StandardError => e
           # TODO: Add error action
           puts e.message
@@ -67,7 +67,7 @@ module Coveralls
           VCR.send(VCR.version.major < 2 ? :config : :configure) do |c|
             c.ignore_hosts API_HOST
           end
-        rescue LoadError # rubocop:disable Lint/SuppressedException
+        rescue LoadError
         rescue StandardError => e
           # TODO: Add error action
           puts e.message
@@ -80,15 +80,7 @@ module Coveralls
 
       def build_client(uri)
         client = Net::HTTP.new(uri.host, uri.port)
-        client.use_ssl = true if uri.port == 443
-        client.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-        unless client.respond_to?(:ssl_version=)
-          Net::HTTP.ssl_context_accessor('ssl_version')
-        end
-
-        client.ssl_version = 'TLSv1'
-
+        client.use_ssl = uri.port == 443
         client
       end
 

data/lib/coveralls/command.rb

@@ -13,10 +13,10 @@ module Coveralls
 
       if File.exist?('.travis.yml')
         cmds = begin
-                 YAML.load_file('.travis.yml')['script'] || cmds
-               rescue StandardError
-                 cmds
-               end
+          YAML.load_file('.travis.yml')['script'] || cmds
+        rescue StandardError
+          cmds
+        end
       end
 
       cmds.each { |cmd| system cmd }

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,8 +180,8 @@ module Coveralls
           # Remotes
           remotes = nil
           begin
-            remotes = `git remote -v`.split(/\n/).map do |remote|
-              splits = remote.split(' ').compact
+            remotes = `git remote -v`.split("\n").map do |remote|
+              splits = remote.split.compact
               { name: splits[0], url: splits[1] }
             end.uniq
           rescue StandardError => e
@@ -199,14 +200,14 @@ module Coveralls
       end
 
       def relevant_env
-        hash = {
+        base_env = {
           pwd:            pwd,
           rails_root:     rails_root,
           simplecov_root: simplecov_root,
           gem_version:    VERSION
         }
 
-        hash.merge! begin
+        service_env =
           if ENV['TRAVIS']
             travis_env_hash
           elsif ENV['CIRCLECI']
@@ -218,9 +219,8 @@ module Coveralls
           else
             {}
           end
-        end
 
-        hash
+        base_env.merge! service_env
       end
 
       private

data/lib/coveralls/rake/task.rb

@@ -7,7 +7,7 @@ module Coveralls
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    def initialize(*_args)
+    def initialize(*_args) # rubocop:disable Lint/MissingSuper
       namespace :coveralls do
         desc 'Push latest coverage results to Coveralls.io'
         task :push do

data/lib/coveralls/simplecov.rb

@@ -7,10 +7,10 @@ module Coveralls
     class Formatter
       def display_result(result)
         # Log which files would be submitted.
-        if !result.files.empty?
-          Coveralls::Output.puts '[Coveralls] Some handy coverage stats:'
-        else
+        if result.files.empty?
           Coveralls::Output.puts '[Coveralls] There are no covered files.', color: 'yellow'
+        else
+          Coveralls::Output.puts '[Coveralls] Some handy coverage stats:'
         end
 
         result.files.each do |f|
@@ -95,10 +95,10 @@ module Coveralls
 
       def output_message(result)
         "Coverage is at #{begin
-                            result.covered_percent.round(2)
-                          rescue StandardError
-                            result.covered_percent.round
-                          end}%.\nCoverage report sent to Coveralls."
+          result.covered_percent.round(2)
+        rescue StandardError
+          result.covered_percent.round
+        end}%.\nCoverage report sent to Coveralls."
       end
 
       def short_filename(filename)

data/lib/coveralls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coveralls
-  VERSION = '0.16.0'
+  VERSION = '0.21.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
@@ -91,12 +99,12 @@ describe Coveralls do
 
   describe '#setup!' do
     it 'sets SimpleCov adapter' do
-      # rubocop:disable RSpec/LeakyConstantDeclaration
+      # rubocop:disable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
       SimpleCovTmp = SimpleCov
       Object.send :remove_const, :SimpleCov
       silence { described_class.setup! }
       SimpleCov = SimpleCovTmp
-      # rubocop:enable RSpec/LeakyConstantDeclaration
+      # rubocop:enable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
     end
   end
 end

data/spec/coveralls/simple_cov/formatter_spec.rb

@@ -12,13 +12,17 @@ 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, 1, 1, 0, 1, 0, nil, nil] },
+      source_fixture('sample.rb')                 => { lines: [nil, 1, 1, 1, nil, 0, 1, 1, nil, nil] }
+    }
+
+    SimpleCov::Result.new(options)
   end
 
   describe '#format' do

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ def setup_formatter
 
   SimpleCov.start do
     add_filter do |source_file|
-      source_file.filename =~ /spec/ && source_file.filename !~ /fixture/
+      source_file.filename.include?('spec') && !source_file.filename.include?('fixture')
     end
     add_filter %r{/.bundle/}
   end
@@ -49,23 +49,14 @@ 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
+def silence(&block)
   return yield if ENV['silence'] == 'false'
 
-  silence_stream(STDOUT) do
-    yield
-  end
+  silence_stream($stdout, &block)
 end
 
 def silence_stream(stream)

metadata

@@ -1,38 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: coveralls_reborn
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Nick Merwin
 - Wil Gieseler
 - Geremia Taglialatela
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  name: simplecov
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+  name: term-ansicolor
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,7 +47,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -50,6 +55,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+  name: thor
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,12 +67,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: tins
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+  name: tins
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +81,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,6 +89,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+  name: bundler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,9 +147,9 @@ 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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.
 test_files: