retag 0.1.10.265664 → 0.2.1.289789

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 650592d73d5ee6946e6cd59f7200a38eeec31efea0fc5aaf68bb1c17caef1b35
-  data.tar.gz: 70f2fd28541548b307ab8722994dff7da135d90e416ae3594f022c9bee6d3cff
+  metadata.gz: b02aec116b0797e9023ac8503214e93f4ebd9036b507223133445336d824935f
+  data.tar.gz: 8c432f0c18632a19c671c764149c0a80d4be7a406fb0f165fdf1cf59b812eb46
 SHA512:
-  metadata.gz: f5782d7035e2075520f1900973f9fd1312112a8175e4b4d7274411bc73ad3fc2d4e118be373abba23bf599ae514d80bdfac10748c2106d5fad3115789fbb8c9b
-  data.tar.gz: e6e34fff9f59b0fa4207cb0eb7d76f63860c4062326f53d2fd5bc305a625013b47fea80e2671023ea518e0f57b4f82a83a94791f3dad6ddb917d069d80a72d0e
+  metadata.gz: cb8d95b95b55b01f2aa4dbd2a4fa819a7390135488b560f6ef091eab245dbc07e99eb5f64ef69caf8f3c83fddd70c53b4555d7633b4d8a51294b2ca85571418d
+  data.tar.gz: 93ae41bea06c2bdf9958b7bcfa6900fc92a38b882ecab7e19d6bc837bff1f744fa1b1fd90bc1c3ab0bb0cef202d13e668ebf72784fec2a3a0c039643d6ac67fc

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    retag (0.1.10.265664)
+    retag (0.2.1)
       activesupport (~> 6.0)
       colorize (~> 0.8.1)
       gitlab (< 5.0)
       json
+      logger
+      multi_xml (~> 0.6.0)
       thor
       uri
       yaml
@@ -14,99 +16,111 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.9)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     ast (2.4.2)
+    bigdecimal (3.1.9)
     colorize (0.8.1)
