build-labels 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69154b96d9e2fadb249e833c1663cfdf448fcc11737c8a43f9c6a0fe60dae773
-  data.tar.gz: d12379bc7a1a75ec87eda38f658a6ee5e1fee76a2da4d0ee6fd2ec3c34dad550
+  metadata.gz: 139e7e061e2bf7a7a9cb861de8477fc09e08340987ed89e53239e9867881e1c7
+  data.tar.gz: 9ab1d0aaf92e3b0f18e5ae4c42ead33c058513fd25123e6e859c231ae10538db
 SHA512:
-  metadata.gz: a8f860d935d894c7c9c63583e800476f8fd5238671dbd1d1e38a8ed4ba806a7d13be59e9f53ace690a9b54b93ba1ebe5c11fdb6cbf999f4766ea41483b776bac
-  data.tar.gz: 6b69b46b058e89a24463e12fa0bb40304d48e65ae6ad728c24080de5fcda7e11a17a53cbe8741dd6d728b6d7a696e790655a1e8b9457c771550078e2f29a997d
+  metadata.gz: ec5e462b03595e656d57d925fe58b993377a9e1508758c0115054fe8d41c6b518591d6dda5fb5c75441e4cc82a83aaa87304eb92c25165a20e4377ee7cfb368d
+  data.tar.gz: 17e2b02be847d4d8f008b3cc6f3564e06e3c0039cb51a3c1107680b82e7ade6c3090236a4f0ce45b7306364035ff03d52e80431b0fb83e9b835ba62d40b57095

data/examples/Dockerfile

@@ -7,4 +7,5 @@ ENV COM_GITLAB_CI_COMMITURL="/commit/"
 ENV COM_GITLAB_CI_MRURL="/-/merge_requests/"
 ENV COM_GITLAB_CI_TAG=":"
 ENV ORG_LABEL-SCHEMA_VENDOR="/"
-ENV ORG_LABEL-SCHEMA_SCHEMA-VERSION="1.0"
+ENV ORG_LABEL-SCHEMA_SCHEMA-VERSION="1.0"
+ENV ORG_OPENCONTAINERS_IMAGE_REF_NAME=":"

data/examples/common-compose.yml

@@ -0,0 +1,30 @@
+x-common-build: &common-build
+  args:
+    - CI_PIPELINE_ID=${CI_PIPELINE_ID}
+    - CI_PIPELINE_IID=${CI_PIPELINE_IID}
+    - CI_NEXUS_CREDENTIALS=${CI_NEXUS_CREDENTIALS}
+    - CI_NEXUS_FOLDER=${CI_NEXUS_FOLDER}
+    - CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP}
+    - CI_PROJECT_PATH_SLUG=${CI_PROJECT_PATH_SLUG}
+    - CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
+  context: ../src_mobile_app
+  dockerfile: ../docker/flutter/Dockerfile
+
+services:
+  app_dev:
+    image: ${REGISTRY_HOST}/app/${CI_COMMIT_BRANCH}-dev
+    build:
+      <<: *common-build
+      args:
+        - MAP_BACKEND=dev
+    volumes:
+      - ../docker_build_results_dev:/app/results
+
+  app_prod:
+    image: ${REGISTRY_HOST}/app/${CI_COMMIT_BRANCH}-prod
+    build:
+      <<: *common-build
+      args:
+        - MAP_BACKEND=prod
+    volumes:
+      - ../docker_build_results_prod:/app/results

data/lib/build-labels/builder.rb

@@ -2,6 +2,38 @@
 require 'yaml'
 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
@@ -38,7 +70,9 @@ module BuildLabels
     def apply_environment
       @namespaces.each do |ns, struct|
         struct.each_pair do |name, value|
-          value.sub!( /^.*$/, `printf #{value}`) if value.to_s =~ /\$/
+          next unless value.to_s.include? '$'
+          struct[name] = value.gsub(/\$\{(\w+)\}/) { ENV[$1] }
+                              .gsub(/\$(\w+)/) { ENV[$1] }
         end
       end
     end
@@ -52,12 +86,17 @@ module BuildLabels
     end
 
     def extend_compose(compose_text)
-      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, service|
         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_gitlab.rb

