coveralls_reborn 0.25.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66521d64ebaa51f54a9315ca83e619681c931bea2f8abf7c278014d96fb3aa7
-  data.tar.gz: 87f24915f01916f256d3b16797ab73cfb703aea5dcbbdaaa195172868fdf4d91
+  metadata.gz: 04c9754eac3145b40b91fb2fb3dad2c211543360c4b8de17b0c1d0fdf7d94959
+  data.tar.gz: 0fcf13baf4cb78142413a8635fde339b2983c17325f204f3ac7c9c70d8a833b3
 SHA512:
-  metadata.gz: 968918385b2a4f1fdbc5f1285d4e8846c91cb0c936daa6eab7c8a0cc99156c1b1c9032e4b32b0fd417986558e124e3b9b3e92a2f16d0ef11a540d8b716c6e832
-  data.tar.gz: 378d8e9ee67dbb76016136fef7d09331252a55e7e2edce5d26c308a089014573c768f35a6bd230aea109db82e858f12bbc9e9833cfa3822ede93cc823384b97b
+  metadata.gz: 821ea060f88505b7d27aaa80567d7fdb67322d22aa03e456bb2fe9555e371e0e304a2eb8564783e55794a40e8efa75a41af9d1990519e8ad5e40247b9e99f3b7
+  data.tar.gz: a9ca84cf0a99ee87681f7be22b4f1be7df4018835408ad0acc40be4f9a96381cb9bf220aaa4c7c807e8009085ee99c9e6b46791e919e8f3c49ff7d2c5a36087e

data/.github/workflows/rubocop.yml

@@ -16,10 +16,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby-version: ['3.1']
+        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,7 +12,7 @@ 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:
@@ -20,11 +20,13 @@ jobs:
             experimental: true
           - 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

@@ -5,7 +5,6 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.5
   Exclude:
     - 'spec/coveralls/fixtures/**/*'
     - 'vendor/bundle/**/*'
@@ -18,13 +17,17 @@ Layout/LineLength:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 44.11
+  Max: 26.31
+  Exclude:
+    - 'lib/coveralls/configuration.rb'
 
 Metrics/CyclomaticComplexity:
-  Max: 19
+  Exclude:
+    - 'lib/coveralls/configuration.rb'
 
 Metrics/PerceivedComplexity:
-  Max: 20
+  Exclude:
+    - 'lib/coveralls/configuration.rb'
 
 Metrics/BlockLength:
   Exclude:
@@ -39,7 +42,7 @@ Metrics/ModuleLength:
     - 'spec/**/*'
 
 RSpec/ExampleLength:
-  Max: 10
+  Max: 15
 
 RSpec/MultipleExpectations:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.27.0 / 2023-02-14
