build-labels 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b252a13e7ee5a0372e8f31262e1fbcf3cdd1d49dfc3215ee45557429a8f0c8
-  data.tar.gz: 28f1fcbecd7cdce2a82f5dd519643ad7c3212d8d7c32746eca14cc07c762f5c9
+  metadata.gz: ece715acff32709330b757daf3bde7df56b686cfdb48ae95274fde1cea6c629f
+  data.tar.gz: 92de637e65532323c3ffb810c2eb1c5c4dba08724dde1c18f593b6c97a07933b
 SHA512:
-  metadata.gz: 8b5452689d83fce49851f33a848caac9dfce949ed98872cd951cde67232412c04542af3bcfc8c2a209d58be5b51dd90c68abdc158301354c898dd565f9a313a8
-  data.tar.gz: 2466912c044e353acd73a09446fe6ee5c7d820e693a03d2fcbbd367b9c28266128b1b671187eb4f19ea18621268fa35da5008c8fab46a881c582e7f1d47b8b00
+  metadata.gz: bd5e5a24c460f2bb57f41a9206c45d99b4cf97dc2088f34ad760e287be95b611554d02fb3f6a728b2533b8f12e70da0e763464c3fb711cafea84530a15cdf2ba
+  data.tar.gz: 0a5b06118df2116a5e76d15393a0c55ae34bddfd5ede44d4fda9c09e19d714dc346c598b23d594c6be2953cdb01d387c82ad25b12129174b935d6be3f3b66bba

data/bin/build-labels

@@ -10,6 +10,7 @@ require 'build-labels/command_to_dockerfiles'
 require 'build-labels/command_gitlab'
 require 'build-labels/command_cache'
 require 'build-labels/command_print'
+require 'build-labels/command_set_version'
 
 include BuildLabels
 

data/lib/build-labels/builder.rb

@@ -4,36 +4,6 @@ require 'ostruct'
 require 'pp'
 require_relative 'yaml_merge'
 
-class MyYAMLTree < Psych::Visitors::YAMLTree
-  class Registrar
-    # record object for future, using '@_yaml_anchor_name' rather
-    # than object_id if it exists
-    def register target, node
-      anchor_name = target.instance_variable_get('@_yaml_anchor_name') || target.object_id
-      @obj_to_node[anchor_name] = node
-    end
-  end
-
-  # check to see if this object has been seen before
-  def accept target
-    if anchor_name = target.instance_variable_get('@_yaml_anchor_name')
-      if @st.key? anchor_name
-        oid         = anchor_name
-        node        = @st[oid]
-        anchor      = oid.to_s
-        node.anchor = anchor
-        return @emitter.alias anchor
-      end
-    end
-
-    # accept is a pretty big method, call super to avoid copying
-    # it all here. super will handle the cases when it's an object
-    # that's been seen but doesn't have '@_yaml_anchor_name' set
-    super
-  end
-
-end
-
 module BuildLabels
 
   class Builder
@@ -84,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

@@ -21,6 +21,7 @@ module BuildLabels
          puts "Load env error: #{e.message}"
          raise "Invalid #{filename} file"
       end
+
       def run(args)
         params = {}
 
@@ -54,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

@@ -0,0 +1,36 @@
+require_relative 'command_line'
+
+BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
+  # def options(parser)
+  #   parser.on('', '--set-version', '')
+  # end
+
+  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|
+      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
+      next unless File.exist? versionfile
+      current_version = File.read(versionfile).strip
+      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
+
+  end
+
+  def help = 'Add version tag from [docker_context]/.version file to image'
+end.new
+
+

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/build-labels/yaml_merge.rb

@@ -96,10 +96,10 @@ if File.expand_path($0) == File.expand_path(__FILE__)
         extra: [a, b]
   YAML
 
-  result = YamlMerge::parse_and_process_yaml(yaml_string)
+  result = YamlMerge.parse_and_process_yaml(yaml_string)
   puts result.inspect
 
-  data_without_aliases = YamlMerge::deep_copy_without_aliases(result)
+  data_without_aliases = YamlMerge.deep_copy_without_aliases(result)
   puts data_without_aliases.to_yaml
 
   # puts Psych.dump(data_without_aliases, indentation: 2, line_width: -1)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.19'
+    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.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,6 +111,7 @@ files:
 - lib/build-labels/command_gitlab.rb
 - lib/build-labels/command_line.rb
 - lib/build-labels/command_print.rb
+- lib/build-labels/command_set_version.rb
 - lib/build-labels/command_to_compose.rb
 - lib/build-labels/command_to_dockerfiles.rb
 - lib/build-labels/yaml_merge.rb