coveralls_reborn 0.23.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59cf0bf0bed37f09d99147f9378f01bd64904a61c9f37b0fc22fe9fbb4faf36a
-  data.tar.gz: '0082dd37bc4b95e04cd971e599f014566bc17078174ca3c29c5d65e615f6c2c9'
+  metadata.gz: 2f00e319a2e891af3bd8577ba9dd1ea88117b686562ba6332134aafffffd65b2
+  data.tar.gz: cca9cae70a90f4342594db68d91b7be0080ccbf534f00f9e6276ef99980f28ed
 SHA512:
-  metadata.gz: 25ff04c1efe1e2889d56feae2960f02609c3a8b857717bfbcc061b413303861b68994827a1f881c377ee4fdfac51e4a282e4ffb6ec3306adba9c8f60c631d0b9
-  data.tar.gz: 10207daf744bb396ba7e1a4d4059e0b0987d28ed7805d615d45321591f17436b55a2d8d7e7978bc92992a828a15cce6276387fa1bd020b9c6c8f980da4f6897e
+  metadata.gz: efd993c1e74eaeb537eb6d081f632706f17fcfe86e1c0ed8cc45efa70862eafa5acac96732929a9a7aabdfa28c2fca104d980210696aa3aef4b2f250baedb32c
+  data.tar.gz: d1ce6ca63c6aee73c63830e80a3a8dc942eb8500429e80fcc453a35aa35ca5eba75d8a6798bbf75b794398781b5581dec18b2040c490e5bf1779a4456fde527c

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1']
         experimental: [false]
 
         include:

data/.rubocop.yml

@@ -38,7 +38,7 @@ Metrics/ModuleLength:
     - 'spec/**/*'
 
 RSpec/ExampleLength:
-  Max: 8
+  Max: 10
 
 RSpec/MultipleExpectations:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.24.0 / 2022-03-11
