From b434ca2fd5be934a264c489907c88bcb40bac48e Mon Sep 17 00:00:00 2001 From: Robert Peacock Date: Fri, 20 Dec 2024 15:52:01 +0000 Subject: [PATCH] minor fix in version regex --- lib/utils/bump.rb | 2 +- spec/lib/utils/bump_spec.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/utils/bump.rb b/lib/utils/bump.rb index 907ad08..8ffa753 100644 --- a/lib/utils/bump.rb +++ b/lib/utils/bump.rb @@ -6,7 +6,7 @@ class Bump SEMVER = /["']*(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?["']*/ # rubocop:disable Layout/LineLength SEPARATOR = /\s*[:=]\s*/ - VERSION_KEY = /(?:^|\.|\s|"|'|_*)(?:base|version)(?:_*["']*)/ + VERSION_KEY = /(?:^_+|^|\.|\s|"|')(?:base|version)(?:["']*|_+)/ VERSION_SETTING = Regexp.new(VERSION_KEY.source + SEPARATOR.source + SEMVER.source, Regexp::IGNORECASE).freeze def initialize(config, level) diff --git a/spec/lib/utils/bump_spec.rb b/spec/lib/utils/bump_spec.rb index a7aabef..7250506 100644 --- a/spec/lib/utils/bump_spec.rb +++ b/spec/lib/utils/bump_spec.rb @@ -47,6 +47,11 @@ version = '__version__ = "1.0.0"' expect(Bump::VERSION_SETTING).to match(version) end + + it 'does not match unrelated semvers' do + version = 'expected_ruby_version = "3.3.0"' + expect(Bump::VERSION_SETTING).not_to match(version) + end end describe '#bump_everything' do