coveralls_reborn 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d60acce3dea2248f73864689d5ad1fdfda5da46bb17b9666bf8bb94b911b070
-  data.tar.gz: 5c235845bb44951d9a53961aa6a9e4cd3dbed865d3d54d7bd3d7f5e1b7b535d6
+  metadata.gz: e66521d64ebaa51f54a9315ca83e619681c931bea2f8abf7c278014d96fb3aa7
+  data.tar.gz: 87f24915f01916f256d3b16797ab73cfb703aea5dcbbdaaa195172868fdf4d91
 SHA512:
-  metadata.gz: 52c45871f2b938204024cc0479d2663a49818fd4a675cf56b315a767576658663c32beb136d9ac30a5bb853ff97bc434f8f9ca621a5d420d9e4719c2d5e139ab
-  data.tar.gz: ca395d514b29d860a8462847cfc20419e5ae0300b964d9d51491e55f046cd0b6cb5f5bc651036ffc2b48a7ad2bfb8c93bc69f3997fab5879c58c20810e81405c
+  metadata.gz: 968918385b2a4f1fdbc5f1285d4e8846c91cb0c936daa6eab7c8a0cc99156c1b1c9032e4b32b0fd417986558e124e3b9b3e92a2f16d0ef11a540d8b716c6e832
+  data.tar.gz: 378d8e9ee67dbb76016136fef7d09331252a55e7e2edce5d26c308a089014573c768f35a6bd230aea109db82e858f12bbc9e9833cfa3822ede93cc823384b97b

data/.github/workflows/rubocop.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby-version: ['2.5']
+        ruby-version: ['3.1']
 
     steps:
     - uses: actions/checkout@v2

data/.github/workflows/ruby.yml

@@ -12,13 +12,13 @@ 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:
           - ruby-version: 'head'
             experimental: true
-          - ruby-version: 'jruby-9.2'
+          - ruby-version: 'jruby-9.3'
             experimental: true
 
     continue-on-error: ${{ matrix.experimental }}

data/.rubocop.yml

@@ -5,6 +5,7 @@ require:
 
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.5
   Exclude:
     - 'spec/coveralls/fixtures/**/*'
     - 'vendor/bundle/**/*'
@@ -38,7 +39,7 @@ Metrics/ModuleLength:
     - 'spec/**/*'
 
 RSpec/ExampleLength:
-  Max: 8
+  Max: 10
 
 RSpec/MultipleExpectations:
   Enabled: false
@@ -52,5 +53,8 @@ RSpec/NestedGroups:
 Style/Documentation:
   Enabled: false
 
+Style/FetchEnvVar:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false

data/CHANGELOG.md

@@ -1,8 +1,25 @@
 # Changelog
 
+## 0.25.0 / 2022-08-05
+
+* [ENHANCEMENT] Bump `jruby-openssl` requirement to `0.14.0` [#39](https://github.com/tagliala/coveralls-ruby-reborn/pull/39)
+* [ENHANCEMENT] Improve Semaphore CI support [#37](https://github.com/tagliala/coveralls-ruby-reborn/pull/37) [#38](https://github.com/tagliala/coveralls-ruby-reborn/pull/38)
+* [ENHANCEMENT] Test against JRuby 9.3 [#36](https://github.com/tagliala/coveralls-ruby-reborn/pull/36)
+
+## 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
+* [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)
+* [FEATURE] Send branches coverage [#27](https://github.com/tagliala/coveralls-ruby-reborn/pull/27)
 
 ## 0.22.0 / 2021-04-30
 

data/Gemfile

@@ -6,18 +6,15 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :jruby do
-  gem 'jruby-openssl', '~> 0.10.2'
+  gem 'jruby-openssl', '~> 0.14.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.20'
-gem 'rubocop-performance', '~> 1.11'
+gem 'rspec', '~> 3.11'
+gem 'rubocop', '~> 1.26'
+gem 'rubocop-performance', '~> 1.13'
 gem 'rubocop-rake', '~> 0.6.0'
-gem 'rubocop-rspec', '~> 2.4'
+gem 'rubocop-rspec', '~> 2.9'
 gem 'truthy', '~> 1.0'
 gem 'vcr', '~> 6.0'
 gem 'webmock', '~> 3.14'

data/README.md

@@ -1,13 +1,13 @@
 # [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.23.0', require: false
+gem 'coveralls_reborn', '~> 0.25.0', require: false
 ```
 
 ### GitHub Actions

data/coveralls-ruby.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'coveralls_reborn'
   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'

data/lib/coveralls/configuration.rb

@@ -68,16 +68,20 @@ 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_job_id]       = ENV['SEMAPHORE_JOB_ID']
+        config[:service_build_url]    = "#{ENV['SEMAPHORE_ORGANIZATION_URL']}/jobs/#{ENV['SEMAPHORE_JOB_ID']}"
+        config[:service_branch]       = ENV['SEMAPHORE_GIT_WORKING_BRANCH']
+        config[:service_pull_request] = ENV['SEMAPHORE_GIT_PR_NUMBER']
       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.0'
+  VERSION = '0.25.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,43 @@ 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_pr_number) { 10 }
+    let(:semaphore_git_working_branch) { 'pr-branch' }
+    let(:semaphore_job_id) { 5678 }
+    let(:semaphore_organization_url) { 'an-organization' }
 
     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_PR_NUMBER').and_return(semaphore_git_pr_number)
+      allow(ENV).to receive(:[]).with('SEMAPHORE_GIT_WORKING_BRANCH').and_return(semaphore_git_working_branch)
+      allow(ENV).to receive(:[]).with('SEMAPHORE_JOB_ID').and_return(semaphore_job_id)
+      allow(ENV).to receive(:[]).with('SEMAPHORE_ORGANIZATION_URL').and_return(semaphore_organization_url)
     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_job_id:       semaphore_job_id,
+        service_build_url:    "#{semaphore_organization_url}/jobs/#{semaphore_job_id}",
+        service_branch:       semaphore_git_working_branch,
+        service_pull_request: semaphore_git_pr_number
+      )
     end
   end
 
@@ -267,11 +297,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 +311,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 +337,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 +363,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 +389,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 +421,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.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -162,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
@@ -180,21 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.
-test_files:
-- spec/coveralls/configuration_spec.rb
-- spec/coveralls/coveralls_spec.rb
-- spec/coveralls/fixtures/app/controllers/sample.rb
-- spec/coveralls/fixtures/app/models/airplane.rb
-- spec/coveralls/fixtures/app/models/dog.rb
-- spec/coveralls/fixtures/app/models/house.rb
-- spec/coveralls/fixtures/app/models/robot.rb
-- spec/coveralls/fixtures/app/models/user.rb
-- spec/coveralls/fixtures/app/vendor/vendored_gem.rb
-- spec/coveralls/fixtures/sample.rb
-- spec/coveralls/output_spec.rb
-- spec/coveralls/simple_cov/formatter_spec.rb
-- spec/spec_helper.rb
+test_files: []