retag 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cbe24b954c5ae0cc55386882c55d0d056239c20df8780ed732346e6fc577656
-  data.tar.gz: e71492bf16f2deb5ca71ca252a8324511c9469c20a5502cd00a703968c0782ae
+  metadata.gz: e2df15980e560df6495c0565d3b2eef9ea085c34ff1756dc53861e058c31833f
+  data.tar.gz: 0db02684208f5b8e4b97a6230495025a9033d7b8dfc2ecb3df4294c03b79eec6
 SHA512:
-  metadata.gz: bfb8cc1fa4fed581f33e96c53a0258ed9b9532d163a532a554d492e988202411eb70f23a8542f5b68acd7b79f1440d2f9429b0b454ed2f1d1a6873a2427caf1c
-  data.tar.gz: 7e764cecb0bfd5015a7c7b0f91b2cefbc72008421ede60e40c21d72ca8bb3806812120f7e35faa57c3c41c7da673ed2d7b9a483737e7bb46288dcdbbc1255bcc
+  metadata.gz: 1d71f1915637a2ca9b256094d49f615cc4f54413338467f82589853f172a4fb41992eb58db19b7bea0ae45743438c0ca80d3409994b2d1450e18ea30473ad762
+  data.tar.gz: 87ad3d50a71c22574565437d3192333bfe47a006ecdc1d8f26d86f3eba1a5e2a884bf7699176b82f528bd91c07761f629169bd87067619f6e3b373514a061520

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    retag (0.1.2)
+    retag (0.1.3)
       activesupport (~> 6.0)
       colorize
+      gitlab
       json
       thor
       uri
@@ -28,11 +29,21 @@ GEM
       rexml
     diff-lcs (1.5.0)
     docile (1.4.0)
+    gitlab (4.18.0)
+      httparty (~> 0.18)
+      terminal-table (>= 1.5.1)
     hashdiff (1.0.1)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     json (2.6.1)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
     minitest (5.15.0)
+    multi_xml (0.6.0)
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)

data/bin/retag

@@ -5,46 +5,23 @@ require 'thor'
 require 'colorize'
 require 'retag'
 
-UTIL = File.basename(__FILE__)
 ENV_PREFIX = 'RETAG'
 
 $logger = ActiveSupport::TaggedLogging.new(Retag::Logger.new(STDOUT))
-$logger.level = :debug
-
-# config = YAML.load_file('release.yml')
-# release = config['release']
-# services = config['services'].map{|(name, cfg)| Service.new(name, cfg, release)}
-
-# services.each do |srv|
-#   $logger.tagged(srv.name, srv.revision) do
-#     $logger.info "==> Releasing service #{srv.name} from #{srv.repo} at #{srv.branch}:"
-#     $logger.shift do
-#       #$logger.info "* Pulling service..."
-#       #srv.pull
-#       $logger.info "* Tagging service..."
-#       srv.release!
-#       #$logger.info "* Pushing service..."
-#       #srv.push
-#       #$logger.info "* Cleaning service..."
-#       #srv.rm
-#     end
-#   end
-# end
-
-# $logger.info "==> #{services.count} relesed as #{release}"
+$logger.level = :info
 
 class Cli < Thor
 
   def self.exit_on_failure?
     true
   end
+  
+  package_name "Retag is cli to manipulate docker images in handy way.
 
-  # class_option :plugin_gemname, default: ENV.fetch('PLUGIN_GEMNAME', 'unknown'),
-  #                               desc:    'Name of the current gem'
-  # class_option :service_image, default: ENV.fetch('SERVICE_IMAGE', 'tmpimage'),
-  #                              desc:    'Docker image name to build. Taken from SERVICE_IMAGE enviroment variable'
-  # class_option :service_tag, default: ENV.fetch('SERVICE_TAG', 'latest'),
-  #                            desc:    'Docker image tag to build. Taken from SERVICE_TAG enviroment variable'
+  # Gitlab authorization
+    Using GITLAB_API_ENDPOINT and GITLAB_API_PRIVATE_TOKEN environment variable used for authorization
+
+#{File.basename(__FILE__)}"
 
   desc 'version', 'Display version'
   map %w[-v --version] => :version