+
+* [ENHANCEMENT] Test against Ruby 3.1
+* [BUGFIX] Fix Circle CI configuration [#30](https://github.com/tagliala/coveralls-ruby-reborn/issues/30)
+* [BUGFIX] Fix Semaphore CI configuration [#34](https://github.com/tagliala/coveralls-ruby-reborn/pull/34)
+
 ## 0.23.1 / 2021-11-15
 
 * [ENHANCEMENT] Require MFA to publish gems
@@ -7,7 +13,7 @@
 
 ## 0.23.0 / 2021-09-12
 
-* [FEATURE] Send branches coverage [#27](https://github.com/tagliala/coveralls-ruby-reborn/pull/27/files)
+* [FEATURE] Send branches coverage [#27](https://github.com/tagliala/coveralls-ruby-reborn/pull/27)
 
 ## 0.22.0 / 2021-04-30
 

data/Gemfile

@@ -9,15 +9,12 @@ platforms :jruby do
   gem 'jruby-openssl', '~> 0.11.0'
 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.23'
-gem 'rubocop-performance', '~> 1.12'
+gem 'rspec', '~> 3.11'
+gem 'rubocop', '~> 1.26'
+gem 'rubocop-performance', '~> 1.13'
 gem 'rubocop-rake', '~> 0.6.0'
-gem 'rubocop-rspec', '~> 2.6'
+gem 'rubocop-rspec', '~> 2.9'
 gem 'truthy', '~> 1.0'
-gem 'vcr', '~> 6.0'
+gem 'vcr', '~> 6.0', github: 'vcr/vcr', ref: '9bb8d2c6f81a6720082a6db86ee11f4b82685d63' # TODO: revert to stable when Ruby 3.1 will be supported
 gem 'webmock', '~> 3.14'

data/README.md

@@ -7,7 +7,7 @@ An up-to-date fork of [lemurheavy/coveralls-ruby](https://github.com/lemurheavy/
 Add to your `Gemfile`:
 
 ```rb
-gem 'coveralls_reborn', '~> 0.23.1', require: false
+gem 'coveralls_reborn', '~> 0.24.0', require: false
 ```
 
 ### GitHub Actions

data/lib/coveralls/configuration.rb

@@ -68,16 +68,17 @@ module Coveralls
 
       def define_service_params_for_circleci(config)
         config[:service_name]         = 'circleci'
-        config[:service_number]       = ENV['CIRCLE_BUILD_NUM']
-        config[:service_pull_request] = (ENV['CI_PULL_REQUEST'] || '')[/(\d+)$/, 1]
-        config[:parallel]             = ENV['CIRCLE_NODE_TOTAL'].to_i > 1
-        config[:service_job_number]   = ENV['CIRCLE_NODE_INDEX']
+        config[:service_number]       = ENV['CIRCLE_WORKFLOW_ID']
+        config[:service_pull_request] = ENV['CI_PULL_REQUEST'].split('/pull/')[1] unless ENV['CI_PULL_REQUEST'].nil?
+        config[:service_job_number]   = ENV['CIRCLE_BUILD_NUM']
+        config[:git_commit]           = ENV['CIRCLE_SHA1']
+        config[:git_branch]           = ENV['CIRCLE_BRANCH']
       end
 
       def define_service_params_for_semaphore(config)
         config[:service_name]         = 'semaphore'
-        config[:service_number]       = ENV['SEMAPHORE_BUILD_NUMBER']
-        config[:service_pull_request] = ENV['PULL_REQUEST_NUMBER']
+        config[:service_number]       = ENV['SEMAPHORE_WORKFLOW_ID']
+        config[:service_branch]       = ENV['SEMAPHORE_GIT_BRANCH']
       end
 
       def define_service_params_for_jenkins(config)

data/lib/coveralls/version.rb

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

data/spec/coveralls/configuration_spec.rb

@@ -200,17 +200,31 @@ describe Coveralls::Configuration do
   end
 
   describe '.define_service_params_for_circleci' do
+    let(:circle_workflow_id) { 1234 }
+    let(:ci_pull_request) { 'repo/pull/12' }
     let(:circle_build_num) { SecureRandom.hex(4) }
+    let(:circle_sha1) { SecureRandom.hex(32) }
+    let(:circle_branch) { SecureRandom.hex(4) }
 
     before do
+      allow(ENV).to receive(:[]).with('CIRCLE_WORKFLOW_ID').and_return(circle_workflow_id)
+      allow(ENV).to receive(:[]).with('CI_PULL_REQUEST').and_return(ci_pull_request)
       allow(ENV).to receive(:[]).with('CIRCLE_BUILD_NUM').and_return(circle_build_num)
+      allow(ENV).to receive(:[]).with('CIRCLE_SHA1').and_return(circle_sha1)
+      allow(ENV).to receive(:[]).with('CIRCLE_BRANCH').and_return(circle_branch)
     end
 
     it 'sets the expected parameters' do
       config = {}
       described_class.define_service_params_for_circleci(config)
-      expect(config[:service_name]).to eq('circleci')
-      expect(config[:service_number]).to eq(circle_build_num)
+      expect(config).to include(
+        service_name:         'circleci',
+        service_number:       circle_workflow_id,
+        service_pull_request: '12',
+        service_job_number:   circle_build_num,
+        git_commit:           circle_sha1,
+        git_branch:           circle_branch
+      )
     end
   end
 
@@ -232,27 +246,34 @@ describe Coveralls::Configuration do
     it 'sets the expected parameters' 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)
-      expect(config[:commit_sha]).to eq(commit_sha)
+      expect(config).to include(
+        service_name:       'gitlab-ci',
+        service_number:     service_number,
+        service_job_number: service_job_number,
+        service_job_id:     service_job_id,
+        service_branch:     service_branch,
+        commit_sha:         commit_sha
+      )
     end
   end
 
   describe '.define_service_params_for_semaphore' do
-    let(:semaphore_build_num) { SecureRandom.hex(4) }
+    let(:semaphore_workflow_id) { 1234 }
+    let(:semaphore_git_branch) { 'a-branch' }
 
     before do
-      allow(ENV).to receive(:[]).with('SEMAPHORE_BUILD_NUMBER').and_return(semaphore_build_num)
+      allow(ENV).to receive(:[]).with('SEMAPHORE_WORKFLOW_ID').and_return(semaphore_workflow_id)
+      allow(ENV).to receive(:[]).with('SEMAPHORE_GIT_BRANCH').and_return(semaphore_git_branch)
     end
 
     it 'sets the expected parameters' do
       config = {}
       described_class.define_service_params_for_semaphore(config)
-      expect(config[:service_name]).to eq('semaphore')
-      expect(config[:service_number]).to eq(semaphore_build_num)
+      expect(config).to include(
+        service_name:   'semaphore',
+        service_number: semaphore_workflow_id,
+        service_branch: semaphore_git_branch
+      )
     end
   end
 
@@ -267,11 +288,13 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.define_service_params_for_jenkins(config)
-      described_class.define_standard_service_params_for_generic_ci(config)
-      expect(config[:service_name]).to eq('jenkins')
-      expect(config[:service_number]).to eq(build_num)
-      expect(config[:service_pull_request]).to eq(service_pull_request)
+      described_class.define_service_params_for_jenkins config
+      described_class.define_standard_service_params_for_generic_ci config
+      expect(config).to include(
+        service_name:         'jenkins',
+        service_number:       build_num,
+        service_pull_request: service_pull_request
+      )
     end
   end
 
@@ -279,9 +302,11 @@ describe Coveralls::Configuration do
     it 'sets the expected parameters' do
       config = {}
       described_class.define_service_params_for_coveralls_local(config)
-      expect(config[:service_name]).to eq('coveralls-ruby')
-      expect(config[:service_job_id]).to be_nil
-      expect(config[:service_event_type]).to eq('manual')
+      expect(config).to include(
+        service_name:       'coveralls-ruby',
+        service_job_id:     nil,
+        service_event_type: 'manual'
+      )
     end
   end
 
@@ -303,11 +328,13 @@ describe Coveralls::Configuration do
     it 'sets the expected parameters' do
       config = {}
       described_class.define_standard_service_params_for_generic_ci(config)
-      expect(config[:service_name]).to eq(service_name)
-      expect(config[:service_number]).to eq(service_number)
-      expect(config[:service_build_url]).to eq(service_build_url)
-      expect(config[:service_branch]).to eq(service_branch)
-      expect(config[:service_pull_request]).to eq(service_pull_request)
+      expect(config).to include(
+        service_name:         service_name,
+        service_number:       service_number,
+        service_build_url:    service_build_url,
+        service_branch:       service_branch,
+        service_pull_request: service_pull_request
+      )
     end
   end
 
@@ -327,11 +354,13 @@ describe Coveralls::Configuration do
     it 'sets the expected parameters' do
       config = {}
       described_class.define_service_params_for_appveyor(config)
-      expect(config[:service_name]).to eq('appveyor')
-      expect(config[:service_number]).to eq(service_number)
-      expect(config[:service_branch]).to eq(service_branch)
-      expect(config[:commit_sha]).to eq(commit_sha)
-      expect(config[:service_build_url]).to eq(format('https://ci.appveyor.com/project/%<repo_name>s/build/%<service_number>s', repo_name: repo_name, service_number: service_number))
+      expect(config).to include(
+        service_name:      'appveyor',
+        service_number:    service_number,
+        service_branch:    service_branch,
+        commit_sha:        commit_sha,
+        service_build_url: format('https://ci.appveyor.com/project/%<repo_name>s/build/%<service_number>s', repo_name: repo_name, service_number: service_number)
+      )
     end
   end
 
@@ -351,12 +380,14 @@ describe Coveralls::Configuration do
     it 'sets the expected parameters' do
       config = {}
       described_class.define_service_params_for_tddium(config)
-      expect(config[:service_name]).to eq('tddium')
-      expect(config[:service_number]).to eq(service_number)
-      expect(config[:service_job_number]).to eq(service_job_number)
-      expect(config[:service_pull_request]).to eq(service_pull_request)
-      expect(config[:service_branch]).to eq(service_branch)
-      expect(config[:service_build_url]).to eq(format('https://ci.solanolabs.com/reports/%<service_number>s', service_number: service_number))
+      expect(config).to include(
+        service_name:         'tddium',
+        service_number:       service_number,
+        service_job_number:   service_job_number,
+        service_pull_request: service_pull_request,
+        service_branch:       service_branch,
+        service_build_url:    format('https://ci.solanolabs.com/reports/%<service_number>s', service_number: service_number)
+      )
     end
   end
 
@@ -381,13 +412,15 @@ describe Coveralls::Configuration do
 
     it 'uses ENV vars' do
       config = described_class.git
-      expect(config[:head][:id]).to eq(git_id)
-      expect(config[:head][:author_name]).to eq(author_name)
-      expect(config[:head][:author_email]).to eq(author_email)
-      expect(config[:head][:committer_name]).to eq(committer_name)
-      expect(config[:head][:committer_email]).to eq(committer_email)
-      expect(config[:head][:message]).to eq(message)
       expect(config[:branch]).to eq(branch)
+      expect(config[:head]).to include(
+        id:              git_id,
+        author_name:     author_name,
+        author_email:    author_email,
+        committer_name:  committer_name,
+        committer_email: committer_email,
+        message:         message
+      )
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ require 'simplecov'
 require 'webmock'
 require 'vcr'
 
-require 'pry'
-
 class InceptionFormatter
   def format(result)
     Coveralls::SimpleCov::Formatter.new.format(result)
@@ -32,17 +30,18 @@ def setup_formatter
     else
       SimpleCov::Formatter::HTMLFormatter
     end
-
-  SimpleCov.start do
-    add_filter do |source_file|
-      source_file.filename.include?('spec') && !source_file.filename.include?('fixture')
-    end
-    add_filter %r{/.bundle/}
-  end
 end
 
 setup_formatter
 
+SimpleCov.start do
+  add_filter do |source_file|
+    source_file.filename.include?('spec') && !source_file.filename.include?('fixture')
+  end
+  add_filter %r{/.bundle/}
+end
+
+# Leave this require after SimpleCov.start
 require 'coveralls'
 
 VCR.configure do |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls_reborn
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.