coveralls_reborn 0.12.0 → 0.13.0

data/lib/coveralls/output.rb

@@ -66,12 +66,10 @@ module Coveralls
     def format(string, options = {})
       unless no_color?
         require 'term/ansicolor'
-        if options[:color]
-          options[:color].split(/\s/).reverse_each do |color|
-            if Term::ANSIColor.respond_to?(color.to_sym)
-              string = Term::ANSIColor.send(color.to_sym, string)
-            end
-          end
+        options[:color]&.split(/\s/)&.reverse_each do |color|
+          next unless Term::ANSIColor.respond_to?(color.to_sym)
+
+          string = Term::ANSIColor.send(color.to_sym, string)
         end
       end
       string
@@ -92,6 +90,7 @@ module Coveralls
     # Returns nil.
     def puts(string, options = {})
       return if silent?
+
       (options[:output] || output).puts format(string, options)
     end
 
@@ -109,6 +108,7 @@ module Coveralls
     # Returns nil.
     def print(string, options = {})
       return if silent?
+
       (options[:output] || output).print format(string, options)
     end
 

data/lib/coveralls/rake/task.rb

@@ -12,6 +12,7 @@ module Coveralls
         desc 'Push latest coverage results to Coveralls.io'
         task :push do
           require 'coveralls'
+
           Coveralls.push!
         end
       end

data/lib/coveralls/simplecov.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module Coveralls
   module SimpleCov
     class Formatter
@@ -10,6 +12,7 @@ module Coveralls
         else
           Coveralls::Output.puts '[Coveralls] There are no covered files.', color: 'yellow'
         end
+
         result.files.each do |f|
           Coveralls::Output.print '  * '
           Coveralls::Output.print short_filename(f.filename).to_s, color: 'cyan'
@@ -24,6 +27,7 @@ module Coveralls
           end
           Coveralls::Output.puts ''
         end
+
         true
       end
 
@@ -49,20 +53,22 @@ module Coveralls
 
           source_files << properties
         end
+
         source_files
       end
 
       def format(result)
         unless Coveralls.should_run?
           display_result result if Coveralls.noisy?
+
           return
         end
 
         # Post to Coveralls.
         API.post_json 'jobs',
-                      source_files: get_source_files(result),
+                      source_files:   get_source_files(result),
                       test_framework: result.command_name.downcase,
-                      run_at: result.created_at
+                      run_at:         result.created_at
 
         Coveralls::Output.puts output_message result
 
@@ -75,14 +81,15 @@ module Coveralls
         Coveralls::Output.puts 'Coveralls encountered an exception:', color: 'red'
         Coveralls::Output.puts error.class.to_s, color: 'red'
         Coveralls::Output.puts error.message, color: 'red'
-        if error.backtrace
-          error.backtrace.each do |line|
-            Coveralls::Output.puts line, color: 'red'
-          end
+
+        error.backtrace&.each do |line|
+          Coveralls::Output.puts line, color: 'red'
         end
+
         if error.respond_to?(:response) && error.response
           Coveralls::Output.puts error.response.to_s, color: 'red'
         end
+
         false
       end
 
@@ -95,8 +102,11 @@ module Coveralls
       end
 
       def short_filename(filename)
-        filename = filename.gsub(::SimpleCov.root, '.').gsub(%r{^\./}, '') if ::SimpleCov.root
-        filename
+        return filename unless ::SimpleCov.root
+
+        filename = Pathname.new(filename)
+        root = Pathname.new(::SimpleCov.root)
+        filename.relative_path_from(root).to_s
       end
     end
   end

data/lib/coveralls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coveralls
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.13.0'
 end

data/spec/coveralls/configuration_spec.rb

@@ -20,13 +20,14 @@ describe Coveralls::Configuration do
       let(:repo_secret_token) { SecureRandom.hex(4) }
       let(:yaml_config) do
         {
-          'repo_token' => repo_token,
+          'repo_token'        => repo_token,
           'repo_secret_token' => repo_secret_token
         }
       end
 
       before do