+
+* [FEATURE] Add Buildkite CI support [#43](https://github.com/tagliala/coveralls-ruby-reborn/pull/43)
+* [ENHANCEMENT] Update development dependencies
+
+## 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)

data/Gemfile

@@ -10,11 +10,11 @@ platforms :jruby do
 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.45'
+gem 'rubocop-performance', '~> 1.16'
 gem 'rubocop-rake', '~> 0.6.0'
-gem 'rubocop-rspec', '~> 2.9'
+gem 'rubocop-rspec', '~> 2.18'
 gem 'truthy', '~> 1.0'
-gem 'vcr', '~> 6.0'
-gem 'webmock', '~> 3.14'
+gem 'vcr', '~> 6.1'
+gem 'webmock', '~> 3.18'

data/LICENSE

@@ -2,7 +2,7 @@ MIT License
 
 Copyright (c) 2018 Wil Gieseler
 
-Copyright (c) 2021 Geremia Taglialatela
+Copyright (c) 2023 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

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

data/coveralls-ruby.gemspec

@@ -24,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

@@ -45,6 +45,8 @@ module Coveralls
           define_service_params_for_tddium(config)
         elsif ENV['GITLAB_CI']
           define_service_params_for_gitlab(config)
+        elsif ENV['BUILDKITE']
+          define_service_params_for_buildkite(config)
         elsif ENV['COVERALLS_RUN_LOCALLY'] || Coveralls.testing
           define_service_params_for_coveralls_local(config)
         end
@@ -118,6 +120,16 @@ module Coveralls
         config[:commit_sha]         = ENV['CI_BUILD_REF']
       end
 
+      def define_service_params_for_buildkite(config)
+        config[:service_name]         = 'buildkite'
+        config[:service_number]       = ENV['BUILDKITE_BUILD_NUMBER']
+        config[:service_job_id]       = ENV['BUILDKITE_BUILD_ID']
+        config[:service_branch]       = ENV['BUILDKITE_BRANCH']
+        config[:service_build_url]    = ENV['BUILDKITE_BUILD_URL']
+        config[:service_pull_request] = ENV['BUILDKITE_PULL_REQUEST']
+        config[:commit_sha]           = ENV['BUILDKITE_COMMIT']
+      end
+
       def define_service_params_for_coveralls_local(config)
         config[:service_job_id]     = nil
         config[:service_name]       = 'coveralls-ruby'

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.25.0'
+  VERSION = '0.27.0'
 end

data/spec/coveralls/configuration_spec.rb

@@ -85,6 +85,7 @@ describe Coveralls::Configuration do
           appveyor:        'APPVEYOR',
           circleci:        'CIRCLECI',
           gitlab:          'GITLAB_CI',
+          buildkite:       'BUILDKITE',
           jenkins:         'JENKINS_URL',
           semaphore:       'SEMAPHORE',
           tddium:          'TDDIUM',
@@ -146,6 +147,10 @@ describe Coveralls::Configuration do
         it_behaves_like 'a service', :gitlab
       end
 
+      context 'when using Buildkite' do
+        it_behaves_like 'a service', :buildkite
+      end
+
       context 'when using Jenkins' do
         it_behaves_like 'a service', :jenkins
       end
@@ -257,6 +262,38 @@ describe Coveralls::Configuration do
     end
   end
 
+  describe '.define_service_params_for_buildkite' do
+    let(:service_number) { 5678 }
+    let(:service_job_id) { 1234 }
+    let(:service_branch) { 'feature' }
+    let(:service_build_url) { SecureRandom.hex(4) }
+    let(:service_pull_request) { SecureRandom.hex(4) }
+    let(:commit_sha) { SecureRandom.hex(32) }
+
+    before do
+      allow(ENV).to receive(:[]).with('BUILDKITE_BUILD_NUMBER').and_return(service_number)
+      allow(ENV).to receive(:[]).with('BUILDKITE_BUILD_ID').and_return(service_job_id)
+      allow(ENV).to receive(:[]).with('BUILDKITE_BRANCH').and_return(service_branch)
+      allow(ENV).to receive(:[]).with('BUILDKITE_BUILD_URL').and_return(service_build_url)
+      allow(ENV).to receive(:[]).with('BUILDKITE_PULL_REQUEST').and_return(service_pull_request)
+      allow(ENV).to receive(:[]).with('BUILDKITE_COMMIT').and_return(commit_sha)
+    end
+
+    it 'sets the expected parameters' do
+      config = {}
+      described_class.define_service_params_for_buildkite(config)
+      expect(config).to include(
+        service_name:         'buildkite',
+        service_number:       service_number,
+        service_job_id:       service_job_id,
+        service_branch:       service_branch,
+        service_build_url:    service_build_url,
+        service_pull_request: service_pull_request,
+        commit_sha:           commit_sha
+      )
+    end
+  end
+
   describe '.define_service_params_for_semaphore' do
     let(:semaphore_workflow_id) { 1234 }
     let(:semaphore_git_pr_number) { 10 }

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.25.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -10,26 +10,20 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2023-02-14 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,14 +156,14 @@ 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.0.9
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.