diff --git a/Makefile b/Makefile index 45ef7b7..4603ed7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: test install build deploy deploy: - $(eval VERSION := $(shell cat lib/version.rb | grep 'LATEST = ' | cut -d\' -f2)) + $(eval VERSION := $(shell cat lib/codecov.rb | grep 'VERSION = ' | cut -d\' -f2)) git tag v$(VERSION) -m "" git push origin v$(VERSION) gem build codecov.gemspec diff --git a/codecov.gemspec b/codecov.gemspec index 389ea2a..3524f6d 100644 --- a/codecov.gemspec +++ b/codecov.gemspec @@ -1,12 +1,8 @@ # frozen_string_literal: true -lib = File.expand_path('lib', __dir__) -$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'version' - Gem::Specification.new do |s| s.name = 'codecov' - s.version = Version::LATEST + s.version = '0.2.4' s.platform = Gem::Platform::RUBY s.authors = ['codecov'] s.email = ['hello@codecov.io'] diff --git a/lib/codecov.rb b/lib/codecov.rb index 9aec180..3f06519 100644 --- a/lib/codecov.rb +++ b/lib/codecov.rb @@ -7,9 +7,9 @@ require 'colorize' require 'zlib' -require 'version' - class SimpleCov::Formatter::Codecov + VERSION = '0.2.4' + ### CIs RECOGNIZED_CIS = [ APPVEYOR = 'Appveyor CI', @@ -41,7 +41,7 @@ def display_header '| | / _ \ / _\`|/ _ \/ __/ _ \ \ / /', '| |___| (_) | (_| | __/ (_| (_) \ V /', ' \_____\___/ \__,_|\___|\___\___/ \_/', - " Ruby-#{Version::LATEST}", + " Ruby-#{VERSION}", '' ].join("\n") end @@ -98,7 +98,7 @@ def build_params(ci) params = { 'token' => ENV['CODECOV_TOKEN'], 'flags' => ENV['CODECOV_FLAG'] || ENV['CODECOV_FLAGS'], - 'package' => "ruby-#{Version::LATEST}" + 'package' => "ruby-#{VERSION}" } case ci @@ -317,7 +317,7 @@ def retry_request(req, https) def create_report(report) result = { 'meta' => { - 'version' => 'codecov-ruby/v' + Version::LATEST + 'version' => 'codecov-ruby/v' + VERSION } } result.update(result_to_codecov(report)) diff --git a/lib/version.rb b/lib/version.rb deleted file mode 100644 index c420d41..0000000 --- a/lib/version.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -class Version - LATEST = '0.2.4' -end diff --git a/test/test_codecov.rb b/test/test_codecov.rb index e2d6d61..0107732 100644 --- a/test/test_codecov.rb +++ b/test/test_codecov.rb @@ -35,7 +35,7 @@ def url def test_defined assert defined?(SimpleCov::Formatter::Codecov) - assert defined?(Version::LATEST) + assert defined?(SimpleCov::Formatter::Codecov::VERSION) end def stub_file(filename, coverage) @@ -83,7 +83,7 @@ def success_stubs def assert_successful_upload(data) assert_equal(data['result']['uploaded'], true) assert_equal(data['result']['message'], 'Coverage reports upload successfully') - assert_equal(data['meta']['version'], 'codecov-ruby/v' + Version::LATEST) + assert_equal(data['meta']['version'], 'codecov-ruby/v' + SimpleCov::Formatter::Codecov::VERSION) assert_equal(data['coverage'].to_json, { 'lib/something.rb' => [nil, 1, 0, 0, nil, 1, nil], 'lib/somefile.rb' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil]