build-labels 0.0.27 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 208d38d03e2e082828c05f3db32d515798d09ff4cb65c93aa993a5a96d6f1187
-  data.tar.gz: cd1ff4fc1c4a9dcd137f0cacbbfee9b66c71cc8b04e2cbe87049c99053276f09
+  metadata.gz: 33e6468499e7dba74de3940e9efcf8b0163e4998562cb14c410b283045e9212d
+  data.tar.gz: f537053e05673a46332cf877e9c3c70caa18e01c20881b0ae04310b02d9c5d72
 SHA512:
-  metadata.gz: ffdf54b18d77baf4c6ecc16760f0e08b35823aa085f69994bcf2fbb474103f4b16bdd31fdd6a49d6c83eb376d60c7679388b82bf8df2e865c2fd4f9c12f960c1
-  data.tar.gz: 6cc8f640a773e079ec01ca1ef89ab8118f51359e7c70b38e76bbbffd49bd257ab37830db957a22e630306a7915423d01621f65f25e0faeef192a12070c813f2d
+  metadata.gz: 7517f405c98548ef7ec5c77d3732c4d9c100af0cae0ce10580bf21ecd930166f4298ccb24f51fe8fa49b483e17e20ff922e00a9190f411a2a572e5e0049ad0f4
+  data.tar.gz: 04cbc3277100c7e45396c654220485290cf8959a60d61efab9804fe13d657fa7c8ea0c340c9870cd3f8ee7da5bcfd6b3202941912fcdad78c8f7da94522b05e3

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+)/i))
 
-    puts 'Debug: 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']&[/#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.27'
+    VERSION = '0.0.29'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.29
 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