build-labels 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e2f2e15fa9d339b5d23b4f5abaf7eda4ba0bcd90d39f32373eedd88c7425af7
-  data.tar.gz: 1a2064b6d39d20a6c65696f9d696bcab0dc7af268035f21c20154f1d360cec20
+  metadata.gz: 719ae14a1673df0a68553fd77a508710602c56d1f21ad91580d7630549ac4e5d
+  data.tar.gz: 70ae3fde84121c4491d07ca7468ef431fba2722ecebbfd98e9d2226ec7670a41
 SHA512:
-  metadata.gz: 4dc094f9d43563112ea876170532d9a2025eeff36b92fb81cd0f8c489003f7cfb3cec281b5d6d92ac28c95e5544cdfab59816517dbdc06c7aad364324fc32d4a
-  data.tar.gz: 024e845a37e5b44dd1d0b8b42b43e76df8b3badee60b55acaae577d59b1876b00fe2bb89262fcf5c5d618b4bd40d7933277a7d6357b30d5b8e4c70c3759f3aa6
+  metadata.gz: 6c4d95157d6df97ec7a2d9a1240abd7c2fd942656b89edb3e1a474d4419bfe4e2d37b06748a0b165272c17498f1e545f01def418d7c553545936d0a59ec15827
+  data.tar.gz: ec133f72a9dea369b906640a02827f9c7d5292a8ddd7e4af4638d9b45b01aade9b422bdd167893ae113c47395f031ec883424914074b2b209587d6910184028f

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
@@ -96,7 +66,7 @@ module BuildLabels
         service.delete_if {|k, v| !%w[image build].include? k }
         next unless service['build']
         if service['build'].class == String
-          service['build'] = { 'context'  => service['build'] }
+          service['build'] = { 'context' => service['build'] }
         end
         service['build']['labels'] ||= []
         add_namespace :dc, 'docker.service'

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 = {}
 

data/lib/build-labels/command_set_version.rb

@@ -0,0 +1,35 @@
+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_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
+
+    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 : ""}"
+    end
+
+    compose_text.replace compose.to_yaml
+  end
+
+  def help = 'Add version tag from [docker_context]/.version file to image'
+end.new
+
+

data/lib/build-labels/command_to_dockerfiles.rb

@@ -5,7 +5,10 @@ BuildLabels::CommandLine::COMMANDS[:to_dockerfiles] = Class.new do
     raise 'Compose file not defined' unless compose_text
     compose_dir = params[:compose] ? File.dirname(params[:compose]) : '.'
 
-    compose = YAML.load 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, 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,6 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.18'
+    VERSION = '0.0.20'
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Artyom B
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-07-12 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
@@ -120,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
@@ -136,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: []