@@ -53,7 +30,7 @@ class Cli < Thor
     say Retag::VERSION
   end
 
-  desc 'tag', 'Tag Docker image without downloading'
+  desc 'tag', "Tag Docker image without downloading"
   map %w[--tag] => :tag
 
   option :image,  default:  ENV.fetch("#{ENV_PREFIX}_TAG_IMAGE", nil),
@@ -82,6 +59,7 @@ class Cli < Thor
     image.retag!(opts['tag'])
   end
 
+
   desc 'release', 'Release projects bundler from release.yml manifest'
   map %w[--release] => :release
 
@@ -98,70 +76,48 @@ class Cli < Thor
     config = YAML.load_file(File.expand_path(opts['config']))
     config['release'] = opts['name'] || config['release']
 
-    release = config['release']
+    release = config['release'].to_s
     suffix = config['suffix']
 
     services = config['services'].map do|(name, cfg)| 
       Retag::Service.new(name, cfg, release, suffix: cfg.fetch('suffix', suffix)) unless name.start_with?('.')
     end.compact
 
+    tag_message = "Release #{release} at #{DateTime.now.iso8601}"
+
+    $logger.info "*** Starting '#{tag_message.colorize(mode: :bold)}'...".colorize(:cyan)
+
     services.each do |srv|
       $logger.tagged(srv.name.colorize(:yellow), "#{srv.revision.colorize(mode: :bold)}@#{srv.branch}") do
-        $logger.info "#{'==>'.colorize(mode: :bold, color: :white)} Releasing service #{srv.name.colorize(:yellow)} from #{srv.repo} at #{srv.branch}:"
+        $logger.info "#{'==>'.colorize(mode: :bold, color: :white)} Releasing service #{srv.name.colorize(mode: :bold)} from #{srv.repo.repo} at #{srv.branch.colorize(mode: :bold)}:".colorize(:green)
         $logger.shift do
           srv.images.each do |img|
-            $logger.info "Source image: #{img.full}"
-            newimg = img.retag!(release)
-            $logger.info "Release image: #{newimg.full}"
+            $logger.info ">>> Image #{img.image}"
+
+            $logger.shift do
+              $logger.info "From ".ljust(5) + "[#{img.tag.colorize(:yellow)}]: ".ljust(35) + img.full
+              newimg = img.retag!(release)
+              $logger.info "To ".ljust(5) + "[#{newimg.tag.colorize(:yellow)}]: ".ljust(35) + newimg.full
+            end
+
+            $logger.info ">>> Repo #{srv.repo.repo}"
+
+            $logger.shift do
+              $logger.info "From ".ljust(5) + "[#{srv.revision.colorize(:yellow)}]: ".ljust(35) + "#{srv.repo.repo}~#{srv.revision}@#{srv.branch}"
+              newimg = img.retag!(release)
+              $logger.info "To ".ljust(5) + "[#{release.colorize(:yellow)}]: ".ljust(35) + "#{srv.repo.repo}~#{srv.revision}@#{release}"
+            end
+
+            srv.repo.tag!(release, message: tag_message)
           end
-          
-          #$logger.info "* Pulling service..."
-          #srv.pull
-          #$logger.info "* Tagging service..."
-          #srv.release!
-          #$logger.info "* Pushing service..."
-          #srv.push
-          #$logger.info "* Cleaning service..."
-          #srv.rm
         end
       end
     end
 
-  end
+    $logger.info "*** Completed '#{tag_message.colorize(mode: :bold)}'".colorize(:cyan)
 
-  private
-
-    def cache_image(opts)
-      "#{opts['service_image']}_cache:latest"
-    end
+  end
 
 end
 
 ::Cli.start
