build-labels 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 719ae14a1673df0a68553fd77a508710602c56d1f21ad91580d7630549ac4e5d
-  data.tar.gz: 70ae3fde84121c4491d07ca7468ef431fba2722ecebbfd98e9d2226ec7670a41
+  metadata.gz: ece715acff32709330b757daf3bde7df56b686cfdb48ae95274fde1cea6c629f
+  data.tar.gz: 92de637e65532323c3ffb810c2eb1c5c4dba08724dde1c18f593b6c97a07933b
 SHA512:
-  metadata.gz: 6c4d95157d6df97ec7a2d9a1240abd7c2fd942656b89edb3e1a474d4419bfe4e2d37b06748a0b165272c17498f1e545f01def418d7c553545936d0a59ec15827
-  data.tar.gz: ec133f72a9dea369b906640a02827f9c7d5292a8ddd7e4af4638d9b45b01aade9b422bdd167893ae113c47395f031ec883424914074b2b209587d6910184028f
+  metadata.gz: bd5e5a24c460f2bb57f41a9206c45d99b4cf97dc2088f34ad760e287be95b611554d02fb3f6a728b2533b8f12e70da0e763464c3fb711cafea84530a15cdf2ba
+  data.tar.gz: 0a5b06118df2116a5e76d15393a0c55ae34bddfd5ede44d4fda9c09e19d714dc346c598b23d594c6be2953cdb01d387c82ad25b12129174b935d6be3f3b66bba

data/lib/build-labels/builder.rb

@@ -54,31 +54,23 @@ module BuildLabels
         yield ns, values
       end
     end
-
-    def extend_compose(compose_text)
-
-      result = YamlMerge::parse_and_process_yaml compose_text
-      compose = YamlMerge::deep_copy_without_aliases result
-
-      # compose = YAML.load compose_text
-
-      compose['services'].each do |name, service|
-        service.delete_if {|k, v| !%w[image build].include? k }
+    def extend_compose(compose)
+      compose['services'].transform_values! do |service|
         next unless service['build']
-        if service['build'].class == String
-          service['build'] = { 'context' => service['build'] }
-        end
+        service.slice!('image', 'build')
+        service['build'] = { 'context' => service['build'] } if service['build'].is_a?(String)
         service['build']['labels'] ||= []
-        add_namespace :dc, 'docker.service'
-        self.dc.name = name
+        add_namespace(:dc, 'docker.service')
+        self.dc.name = service['name']
 
         each_labels do |ns, values|
-          values.each_pair do |k,v|
+          values.each do |k, v|
             service['build']['labels'] << "#{ns}.#{k}=#{v}" unless v.to_s.empty?
           end
         end
-      end
-      compose['services'].delete_if do |name, svc| ! svc.key?('build') end
+        service
+      end.compact!
+
       puts compose.to_yaml
     end
   end

data/lib/build-labels/command_cache.rb

@@ -5,32 +5,21 @@ BuildLabels::CommandLine::COMMANDS[:cache] = Class.new do
     parser.on('', '--cache-from CACHE FROM', 'type=[local,registry] ... ')
     parser.on('', '--cache-to CACHE TO', 'type=[local,registry] ...')
   end
-  def run(builder, params, compose_text)
-    compose = YAML.load compose_text
+  def run(builder, params, compose)
     compose['services'].each do |service_name, service|
       next unless service['build']
 
-      if service['build'].class == String
-        service['build'] = { 'context' => service['build'] }
-      end
-      # p params
-      # registry = params[:registry]
-      image = service['image'].gsub( /:.*/, '')
-      if params[:'cache-from']
-        service['build']['cache_from'] = [ params[:'cache-from'] % {image: image, service_name: service_name} ]
-      else
-        service['build']['cache_from'] = [ "type=registry,ref=#{image}:cache" ]
-      end
+      service['build'] = { 'context' => service['build'] } if service['build'].is_a?(String)
 