-        allow(described_class).to receive(:yaml_config).and_return(yaml_config)
+        allow(File).to receive(:exist?).with(described_class.configuration_path).and_return(true)
+        allow(YAML).to receive(:load_file).with(described_class.configuration_path).and_return(yaml_config)
       end
 
       it 'sets the Yaml config and associated variables if present' do
@@ -67,14 +68,54 @@ describe Coveralls::Configuration do
       end
     end
 
+    context 'when flag_name is in environment' do
+      before do
+        allow(ENV).to receive(:[]).with('COVERALLS_FLAG_NAME').and_return(true)
+      end
+
+      it 'sets flag_name to true if present' do
+        config = described_class.configuration
+        expect(config[:flag_name]).to be true
+      end
+    end
+
     context 'with services' do
+      SERVICES = {
+        appveyor:        'APPVEYOR',
+        circleci:        'CIRCLECI',
+        gitlab:          'GITLAB_CI',
+        jenkins:         'JENKINS_URL',
+        semaphore:       'SEMAPHORE',
+        tddium:          'TDDIUM',
+        travis:          'TRAVIS',
+        coveralls_local: 'COVERALLS_RUN_LOCALLY',
+        generic:         'CI_NAME'
+      }.freeze
+
+      shared_examples 'a service' do |service_name|
+        let(:service_variable) { options[:service_variable] }
+
+        before do
+          allow(ENV).to receive(:[]).with(SERVICES[service_name]).and_return('1')
+          described_class.configuration
+        end
+
+        it 'sets service parameters for this service and no other' do
+          SERVICES.each_key.reject { |service| service == service_name }.each do |service|
+            expect(described_class).not_to have_received(:"define_service_params_for_#{service}")
+          end
+
+          expect(described_class).to have_received(:"define_service_params_for_#{service_name}") unless service_name == :generic
+          expect(described_class).to have_received(:define_standard_service_params_for_generic_ci)
+        end
+      end
+
       before do
-        allow(described_class).to receive(:set_service_params_for_travis)
-        allow(described_class).to receive(:set_service_params_for_circleci)
-        allow(described_class).to receive(:set_service_params_for_semaphore)
-        allow(described_class).to receive(:set_service_params_for_jenkins)
-        allow(described_class).to receive(:set_service_params_for_coveralls_local)
-        allow(described_class).to receive(:set_standard_service_params_for_generic_ci)
+        SERVICES.each_key do |service|
+          allow(described_class).to receive(:"define_service_params_for_#{service}")
+        end
+
+        allow(described_class).to receive(:define_standard_service_params_for_generic_ci)
       end
 
       context 'with env based service name' do
@@ -91,105 +132,45 @@ describe Coveralls::Configuration do
         end
       end
 
-      context 'when using Travis' do
-        before do
-          allow(ENV).to receive(:[]).with('TRAVIS').and_return('1')
-          described_class.configuration
-        end
-
-        it 'sets service parameters for this service and no other' do
-          expect(described_class).to have_received(:set_service_params_for_travis).with(anything, anything)
-          expect(described_class).not_to have_received(:set_service_params_for_circleci)
-          expect(described_class).not_to have_received(:set_service_params_for_semaphore)
-          expect(described_class).not_to have_received(:set_service_params_for_jenkins)
-          expect(described_class).not_to have_received(:set_service_params_for_coveralls_local)
-          expect(described_class).to have_received(:set_standard_service_params_for_generic_ci)
-        end
+      context 'when using AppVeyor' do
+        it_behaves_like 'a service', :appveyor
       end
 
       context 'when using CircleCI' do
-        before do
-          allow(ENV).to receive(:[]).with('CIRCLECI').and_return('1')
-          described_class.configuration
-        end
+        it_behaves_like 'a service', :circleci
+      end
 
