coveralls_reborn 0.17.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e597f0d8aa56b69519be43917d05b4ba6f2d2401d4f493c6a8dc00e90deba3
-  data.tar.gz: 41f4c4f82f4a0dbd6140fd2585cd280710f78d39fa3fa62300832df8ed1a0c48
+  metadata.gz: 55f0c6a60495529b2f17ec669e53349429fe67118650ebbafcd32a39321c0c5c
+  data.tar.gz: 47eef8a83e435e6b91b27f4f121ba025021bbff6bca8d52c1ddf21599244b699
 SHA512:
-  metadata.gz: 8c15cd369a3e020c4a1dc928cf2fd68ce154f1d5837cd0952305ec559aeeacabceeed516f5168bcbc4a55fe286af0afbfadcbfa78391854dcd00dc46e063bd05
-  data.tar.gz: fff07f460d21d7a768c86855ffb12c46f03da073605dbc3c6563b9c8c5c40d1624f124737ba0ee26ba0fd5c0a45da325879bf40bc097e2b5d5cea0cc3b55dfd5
+  metadata.gz: 11b1f829d3afccaca4d4dd4048a9618c70adcae02bf7d05cfa50826886646f3a1cd4e18b45ea7804c3bc34325678c27b9520f240d8527e0c9b0c19b3dfd92bb9
+  data.tar.gz: e653bf5519256740d3f1b00d769f227b1ddf04feb3477edc0e61f64bfcc60006509ee376b46a36247bb60efeb06936d193aa3690dde9d859da9d6856280543ed

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/.rubocop.yml

@@ -1,9 +1,9 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
   NewCops: enable
   Exclude:
     - 'spec/coveralls/fixtures/**/*'

data/.travis.yml

@@ -1,5 +1,5 @@
 os: linux
-dist: bionic
+dist: focal
 language: ruby
 
 cache: bundler
@@ -12,15 +12,22 @@ env:
     - JRUBY_OPTS="--dev --debug"
 
 rvm:
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
   - ruby-head
-  - jruby-9.2.13.0
+  - jruby-9.2.17.0
 
 jobs:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.2.13.0
+    - 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

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 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
+
+## 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

data/Gemfile

@@ -9,19 +9,15 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.10.2'
 end
 
-group :development do
-  gem 'rake', '~> 13.0'
-  gem 'rspec', '~> 3.9'
-  gem 'rubocop', '~> 0.89.1'
-  gem 'rubocop-performance', '~> 1.7'
-  gem 'rubocop-rspec', '~> 1.43'
-  gem 'truthy', '~> 1.0'
-  gem 'vcr', '~> 6.0'
-  gem 'webmock', '~> 3.8'
-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.13'
+gem 'rubocop-performance', '~> 1.11'
+gem 'rubocop-rake', '~> 0.5.1'
+gem 'rubocop-rspec', '~> 2.2'
+gem 'truthy', '~> 1.0'
+gem 'vcr', '~> 6.0'
+gem 'webmock', '~> 3.12'

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.22.0', require: false
 ```

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.required_ruby_version = '>= 2.5'
 
-  gem.add_dependency 'simplecov', '>= 0.18.1', '< 0.20.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'

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

@@ -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/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.17.0'
+  VERSION = '0.22.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

@@ -49,15 +49,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.17.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2021-04-30 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.20.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.20.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -147,7 +148,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 +158,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.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.