build-labels 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfdc60588080068451dfa32008b6ece827de71ed3e75397ffdd25f2677cb5aab
-  data.tar.gz: 41fd5d42754c5456d47fdd06e169935bb95a0f6e7ff38bff1ac675da09c86acd
+  metadata.gz: 728735955a5091887ef9b20b624e8809f7416581d71ff36dd6fce15f57d4afe1
+  data.tar.gz: 0adf58cd709c4c06ae4495ae53bb403d6175b0b9121df7549d956f4b266eb401
 SHA512:
-  metadata.gz: 9619d27c0b2166e34d7b48bde58305b0de12e43134848025dbd92424c1aa5e946ff35762464700818d484ae67ae379e529753f7f29d6a39e883c91a689afe6fa
-  data.tar.gz: 0a7fceb4ffe2cf530cb218551bdcdc5bb62f5988984d22e9f1d28b54663bb9c6c0a9d8bb442d7b47c7f3f0ce2674020469b445df7ebfe3b340d2ea478253085d
+  metadata.gz: 1da390a8096d81fabf244c710165c836cca0a3229a964aa5e09f4b91457f627c90984d39f90009ab242581e2c18e508b1557f767871889afbe395acbe864ecad
+  data.tar.gz: 6d1e6e1923d909c2db79b6e2caa337ebc525e1c94946e3845d98c11d32cc7c95b1c4228e1dbc7683ddb3975e8cb1a761c844e8ce62f166b13ed35ce6c0b51319

data/lib/build-labels/command_set_version.rb

@@ -1,47 +1,48 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
-  def commit_message_commands(version)
-    return version unless (match = ENV['CI_COMMIT_MESSAGE']&.match(/#push:(\w+)/mi))
 
-    #Push command detected in commit message
-    version = '0.0' if version.to_s.empty?
-    tag = match[1] ? "-#{match[1]}" : ''
-    "#{version}.#{ENV['CI_PIPELINE_IID']}#{tag}"
-  end
-
-  def run(builder, params, compose)
+  def run(_builder, params, compose)
     raise 'Compose file not defined' unless compose
 
     compose_dir = params[:compose] ? File.dirname(params[:compose]) : '.'
 
-    compose['services'].each do |name, svc|
+    compose['services'].each do |_name, svc|
       next unless svc['build']
-      versionfile = svc['build'].is_a?(String) ? './' : svc['build']['context']
-      versionfile = File.join versionfile, '.version'
-      versionfile = File.expand_path versionfile, compose_dir
-
-      current_version = File.exist?( versionfile) ? File.read(versionfile).strip : nil
-      current_version = commit_message_commands(current_version)
-
-      image = svc['image'].gsub( /:.*/, '')
-      tag = svc['image'][/:(.*)/, 1]
+      unless svc['build']['tags']
+        svc['build']['tags'] = [svc['image']]
+      end
 
-      full_tag = [current_version, tag].compact.join '-'
-      full_tag = full_tag.empty? ? '' : ":#{full_tag}"
+      version_file = svc['build'].is_a?(String) ? './' : svc['build']['context']
+      version_file = File.join version_file, '.version'
+      version_file = File.expand_path version_file, compose_dir
 
-      svc['image'] = "#{image}#{full_tag}"
+      current_version = File.exist?( version_file) ? File.read(version_file).strip : nil
 
-      next unless svc['build']['tags']
       svc['build']['tags'] = svc['build']['tags'].map do |t|
         image, tag = t.split(':')
         full_tag = [current_version, tag].compact.join('-')
-        "#{image}#{full_tag.empty? ? '' : ":#{full_tag}"}"
+
+        [image, full_tag].compact.join ':'
       end
+
+      if ENV['CI_COMMIT_MESSAGE'].to_s =~ /#push/mi
+        full_version = "#{current_version.to_s.empty? ? '0.0' : current_version}.#{ENV['CI_PIPELINE_IID']}"
+
+        push_tag = ENV['CI_COMMIT_MESSAGE'].to_s[/#push:(\w+)/mi, 1]
+
+        svc['build']['tags'] += svc['build']['tags'].map do |t|
+          image, tag = t.split(':')
+          full_tag = [full_version, push_tag || tag].compact.join('-')
+
+          [image, full_tag].compact.join ':'
+        end
+      end
+
     end
   end
 
   def help
     'Add version tag from [docker_context]/.version file to image'
   end
-end.new
+end.new

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.28'
+    VERSION = '0.0.30'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - Artyom B
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake