diff --git a/logstash-core-plugin-api/logstash-core-plugin-api.gemspec b/logstash-core-plugin-api/logstash-core-plugin-api.gemspec index fa58ca3148f..072d4631744 100644 --- a/logstash-core-plugin-api/logstash-core-plugin-api.gemspec +++ b/logstash-core-plugin-api/logstash-core-plugin-api.gemspec @@ -11,8 +11,12 @@ if File.exist?(project_versions_yaml_path) # # we ignore the copy in git and we overwrite an existing file # each time we build the logstash-core gem - original_lines = IO.read(project_versions_yaml_path) - original_lines.gsub!(/^logstash: (.+?)\n/, "logstash: \\1-#{ENV['VERSION_QUALIFIER']}\n") if ENV['VERSION_QUALIFIER'] + original_lines = IO.readlines(project_versions_yaml_path) + if ENV['VERSION_QUALIFIER'] + logstash_version_line = original_lines.find {|line| line.match(/^logstash:/) } + logstash_version_line.chomp! + logstash_version_line << "-#{ENV['VERSION_QUALIFIER']}\n" + end original_lines << "\n" original_lines << "# This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated." gem_versions_yaml_path = File.expand_path("./versions-gem-copy.yml", File.dirname(__FILE__)) diff --git a/logstash-core/logstash-core.gemspec b/logstash-core/logstash-core.gemspec index b274f4c1efa..22760525eac 100644 --- a/logstash-core/logstash-core.gemspec +++ b/logstash-core/logstash-core.gemspec @@ -16,9 +16,12 @@ if File.exist?(project_versions_yaml_path) # # we ignore the copy in git and we overwrite an existing file # each time we build the logstash-core gem - original_lines = IO.read(project_versions_yaml_path) - original_lines.gsub!(/^logstash: (.+?)\n/, "logstash: \\1-#{ENV['VERSION_QUALIFIER']}\n") if ENV['VERSION_QUALIFIER'] - + original_lines = IO.readlines(project_versions_yaml_path) + if ENV['VERSION_QUALIFIER'] + logstash_version_line = original_lines.find {|line| line.match(/^logstash:/) } + logstash_version_line.chomp! + logstash_version_line << "-#{ENV['VERSION_QUALIFIER']}\n" + end original_lines << "\n" original_lines << "# This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated." gem_versions_yaml_path = File.expand_path("./versions-gem-copy.yml", File.dirname(__FILE__))