-        it 'sets service parameters for this service and no other' do
-          expect(described_class).not_to have_received(:set_service_params_for_travis)
-          expect(described_class).to have_received(:set_service_params_for_circleci)
-          expect(described_class).not_to have_received(:set_service_params_for_semaphore)
-          expect(described_class).not_to have_received(:set_service_params_for_jenkins)
-          expect(described_class).not_to have_received(:set_service_params_for_coveralls_local)
-          expect(described_class).to have_received(:set_standard_service_params_for_generic_ci)
-        end
+      context 'when using GitLab CI' do
+        it_behaves_like 'a service', :gitlab
       end
 
-      context 'when using Semaphore' do
-        before do
-          allow(ENV).to receive(:[]).with('SEMAPHORE').and_return('1')
-          described_class.configuration
-        end
+      context 'when using Jenkins' do
+        it_behaves_like 'a service', :jenkins
+      end
 
-        it 'sets service parameters for this service and no other' do
-          expect(described_class).not_to have_received(:set_service_params_for_travis)
-          expect(described_class).not_to have_received(:set_service_params_for_circleci)
-          expect(described_class).to have_received(:set_service_params_for_semaphore)
-          expect(described_class).not_to have_received(:set_service_params_for_jenkins)
-          expect(described_class).not_to have_received(:set_service_params_for_coveralls_local)
-          expect(described_class).to have_received(:set_standard_service_params_for_generic_ci)
-        end
+      context 'when using Semaphore' do
+        it_behaves_like 'a service', :semaphore
       end
 
-      context 'when using Jenkins' do
-        before do
-          allow(ENV).to receive(:[]).with('JENKINS_URL').and_return('1')
-          described_class.configuration
-        end
+      context 'when using Tddium' do
+        it_behaves_like 'a service', :tddium
+      end
 
-        it 'sets service parameters for this service and no other' do
-          expect(described_class).not_to have_received(:set_service_params_for_travis)
-          expect(described_class).not_to have_received(:set_service_params_for_circleci)
-          expect(described_class).not_to have_received(:set_service_params_for_semaphore)
-          expect(described_class).to have_received(:set_service_params_for_jenkins)
-          expect(described_class).not_to have_received(:set_service_params_for_coveralls_local)
-          expect(described_class).to have_received(:set_standard_service_params_for_generic_ci)
-        end
+      context 'when using Travis' do
+        it_behaves_like 'a service', :travis
       end
 
       context 'when running Coveralls locally' do
-        before do
-          allow(ENV).to receive(:[]).with('COVERALLS_RUN_LOCALLY').and_return('1')
-          described_class.configuration
-        end
-
-        it 'sets service parameters for this service and no other' do
-          expect(described_class).not_to have_received(:set_service_params_for_travis)
-          expect(described_class).not_to have_received(:set_service_params_for_circleci)
-          expect(described_class).not_to have_received(:set_service_params_for_semaphore)
-          expect(described_class).not_to have_received(:set_service_params_for_jenkins)
-          expect(described_class).to have_received(:set_service_params_for_coveralls_local)
-          expect(described_class).to have_received(:set_standard_service_params_for_generic_ci)
-        end
+        it_behaves_like 'a service', :coveralls_local
       end
 
       context 'when using a generic CI' do
-        before do
-          allow(ENV).to receive(:[]).with('CI_NAME').and_return('1')
-          described_class.configuration
-        end
-
-        it 'sets service parameters for this service and no other' do
-          expect(described_class).not_to have_received(:set_service_params_for_travis)
-          expect(described_class).not_to have_received(:set_service_params_for_circleci)
-          expect(described_class).not_to have_received(:set_service_params_for_semaphore)
-          expect(described_class).not_to have_received(:set_service_params_for_jenkins)
-          expect(described_class).not_to have_received(:set_service_params_for_coveralls_local)
-          expect(described_class).to have_received(:set_standard_service_params_for_generic_ci).with(anything)
-        end
+        it_behaves_like 'a service', :generic
       end
     end
   end
 
-  describe '.set_service_params_for_travis' do
+  describe '.define_service_params_for_travis' do
     let(:travis_job_id) { SecureRandom.hex(4) }
 
     before do