-    concurrent-ruby (1.3.4)
-    crack (0.4.5)
+    concurrent-ruby (1.3.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    gitlab (4.18.0)
-      httparty (~> 0.18)
+    csv (3.3.2)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    gitlab (4.20.1)
+      httparty (~> 0.20)
       terminal-table (>= 1.5.1)
-    hashdiff (1.0.1)
-    httparty (0.21.0)
+    hashdiff (1.1.2)
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    mini_mime (1.1.2)
-    minitest (5.15.0)
+    json (2.9.1)
+    language_server-protocol (3.17.0.4)
+    logger (1.6.6)
+    mini_mime (1.1.5)
+    minitest (5.25.4)
     multi_xml (0.6.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.26.3)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+      racc
+    public_suffix (5.1.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.2.0)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rexml (3.4.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rspec_junit_formatter (0.5.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.25.0)
+    rubocop (1.71.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-console (0.9.1)
+    simplecov-console (0.9.2)
       ansi
       simplecov
       terminal-table
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.2)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    uri (0.13.1)
-    webmock (3.14.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yaml (0.3.0)
+    yaml (0.4.0)
     zeitwerk (2.5.4)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.2, >= 2.2.1)
+  bundler (>= 2.1.0)
   rake
   retag!
   rspec

data/bin/retag

@@ -80,6 +80,14 @@ class DockerCommand < Thor
                   required: true,
                   desc:     "Env: #{ENV_PREFIX}_TAG_TAG. New tag"
 
+  option :project, default:  ENV.fetch("#{ENV_PREFIX}_TAG_PROJECT", nil),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_PROJECT. Change repository project"
+
+  option :api,    default:  ENV.fetch("#{ENV_PREFIX}_TAG_API", 'harbor'),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_API. Which API user for: [harbor]"
+
   option :suffix, default:  ENV.fetch("#{ENV_PREFIX}_TAG_SUFFIX", nil),
                   required: false,
                   desc:     "Env: #{ENV_PREFIX}_TAG_SUFFIX. Optional suffix added to image tag: <image>:<tag>[-<suffix>].
@@ -96,11 +104,11 @@ class DockerCommand < Thor
     tag ||= 'latest'
     tag = opts['suffix'].present? ? "#{tag}-#{opts['suffix']}" : tag
 
-    image = ::Retag::Image.new(img, tag)
+    image = ::Retag::Image.new(img, tag, api: opts['api'])
 
     $logger.info ">>> Image #{image.image}"
     $logger.info "  From ".ljust(5) + "[#{image.tag.colorize(:yellow)}]: ".ljust(35) + image.full
-    newimg = image.retag!(opts['tag'])
+    newimg = image.retag!(opts['tag'], newproject: opts['project'])
     $logger.info "  To ".ljust(5) + "[#{newimg.tag.colorize(:yellow)}]: ".ljust(35) + newimg.full
   end
 
@@ -116,6 +124,14 @@ class ReleaseCommand < Thor
                   required: true,
                   desc:     "Env: #{ENV_PREFIX}_RELEASE_CONFIG. Path to release manifest"
 
+  option :project, default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_PROJECT", nil),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_PROJECT. Change Docker repository project"
+
+  option :api,    default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_API", 'harbor'),
+                  required: false,
+                  desc:     "Env: #{ENV_PREFIX}_TAG_API. Which API user for: [harbor]"
+
   option :name,   default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_NAME", nil),
                   required: false,
                   desc:     "Env: #{ENV_PREFIX}_RELEASE_NAME. Name of the current release"
@@ -137,7 +153,7 @@ class ReleaseCommand < Thor
     branch = config['default-branch']
 
     services = config['services'].map do|(name, cfg)|
-      Retag::Service.new(name, cfg, release, suffix: cfg.fetch('suffix', suffix), branch: cfg.fetch('branch', branch)) unless name.start_with?('.')
+      Retag::Service.new(name, cfg, release, suffix: cfg.fetch('suffix', suffix), branch: cfg.fetch('branch', branch), api: opts['api']) unless name.start_with?('.')
     end.compact
 
     tag_message = "Release #{release} at #{DateTime.now.iso8601}"
@@ -155,7 +171,7 @@ class ReleaseCommand < Thor
 
             $logger.shift do
               $logger.info "From ".ljust(5) + "[#{img.tag.colorize(:yellow)}]: ".ljust(35) + img.full
-              newimg = img.retag!(release)
+              newimg = img.retag!(release, newproject: opts['project'])
               $logger.info "To ".ljust(5) + "[#{newimg.tag.colorize(:yellow)}]: ".ljust(35) + newimg.full
 
               markdown += "* **Name**: `#{srv.name}`<br>**Version**: #{img.tag}<br>**Image**: #{newimg.full}\n"

data/lib/retag/image.rb

@@ -5,20 +5,24 @@ module Retag
   class Image
 
     include Utils
-    attr_reader :full, :image, :tag
+    attr_reader :full, :image, :tag, :api
 
-    def initialize(image, tag, suffix: nil)
+    def initialize(image, tag, suffix: nil, api: nil)
       @image = image
       @tag = tag
       @tag = "#{@tag}-#{suffix}" if suffix.present?
       @full = "#{@image}:#{@tag}"
+      @api = api
     end
 
-    def retag!(newtag = tag)
+    def retag!(newtag = tag, newproject: nil)
       uri = ::URI.parse("https://#{image}")
       repo = uri.path
       repo[0..0] = ''
+      project, registry = repo.split('/')
       uri.path = ''
+      newrepo = repo
+      newrepo = repo.sub("#{project}/", "#{newproject}/") if newproject
 
       content_type = 'application/vnd.docker.distribution.manifest.v2+json'
 
@@ -28,11 +32,23 @@ module Retag
 
         file.write(manifest.to_json)
         file.flush
+
         result = cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Content-Type: #{content_type}' -H 'Accept: #{content_type}' -X PUT --data-binary @#{file.path} '#{uri}/v2/#{repo}/manifests/#{newtag}' -o -", capture: true).strip
+
+        if newrepo != repo
+          if api == 'harbor'
+            result = cmd!("curl -s -u '#{dockerauth(uri.host)}' -X POST '#{uri}/api/v2.0/projects/#{newproject}/repositories/#{registry}/artifacts?from=#{repo}:#{newtag}' -o -", capture: true).strip
+          else
+            raise "Unable to promote image #{repo} -> #{newrepo} with #{api.inspect} api: Unimplemented"
+          end
+        end
+
         raise result unless result.empty?
       end
 
-      Image.new(image, newtag)
+      newuri = uri.dup
+      newuri.path = "/#{newrepo}"
+      Image.new(newuri.hostname + newuri.path, newtag)
     end
 
   end

data/lib/retag/service.rb

@@ -5,20 +5,21 @@ module Retag
 
     include Retag::Utils
 
-    attr_reader :name, :config, :repo, :release, :suffix
+    attr_reader :name, :config, :repo, :release, :suffix, :api
 
     delegate :revision, :branch, to: :repo
 
-    def initialize(name, config, release, branch:, suffix:)
+    def initialize(name, config, release, branch:, suffix:, api:)
       @name = name
       @config = config
       @repo = Retag::Repo.new(config['repo'], branch)
       @release = release
       @suffix = suffix
+      @api = api
     end
 
     def images
-      @images ||= config['images'].map{|img| Retag::Image.new(img, revision, suffix: @suffix) }
+      @images ||= config['images'].map{|img| Retag::Image.new(img, revision, suffix: @suffix, api: api) }
     end
   end
 end

data/lib/retag/version.rb

@@ -2,7 +2,7 @@
 
 module Retag
 
-  VERSION = '0.1.10'
+  VERSION = '0.2.1'
 
 end
 

data/lib/retag.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'active_support'
 require 'gitlab'
 require_relative 'retag/version'

data/retag.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new 'retag' do |spec|
   spec.executables   = spec.files.grep(%r{^bin/retag}) {|f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.1'
+  spec.add_development_dependency 'bundler', '>= 2.1.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
@@ -37,6 +37,8 @@ Gem::Specification.new 'retag' do |spec|
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'uri'
   spec.add_runtime_dependency 'yaml'
+  spec.add_runtime_dependency 'logger'
   spec.add_runtime_dependency 'zeitwerk', '~> 2.5.3'
+  spec.add_runtime_dependency 'multi_xml', '~> 0.6.0'
 end
 

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.1.10.265664
+  version: 0.2.1.289789
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.3
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: Retag is cli to manipulate docker images in handy way
 email:
 - kinnalru@gmail.com