Use old_version & new_version naming for readability

Fixes #8496
This commit is contained in:
infcurious@gmail.com 2017-10-31 15:49:10 +08:00 committed by Rob Bavey
parent c785daf697
commit 359f69ea67

View file

@ -14,25 +14,25 @@ def get_versions
end
# Update the version file, keeping the comments in tact
def update_version_file(hash, existing_versions)
def update_version_file(old_version, new_version)
versions_as_text = IO.read(VERSION_FILE)
%w(logstash logstash-core logstash-core-plugin-api).each do |field|
versions_as_text.gsub!(/(?<=#{field}: )#{existing_versions[field]}/, "#{hash[field]}")
versions_as_text.gsub!(/(?<=#{field}: )#{old_version[field]}/, "#{new_version[field]}")
end
IO.write(VERSION_FILE, versions_as_text)
end
def update_index_shared1(hash, existing_versions)
def update_index_shared1(old_version, new_version)
index_shared1 = IO.read(INDEX_SHARED1_FILE)
%w(logstash elasticsearch kibana).each do |field|
index_shared1.gsub!(/(:#{field}_version:\s+)#{existing_versions['logstash']}/) { "#{$1}#{hash['logstash']}" }
index_shared1.gsub!(/(:#{field}_version:\s+)#{old_version['logstash']}/) { "#{$1}#{new_version['logstash']}" }
end
IO.write(INDEX_SHARED1_FILE, index_shared1)
end
def update_readme(hash, existing_versions)
def update_readme(old_version, new_version)
readme = IO.read(README_FILE)
readme.gsub!(/(logstash\-)#{existing_versions['logstash']}/) { "#{$1}#{hash['logstash']}" }
readme.gsub!(/(logstash\-)#{old_version['logstash']}/) { "#{$1}#{new_version['logstash']}" }
IO.write(README_FILE, readme)
end
@ -46,21 +46,21 @@ namespace :version do
desc "set version of logstash, logstash-core"
task :set, [:version] => [:validate] do |t, args|
hash = {}
new_version = {}
get_versions.each do |component, version|
# we just assume that, usually, all components except
# "logstash-core-plugin-api" will be versioned together
# so let's skip this one and have a separate task for it
if component == "logstash-core-plugin-api"
hash[component] = version
new_version[component] = version
else
hash[component] = args[:version]
new_version[component] = args[:version]
end
end
existing_versions = YAML.safe_load(File.read(VERSION_FILE))
update_index_shared1(hash, existing_versions)
update_readme(hash, existing_versions)
update_version_file(hash, existing_versions)
old_version = YAML.safe_load(File.read(VERSION_FILE))
update_index_shared1(old_version, new_version)
update_readme(old_version, new_version)
update_version_file(old_version, new_version)
end
desc "set version of logstash-core-plugin-api"