@@ -5,7 +5,7 @@ BuildLabels::CommandLine::COMMANDS[:gitlab] = Class.new do
     builder.oc.vendor = '$CI_SERVER_URL/$GITLAB_USER_LOGIN'
     builder.oc.authors = '$CI_SERVER_URL/$GITLAB_USER_LOGIN'
     builder.oc.revision = '$CI_COMMIT_SHA'
-    builder.oc['ref.name'] = '$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"'
+    builder.oc['ref.name'] = '$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME'
     builder.oc.source = '$CI_PROJECT_URL'
     builder.oc.documentation = '$CI_PROJECT_URL'
     builder.oc.licenses = '$CI_PROJECT_URL'

data/lib/build-labels/command_line.rb

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

data/lib/build-labels/yaml_merge.rb

@@ -0,0 +1,107 @@
+# https://claude.ai/chat/4cd83f29-8ce4-42b7-8dcd-4f7c6222ab5e
+require 'psych'
+
+module YamlMerge
+  extend self
+
+  def deep_merge(base, override)
+    result = base.dup
+    override.each do |key, value|
+      if value.is_a?(Hash) && result[key].is_a?(Hash)
+        result[key] = deep_merge(result[key], value)
+      elsif value.is_a?(Array) && result[key].is_a?(Array)
+        result[key] = (result[key] + value).uniq
+      else
+        result[key] = value
+      end
+    end
+    result
+  end
+
+  def process_yaml(node, anchors = {})
+    case node
+    when Psych::Nodes::Mapping
+      result = {}
+      node.children.each_slice(2) do |key, value|
+        processed_key = process_yaml(key, anchors)
+        processed_value = process_yaml(value, anchors)
+        if key.is_a?(Psych::Nodes::Scalar) && key.anchor
+          anchors[key.anchor.to_sym] = processed_value
+        end
+        if processed_key == '<<'
+          if processed_value.is_a?(Array)
+            processed_value.each { |v| result = deep_merge(v, result) }
+          else
+            result = deep_merge(processed_value, result)
+          end
+        elsif result.key?(processed_key) && result[processed_key].is_a?(Array) && processed_value.is_a?(Array)
+          result[processed_key] = (result[processed_key] + processed_value).uniq
+        else
+          result[processed_key] = processed_value
+        end
+      end
+      node.anchor ? anchors[node.anchor.to_sym] = result : result
+    when Psych::Nodes::Sequence
+      result = node.children.map { |child| process_yaml(child, anchors) }
+      node.anchor ? anchors[node.anchor.to_sym] = result : result
+    when Psych::Nodes::Scalar
+      result = node.value
+      node.anchor ? anchors[node.anchor.to_sym] = result : result
+    when Psych::Nodes::Alias
+      anchors[node.anchor.to_sym] || node.anchor
+    else
+      node
+    end
+  end
+
+  def parse_and_process_yaml(yaml_string)
+    parsed = Psych.parse(yaml_string)
+    process_yaml(parsed.root)
+  end
+
+  def deep_copy_without_aliases(obj)
+    case obj
+    when Hash
+      obj.transform_values { |v| deep_copy_without_aliases(v) }
+    when Array
+      obj.map { |v| deep_copy_without_aliases(v) }
+    else
+      obj
+    end
+  end
+
+end
+
+
+# SELF TEST ============================================================================================================
+if File.expand_path($0) == File.expand_path(__FILE__)
+  yaml_string = <<~YAML
+    defaults: &defaults
+      common:
+        setting1: value1
+        setting2: value2
+      arr: [1, 2]
+
+    node1: &node1
+      <<: *defaults
+      specific:
+        key1: val1
+      arr: [3, 4]
+
+    node2:
+      <<: [*defaults, *node1]
+      arr: [5]
+      nested:
+        <<: *defaults
+        extra: [a, b]
+  YAML
+
+  result = YamlMerge::parse_and_process_yaml(yaml_string)
+  puts result.inspect
+
+  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)
+
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.16'
+    VERSION = '0.0.17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - bin/build-labels
 - examples/Dockerfile
+- examples/common-compose.yml
 - examples/simple-compose.yml
 - lib/build-labels.rb
 - lib/build-labels/builder.rb
@@ -112,6 +113,7 @@ files:
 - lib/build-labels/command_print.rb
 - lib/build-labels/command_to_compose.rb
 - lib/build-labels/command_to_dockerfiles.rb
+- lib/build-labels/yaml_merge.rb
 - lib/version.rb
 homepage: https://rubygems.org/gems/build-labels
 licenses: