build-labels 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a94764281e17cee34a35d9fbcd11fe0d702db9e3b0f2073c722f1aa5ddae9e1
-  data.tar.gz: 1eec4eaf51c4600dca1bdf6a2bee6200ccd93ea90c3bd0354d310495a2bfefc4
+  metadata.gz: 208d38d03e2e082828c05f3db32d515798d09ff4cb65c93aa993a5a96d6f1187
+  data.tar.gz: cd1ff4fc1c4a9dcd137f0cacbbfee9b66c71cc8b04e2cbe87049c99053276f09
 SHA512:
-  metadata.gz: c2cfea7e0a02d74f90d97fff96df3adedf78b652a064b64afb5b4e0433ac1917bfc905d6171f3126da36673309d0c82de27e23dae68c5828ff73310f8b40c421
-  data.tar.gz: 23a108326a37b8c8ea49237c77b77e0f3d2073cdcfea563c5257963401a10fea64cb278d52a5598f3e0f5f3a8699413204da721f6e43fdb52cdde54a0a10672e
+  metadata.gz: ffdf54b18d77baf4c6ecc16760f0e08b35823aa085f69994bcf2fbb474103f4b16bdd31fdd6a49d6c83eb376d60c7679388b82bf8df2e865c2fd4f9c12f960c1
+  data.tar.gz: 6cc8f640a773e079ec01ca1ef89ab8118f51359e7c70b38e76bbbffd49bd257ab37830db957a22e630306a7915423d01621f65f25e0faeef192a12070c813f2d

data/lib/build-labels/command_set_version.rb

@@ -1,14 +1,13 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
-  # def options(parser)
-  #   parser.on('', '--set-version', '')
-  # end
-
-  def apply_gitlab_tag(tag)
-    return tag if ENV['CI_COMMIT_TAG'].to_s.empty?
-    git_tag = ENV['CI_COMMIT_TAG']
-    [tag,git_tag].compact.join '-'
+  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)
@@ -23,10 +22,11 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
       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]
 
-      tag = apply_gitlab_tag(tag)
       full_tag = [current_version, tag].compact.join '-'
       full_tag = full_tag.empty? ? '' : ":#{full_tag}"
 
@@ -34,20 +34,14 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
 
       next unless svc['build']['tags']
       svc['build']['tags'] = svc['build']['tags'].map do |t|
-        image = t.gsub( /:.*/, '')
-        tag = t[/:(.*)/, 1]
-        tag = apply_gitlab_tag(tag)
-
-        full_tag = [current_version, tag].compact.join '-'
-        full_tag = full_tag.empty? ? '' : ":#{full_tag}"
-
-        "#{image}#{full_tag}"
+        image, tag = t.split(':')
+        full_tag = [current_version, tag].compact.join('-')
+        "#{image}#{full_tag.empty? ? '' : ":#{full_tag}"}"
       end
     end
-
   end
 
-  def help = 'Add version tag from [docker_context]/.version file to image'
-end.new
-
-
+  def help
+    'Add version tag from [docker_context]/.version file to image'
+  end
+end.new

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.26'
+    VERSION = '0.0.27'
   end
 end

metadata

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