coveralls_reborn 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f00e319a2e891af3bd8577ba9dd1ea88117b686562ba6332134aafffffd65b2
-  data.tar.gz: cca9cae70a90f4342594db68d91b7be0080ccbf534f00f9e6276ef99980f28ed
+  metadata.gz: c29df2ebe19f2ececc465311202c6602ec9fc3ae2fde370658e44059235b0fcf
+  data.tar.gz: 29598f4aa42ac2932ec1e4f9cb73ee09459d37bfc8be9189af23552dd8ffc02b
 SHA512:
-  metadata.gz: efd993c1e74eaeb537eb6d081f632706f17fcfe86e1c0ed8cc45efa70862eafa5acac96732929a9a7aabdfa28c2fca104d980210696aa3aef4b2f250baedb32c
-  data.tar.gz: d1ce6ca63c6aee73c63830e80a3a8dc942eb8500429e80fcc453a35aa35ca5eba75d8a6798bbf75b794398781b5581dec18b2040c490e5bf1779a4456fde527c
+  metadata.gz: 02d239951dd37be2025cdbbefc29166583ed0949949783586fb53b29f1eebfd214ab89a262b7f96998b121b09191ccae12eb86d968d95250ff94362bb83ac2fa
+  data.tar.gz: b877d4f39cdd580dae6f9114e906837dffe72c749ffa90fbb10ef7a48f077b2478b2049b8960f94a5b7d09994d5b53be8396dcaf17f2eb55638442927e865a18

data/.github/workflows/rubocop.yml

@@ -16,10 +16,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby-version: ['2.5']
+        ruby-version: ['3.2']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.github/workflows/ruby.yml

@@ -12,19 +12,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
         experimental: [false]
 
         include:
           - ruby-version: 'head'
             experimental: true