-      if params[:'cache-to']
-        service['build']['cache_to'] = [ params[:'cache-to'] % {image: image, service_name: service_name} ]
-      else
-        service['build']['cache_to'] = [ "type=registry,ref=#{image}:cache,mode=max" ]
-      end
-      # #        - type=local,src=./.cache
-      # #        - type=local,dest=./.cache,mode=max
+      image = service['image'].split(':').first
+      cache_from = params[:'cache-from'] || "type=registry,ref=#{image}:cache"
+      cache_to = params[:'cache-to'] || "type=registry,ref=#{image}:cache,mode=max"
+
+      service['build']['cache_from'] = [format(cache_from, image: image, service_name: service_name)]
+      service['build']['cache_to'] = [format(cache_to, image: image, service_name: service_name)]
     end
-    compose_text.replace compose.to_yaml
+    #        - type=local,src=./.cache
+    #        - type=local,dest=./.cache,mode=max
   end
 
   def help = 'Add cache section'

data/lib/build-labels/command_line.rb

@@ -55,6 +55,8 @@ module BuildLabels
           compose_text = File.read(params[:compose]) if params[:compose]
           compose_text ||= STDIN.read unless $stdin.tty?
 
+          result = YamlMerge.parse_and_process_yaml compose_text
+          compose_text = YamlMerge.deep_copy_without_aliases result
           builder = Builder.new
 
           #  eval $(grep -v -e '^#' .build_info | xargs -I {} echo export \'{}\') && echo $CI_COMMIT_AUTHOR

data/lib/build-labels/command_set_version.rb

@@ -5,12 +5,8 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
   #   parser.on('', '--set-version', '')
   # end
 
-  def run(builder, params, compose_text)
-    raise 'Compose file not defined' unless compose_text
-
-    result = YamlMerge::parse_and_process_yaml compose_text
-    compose = YamlMerge::deep_copy_without_aliases result
-    # compose = YAML.load compose_text
+  def run(builder, params, compose)
+    raise 'Compose file not defined' unless compose
 
     compose_dir = params[:compose] ? File.dirname(params[:compose]) : '.'
 
@@ -24,9 +20,14 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
       image = svc['image'].gsub( /:.*/, '')
       tag = svc['image'][/:(.*)/, 1]
       svc['image'] = "#{image}:#{current_version}#{tag ? "-" + tag : ""}"
+      next unless svc['build']['tags']
+      svc['build']['tags'] = svc['build']['tags'].map do |t|
+        image = t.gsub( /:.*/, '')
+        tag = t[/:(.*)/, 1]
+        "#{image}:#{current_version}#{tag ? "-" + tag : ""}"
+      end
     end
 
-    compose_text.replace compose.to_yaml
   end
 
   def help = 'Add version tag from [docker_context]/.version file to image'

data/lib/build-labels/command_to_compose.rb

@@ -1,10 +1,10 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:to_compose] = Class.new do
-  def run(builder, params, compose_text)
-    raise 'Compose file not defined' unless compose_text
+  def run(builder, params, compose)
+    raise 'Compose file not defined' unless compose
 
-    builder.extend_compose compose_text
+    builder.extend_compose compose
   end
 
   def help = 'Add labels to all build sections of docker-compose file'

data/lib/build-labels/command_to_dockerfiles.rb

@@ -1,13 +1,10 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:to_dockerfiles] = Class.new do
-  def run(builder, params, compose_text)
-    raise 'Compose file not defined' unless compose_text
+  def run(builder, params, compose)
+    raise 'Compose file not defined' unless compose
     compose_dir = params[:compose] ? File.dirname(params[:compose]) : '.'
 
-    result = YamlMerge::parse_and_process_yaml compose_text
-    compose = YamlMerge::deep_copy_without_aliases result
-    # compose = YAML.load compose_text
 
     compose['services'].each do |name, svc|
       next unless svc['build']

data/lib/version.rb

@@ -1,6 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.20'
+    VERSION = '0.0.21'
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Artyom B
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -121,7 +121,7 @@ licenses:
 - Nonstandard
 metadata:
   source_code_uri: https://github.com/artyomb/build-labels
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Generate docker build image labels from CI variables
 test_files: []