-
-# puts ARGV.inspect
-
-# parser.parse!
-
-# puts ARGV.inspect
-
-# warn parser.help
-# exit 1
-
-# config = {
-#   services: [
-#     {core: {images: []}}
-#   ]
-# }
-
-# release=$(cat .release | head -n 1)
-
-# for line in "${services[@]}"; do
-#   module=$(echo $line | cut -f1 -d '|')
-#   repo=$(echo $line | cut -f2 -d '|')
-#   branch=$(echo $line | cut -f3 -d '|')
-
-#   echo "Tagging ${module} from ${branch} of ${repo}"
-#   git subtree push --prefix="src/${module}" "${repo}" "feature/otr"
-# done
-

data/lib/retag/image.rb

@@ -35,18 +35,6 @@ module Retag
       Image.new(image, newtag)
     end
 
-    def pull(img = full)
-      cmd!("docker pull -q #{img}")
-    end
-
-    def push(img = full)
-      cmd!("docker push -q #{img}")
-    end
-
-    def rm(img = full)
-      cmd!("docker rmi #{img}")
-    end
-
   end
 end
 

data/lib/retag/repo.rb

@@ -0,0 +1,67 @@
+
+module Retag
+  class Repo
+
+    include Utils
+    attr_reader :repo, :branch, :revision, :name
+
+    def initialize(repo, branch)
+      @repo = repo
+      @branch = branch
+      @gitlab = Gitlab.client
+    end
+
+    def tag!(tag, message: nil)
+      begin
+        result = @gitlab.tag(name, tag)
+        if result.to_h.dig('commit', 'short_id').to_s == revision
+          # Success: tag with same revision already exists
+          return true
+        end
+      rescue Gitlab::Error::NotFound
+        # Success: there is no such tag
+      end
+      
+      @gitlab.create_tag(name, tag, revision, message)
+    end
+
+    def name
+      @name ||= @repo.split(':').last.gsub('.git', '')
+    end
+
+    def revision
+      @revision ||= begin
+        rev, _name = cmd!("git ls-remote #{repo} #{branch}", capture: true).split("\n").select{|line| line["heads/#{branch}"] }.first.split
+        rev[0..7]
+      end
+    end
+
+  end
+end
+
+
+
+
+# ==> /var/log/gitlab/gitlab-rails/api_json.log <==
+# {"time":"2022-01-21T10:48:07.308Z","severity":"INFO",
+# "duration_s":0.20214,"db_duration_s":0.00607,"view_duration_s":0.19607,"status":201,
+# "method":"POST","path":"/api/v4/projects/aggredator%2Fservices%2Fuprid3/repository/tags",
+# "params":[{"key":"tag_name","value":"testtag3"},{"key":"ref","value":"master"}],
+# "host":"br.rnds.pro","remote_ip":"213.138.65.74, 172.22.20.31, 213.138.65.74","ua":"curl/7.79.1",
+# "route":"/api/:version/projects/:id/repository/tags","user_id":38,"username":"bot",
+# "queue_duration_s":0.008366,"gitaly_calls":1,"gitaly_duration_s":0.16823,"redis_calls":6,
+# "redis_duration_s":0.004274,"redis_read_bytes":113,"redis_write_bytes":521,"redis_cache_calls":6,
+# "redis_cache_duration_s":0.004274,"redis_cache_read_bytes":113,"redis_cache_write_bytes":521,"db_count":10,
+# "db_write_count":0,"db_cached_count":0,"cpu_s":0.034309,"mem_objects":15111,"mem_bytes":920832,"mem_mallocs":3159,
+# "mem_total_bytes":1525272,"correlation_id":"01FSY40ANS3TD0CJJTDCQXGQ1N","meta.user":"bot","meta.project":"aggredator/services/uprid3",
+# "meta.root_namespace":"aggredator","meta.caller_id":"POST /api/:version/projects/:id/repository/tags",
+# "meta.remote_ip":"213.138.65.74","meta.feature_category":"source_code_management","meta.client_id":
+# "user/38","content_length":"0"}
+
+# ==> /var/log/gitlab/gitlab-rails/api_json.log <==
+# {"time":"2022-01-21T10:49:36.954Z","severity":"INFO",
+# "duration_s":0.01892,"db_duration_s":0.0036,"view_duration_s":0.01532,"status":400,
+# "method":"POST","path":"/api/v4/projects/aggredator%2Fservices%2Fuprid3/repository/tags",
+# "params":[{"key":"tag_name","value":"44444444"},{"key":"ref","value":"509a3719"},{"key":"message","value":{"message":"hello"}},{"key":"release_description","value":""}],"host":"br.rnds.pro","remote_ip":"213.138.65.74, 172.22.20.31, 213.138.65.74","ua":"Gitlab Ruby Gem 4.18.0","route":"/api/:version/projects/:id/repository/tags","user_id":38,"username":"bot","queue_duration_s":0.007279,"db_count":6,"db_write_count":0,"db_cached_count":0,"cpu_s":0.022143,"mem_objects":11483,"mem_bytes":783064,"mem_mallocs":2634,"mem_total_bytes":1242384,"correlation_id":"01FSY432CZMEFNDJQ88HMNW0E8","meta.user":"bot","meta.project":"aggredator/services/uprid3","meta.root_namespace":"aggredator","meta.caller_id":"POST /api/:version/projects/:id/repository/tags","meta.remote_ip":"213.138.65.74","meta.feature_category":"source_code_management","meta.client_id":"user/38","content_length":"78"}
+
+

data/lib/retag/service.rb

@@ -1,15 +1,18 @@
+require 'active_support/core_ext/module/delegation'
+
 module Retag
   class Service
 
     include Retag::Utils
 
-    attr_reader :name, :config, :repo, :branch, :release, :suffix
+    attr_reader :name, :config, :repo, :release, :suffix
+
+    delegate :revision, :branch, to: :repo
 
     def initialize(name, config, release, suffix: )
       @name = name
       @config = config
-      @repo = config['repo']
-      @branch = config['branch']
+      @repo = Retag::Repo.new(config['repo'], config.fetch('branch', 'master'))
       @release = release
       @suffix = suffix
     end
@@ -17,33 +20,6 @@ module Retag
     def images
       @images ||= config['images'].map{|img| Retag::Image.new(img, revision, suffix: @suffix) }
     end
-
-    def pull
-      images.each(&:pull)
-    end
-
-    def push
-      images.each(&:push)
-    end
-
-    def rm
-      images.each(&:rm)
-    end
-
-    def release!(tag = release)
-      images.each do |image|
-        image.retag!(tag)
-      end
-    end
-
-    def revision
-      @revision ||= begin
-        rev, _name = cmd!("git ls-remote #{repo} #{branch}", capture: true).split("\n").select{|line| line["heads/#{branch}"] }.first.split
-        rev[0..7]
-      end
-    end
-
-
   end
 end
 

data/lib/retag/version.rb

@@ -2,7 +2,7 @@
 
 module Retag
 
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
 end
 

data/lib/retag.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require 'active_support'
+require 'gitlab'
 require_relative 'retag/version'
 require_relative 'retag/logger'
 require_relative 'retag/utils'
 require_relative 'retag/image'
+require_relative 'retag/repo'
 require_relative 'retag/service'
 
 module Retag

data/retag.gemspec

@@ -35,5 +35,7 @@ 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 'gitlab'
+  
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,6 +212,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gitlab
+  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'
 description: Retag is cli to manipulate docker images in handy way
 email:
 - kinnalru@gmail.com
@@ -230,6 +244,7 @@ files:
 - lib/retag.rb
 - lib/retag/image.rb
 - lib/retag/logger.rb
+- lib/retag/repo.rb
 - lib/retag/service.rb
 - lib/retag/utils.rb
 - lib/retag/version.rb