-          - ruby-version: 'jruby-9.2'
+          - ruby-version: 'jruby-9.3'
+            experimental: true
+          - ruby-version: 'jruby-9.4'
             experimental: true
 
     continue-on-error: ${{ matrix.experimental }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.rubocop.yml

@@ -52,5 +52,8 @@ RSpec/NestedGroups:
 Style/Documentation:
   Enabled: false
 
+Style/FetchEnvVar:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.26.0 / 2022-12-25
+
+* [FEATURE] Drop Ruby 2.5 support
+* [FEATURE] Add SimpleCov 0.22.0 compatibility
+* [ENHANCEMENT] Test against Ruby 3.2 and JRuby 3.4
+
+## 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

data/Gemfile

@@ -6,15 +6,15 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :jruby do
-  gem 'jruby-openssl', '~> 0.11.0'
+  gem 'jruby-openssl', '~> 0.14.0'
 end
 
 gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.11'
-gem 'rubocop', '~> 1.26'
-gem 'rubocop-performance', '~> 1.13'
+gem 'rspec', '~> 3.12'
+gem 'rubocop', '~> 1.41'
+gem 'rubocop-performance', '~> 1.15'
 gem 'rubocop-rake', '~> 0.6.0'
-gem 'rubocop-rspec', '~> 2.9'
+gem 'rubocop-rspec', '~> 2.16'
 gem 'truthy', '~> 1.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'
+gem 'vcr', '~> 6.1'
+gem 'webmock', '~> 3.18'

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.24.0', require: false
+gem 'coveralls_reborn', '~> 0.26.0', require: false
 ```
 
 ### GitHub Actions

data/coveralls-ruby.gemspec

@@ -14,7 +14,6 @@ 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
@@ -25,13 +24,13 @@ Gem::Specification.new do |gem|
   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.5'
+  gem.required_ruby_version = '>= 2.6'
 
-  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'
+  gem.add_dependency 'simplecov', '~> 0.22.0'
+  gem.add_dependency 'term-ansicolor', '~> 1.7'
+  gem.add_dependency 'thor', '~> 1.2'
+  gem.add_dependency 'tins', '~> 1.32'
 
-  gem.add_development_dependency 'bundler', '>= 1.16', '< 3'
+  gem.add_development_dependency 'bundler', '~> 2.0'
   gem.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
 end

data/lib/coveralls/configuration.rb

@@ -78,7 +78,10 @@ module Coveralls
       def define_service_params_for_semaphore(config)
         config[:service_name]         = 'semaphore'
         config[:service_number]       = ENV['SEMAPHORE_WORKFLOW_ID']
-        config[:service_branch]       = ENV['SEMAPHORE_GIT_BRANCH']
+        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/simplecov.rb

@@ -65,7 +65,7 @@ module Coveralls
           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])
+            branches_properties.push(line_number, 0, branch_number, hits)
           end
         end
         branches_properties

data/lib/coveralls/version.rb

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

data/spec/coveralls/configuration_spec.rb

@@ -259,20 +259,29 @@ describe Coveralls::Configuration do
 
   describe '.define_service_params_for_semaphore' do
     let(:semaphore_workflow_id) { 1234 }
-    let(:semaphore_git_branch) { 'a-branch' }
+    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_WORKFLOW_ID').and_return(semaphore_workflow_id)
-      allow(ENV).to receive(:[]).with('SEMAPHORE_GIT_BRANCH').and_return(semaphore_git_branch)
+      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).to include(
-        service_name:   'semaphore',
-        service_number: semaphore_workflow_id,
-        service_branch: semaphore_git_branch
+        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

data/spec/coveralls/coveralls_spec.rb

@@ -32,9 +32,10 @@ describe Coveralls do
     it 'outputs to stdout when running locally' do
       described_class.testing = false
       described_class.run_locally = true
-      silence do
-        described_class.should_run?
-      end
+
+      expect do
+        silence { described_class.should_run? }
+      end.not_to raise_error
     end
   end
 
@@ -46,7 +47,7 @@ describe Coveralls do
         end
       end
 
-      expect(::SimpleCov).to have_received(:start)
+      expect(SimpleCov).to have_received(:start)
     end
 
     it 'uses string' do
@@ -54,7 +55,7 @@ describe Coveralls do
         described_class.wear! 'test_frameworks'
       end
 
-      expect(::SimpleCov).to have_received(:start).with 'test_frameworks'
+      expect(SimpleCov).to have_received(:start).with 'test_frameworks'
     end
 
     it 'uses default' do
@@ -62,8 +63,8 @@ describe Coveralls do
         described_class.wear!
       end
 
-      expect(::SimpleCov).to have_received(:start).with no_args
-      expect(::SimpleCov.filters.map(&:filter_argument)).to include 'vendor'
+      expect(SimpleCov).to have_received(:start).with no_args
+      expect(SimpleCov.filters.map(&:filter_argument)).to include 'vendor'
     end
   end
 
@@ -75,7 +76,7 @@ describe Coveralls do
         end
       end
 
-      expect(::SimpleCov.formatter).to be Coveralls::NilFormatter
+      expect(SimpleCov.formatter).to be Coveralls::NilFormatter
     end
   end
 
@@ -99,12 +100,28 @@ describe Coveralls do
 
   describe '#setup!' do
     it 'sets SimpleCov adapter' do
-      # rubocop:disable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
-      SimpleCovTmp = SimpleCov
-      Object.send :remove_const, :SimpleCov
-      silence { described_class.setup! }
-      SimpleCov = SimpleCovTmp
-      # rubocop:enable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
+      previous_adapter = described_class.adapter
+      described_class.adapter = nil
+
+      expect do
+        silence { described_class.setup! }
+      end.to change(described_class, :adapter).from(nil).to(:simplecov)
+    ensure
+      described_class.adapter = previous_adapter
+    end
+
+    context 'when SimpleCov is not defined' do
+      # rubocop:disable RSpec/LeakyConstantDeclaration
+      it 'tries to load it' do
+        SimpleCovTmp = SimpleCov
+        Object.send :remove_const, :SimpleCov
+        expect do
+          silence { described_class.setup! }
+        end.not_to raise_error
+      ensure
+        SimpleCov = SimpleCovTmp
+      end
+      # rubocop:enable RSpec/LeakyConstantDeclaration
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls_reborn
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,26 +10,20 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-12-25 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
   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
@@ -38,68 +32,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.32'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.32'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -174,28 +156,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 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: []