[CI] Refactors assembling snapshot

Author: picandocodigo

.ci/make.sh

@@ -23,12 +23,17 @@ GIT_NAME=${GIT_NAME-elastic}
 GIT_EMAIL=${GIT_EMAIL-'[email protected]'}
 
 case $CMD in
+    assemble_snapshot)
+        TASK=assemble_snapshot[$VERSION_QUALIFIER,$TARGET_DIR]
+        ;;
     assemble)
         TASK=assemble[$VERSION_QUALIFIER,$TARGET_DIR]
         ;;
     *)
         echo -e "\nUsage:"
-        echo -e "\t Build gem files:"
+        echo -e "\t Build snapshot gems:"
+        echo -e "\t $0 assemble_snapshot [version_qualifier]\n"
+        echo -e "\t Build release gems:"
         echo -e "\t $0 assemble [version_qualifier]\n"
         exit 1
 esac

rake_tasks/unified_release_tasks.rake

@@ -18,9 +18,18 @@
 require_relative '../elasticsearch/lib/elasticsearch/version'
 
 namespace :unified_release do
-  desc 'Build gem files'
+  desc 'Build gem snapshot'
+  task :assemble_snapshot, [:version_qualifier, :output_dir] do |_, args|
+    qualifier = "#{args[:version_qualifier]}-SNAPSHOT"
+    @version = determine_version(qualifier)
+    Rake::Task['update_version'].invoke(Elasticsearch::VERSION, @version) unless @version == Elasticsearch::VERSION
+
+    build_gems(args[:output_dir])
+  end
+
+  desc 'Build gem release'
   task :assemble, [:version_qualifier, :output_dir] do |_, args|
-    @version = determine_version(args)
+    @version = determine_version(args[:version_qualifier])
     Rake::Task['update_version'].invoke(Elasticsearch::VERSION, @version) unless @version == Elasticsearch::VERSION
 
     build_gems(args[:output_dir])
@@ -37,13 +46,12 @@ namespace :unified_release do
     puts '-' * 80
   end
 
-  def determine_version(args)
-    if !(args[:version_qualifier].nil? || args[:version_qualifier].empty?)
-      if Elasticsearch::VERSION.include?('SNAPSHOT')
-        # eg 8.0.0-SNAPSHOT
-        Elasticsearch::VERSION.gsub('-SNAPSHOT', ".#{args[:version_qualifier]}-SNAPSHOT")
+  def determine_version(version_qualifier)
+    if !(version_qualifier.nil? || version_qualifier.empty?)
+      if version_qualifier =~ /^-SNAPSHOT$/
+        Elasticsearch::VERSION + version_qualifier
       else
-        Elasticsearch::VERSION + ".#{args[:version_qualifier]}"
+        Elasticsearch::VERSION + "-#{version_qualifier}"
       end
     else
       Elasticsearch::VERSION