@@ -198,25 +179,25 @@ describe Coveralls::Configuration do
 
     it 'sets the service_job_id' do
       config = {}
-      described_class.set_service_params_for_travis(config, nil)
+      described_class.define_service_params_for_travis(config, nil)
       expect(config[:service_job_id]).to eq(travis_job_id)
     end
 
     it 'sets the service_name to travis-ci by default' do
       config = {}
-      described_class.set_service_params_for_travis(config, nil)
+      described_class.define_service_params_for_travis(config, nil)
       expect(config[:service_name]).to eq('travis-ci')
     end
 
     it 'sets the service_name to a value if one is passed in' do
       config = {}
       random_name = SecureRandom.hex(4)
-      described_class.set_service_params_for_travis(config, random_name)
+      described_class.define_service_params_for_travis(config, random_name)
       expect(config[:service_name]).to eq(random_name)
     end
   end
 
-  describe '.set_service_params_for_circleci' do
+  describe '.define_service_params_for_circleci' do
     let(:circle_build_num) { SecureRandom.hex(4) }
 
     before do
@@ -225,13 +206,13 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_service_params_for_circleci(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)
     end
   end
 
-  describe '.set_service_params_for_gitlab' do
+  describe '.define_service_params_for_gitlab' do
     let(:commit_sha) { SecureRandom.hex(32) }
     let(:service_job_number) { 'spec:one' }
     let(:service_job_id) { 1234 }
@@ -246,7 +227,7 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_service_params_for_gitlab(config)
+      described_class.define_service_params_for_gitlab(config)
       expect(config[:service_name]).to eq('gitlab-ci')
       expect(config[:service_job_number]).to eq(service_job_number)
       expect(config[:service_job_id]).to eq(service_job_id)
@@ -255,7 +236,7 @@ describe Coveralls::Configuration do
     end
   end
 
-  describe '.set_service_params_for_semaphore' do
+  describe '.define_service_params_for_semaphore' do
     let(:semaphore_build_num) { SecureRandom.hex(4) }
 
     before do
@@ -264,13 +245,13 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_service_params_for_semaphore(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)
     end
   end
 
-  describe '.set_service_params_for_jenkins' do
+  describe '.define_service_params_for_jenkins' do
     let(:service_pull_request) { '1234' }
     let(:build_num) { SecureRandom.hex(4) }
 
@@ -281,25 +262,25 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_service_params_for_jenkins(config)
-      described_class.set_standard_service_params_for_generic_ci(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)
     end
   end
 
-  describe '.set_service_params_for_coveralls_local' do
+  describe '.define_service_params_for_coveralls_local' do
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_service_params_for_coveralls_local(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')
     end
   end
 
-  describe '.set_service_params_for_generic_ci' do
+  describe '.define_service_params_for_generic_ci' do
     let(:service_name) { SecureRandom.hex(4) }
     let(:service_number) { SecureRandom.hex(4) }
     let(:service_build_url) { SecureRandom.hex(4) }
@@ -316,7 +297,7 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_standard_service_params_for_generic_ci(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)
@@ -325,7 +306,7 @@ describe Coveralls::Configuration do
     end
   end
 
-  describe '.set_service_params_for_appveyor' do
+  describe '.define_service_params_for_appveyor' do
     let(:service_number) { SecureRandom.hex(4) }
     let(:service_branch) { SecureRandom.hex(4) }
     let(:commit_sha) { SecureRandom.hex(4) }
@@ -340,7 +321,7 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_service_params_for_appveyor(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)
@@ -349,7 +330,7 @@ describe Coveralls::Configuration do
     end
   end
 
-  describe '.set_service_params_for_tddium' do
+  describe '.define_service_params_for_tddium' do
     let(:service_number)       { SecureRandom.hex(4) }
     let(:service_job_number)   { SecureRandom.hex(4) }
     let(:service_pull_request) { SecureRandom.hex(4) }
@@ -364,7 +345,7 @@ describe Coveralls::Configuration do
 
     it 'sets the expected parameters' do
       config = {}
-      described_class.set_service_params_for_tddium(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)