retag 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2df15980e560df6495c0565d3b2eef9ea085c34ff1756dc53861e058c31833f
-  data.tar.gz: 0db02684208f5b8e4b97a6230495025a9033d7b8dfc2ecb3df4294c03b79eec6
+  metadata.gz: ab2e731e32312b3a61a674ad910c1193b77130f6b7f72a93ec0675580bd5b078
+  data.tar.gz: 97835c0e4826a38949abd6de5882652705594eba0c24b501c8cec96a23f44151
 SHA512:
-  metadata.gz: 1d71f1915637a2ca9b256094d49f615cc4f54413338467f82589853f172a4fb41992eb58db19b7bea0ae45743438c0ca80d3409994b2d1450e18ea30473ad762
-  data.tar.gz: 87ad3d50a71c22574565437d3192333bfe47a006ecdc1d8f26d86f3eba1a5e2a884bf7699176b82f528bd91c07761f629169bd87067619f6e3b373514a061520
+  metadata.gz: d8bcbd2c1f5d286e9729b93179c6b03905533d2d71a06b07b361a55994a69ad9ccd981c94a37ea925f69caceb390591eee716cd4656a359c9a47e13a911d844c
+  data.tar.gz: 0352ce3e3aab8140a8e65cde805f5ca7846238a9725178a5c42dada297f90ca3c45bdcdc7a143c3ee34b8ce71204cdaaf7b455b29d8a1175fafc8da6b1cfef56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retag (0.1.3)
+    retag (0.1.4)
       activesupport (~> 6.0)
       colorize
       gitlab

data/bin/retag

@@ -10,36 +10,51 @@ ENV_PREFIX = 'RETAG'
 $logger = ActiveSupport::TaggedLogging.new(Retag::Logger.new(STDOUT))
 $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.
 
-  # Gitlab authorization
-    Using GITLAB_API_ENDPOINT and GITLAB_API_PRIVATE_TOKEN environment variable used for authorization
+class RepoCommand < Thor
+  desc "tag <project> <tag>", "Create tag in Gitlab project"
+  long_desc <<-LONGDESC
+  LONGDESC
+  option :force, default:  false,
+                 required: false,
+                 type:     :boolean,
+                 desc:     "Override Gitlab tag if exists"
 
-#{File.basename(__FILE__)}"
+  option :ref,  default:  ENV.fetch("#{ENV_PREFIX}_TAG_REF", 'master'),
+                required: true,
+                type:     :string,
+                desc:     "Gtilab refspec from which create tag"
 
-  desc 'version', 'Display version'
-  map %w[-v --version] => :version
+  option :message,  default:  nil,
+                    type:     :string,
+                    desc:     "Tag message"
 
-  def version
-    say Retag::VERSION
-  end
+  def tag(project, tag)
+    $logger.level = :debug if opts['verbose']
+    opts = options.to_h.dup
 
-  desc 'tag', "Tag Docker image without downloading"
-  map %w[--tag] => :tag
+    begin 
+      Gitlab.client.delete_tag(project, tag).inspect
+    rescue Gitlab::Error::NotFound
+      # Success: there is no such tag
+    end if opts['force']
+
+    puts Gitlab.client.create_tag(project, tag, options['ref'], options['message']).inspect
+  end
+end
 
+class DockerCommand < Thor
+  desc "tag", "Tag Docker image without downloading"
+  long_desc <<-LONGDESC
+  LONGDESC
   option :image,  default:  ENV.fetch("#{ENV_PREFIX}_TAG_IMAGE", nil),
                   required: true,
                   desc:     "Env: #{ENV_PREFIX}_TAG_IMAGE. Full image to be tagged.  Ex: docker.rnds.pro/aggredator/service-uprid3:latest"
 
   option :tag,    default:  ENV.fetch("#{ENV_PREFIX}_TAG_TAG", nil),
                   required: true,
-                  desc:     "Env: #{ENV_PREFIX}_TAG_TAG. New tag."
+                  desc:     "Env: #{ENV_PREFIX}_TAG_TAG. New tag"
 
   option :suffix, default:  ENV.fetch("#{ENV_PREFIX}_TAG_SUFFIX", nil),
                   required: false,
@@ -50,7 +65,9 @@ class Cli < Thor
   "
 
   def tag(*_args)
+    $logger.level = :debug if opts['verbose']
     opts = options.to_h.dup
+
     img, tag = opts['image'].split(':')
     tag ||= 'latest'
     tag = opts['suffix'].present? ? "#{tag}-#{opts['suffix']}" : tag
@@ -59,10 +76,14 @@ class Cli < Thor
     image.retag!(opts['tag'])
   end
 
+end
 
-  desc 'release', 'Release projects bundler from release.yml manifest'
-  map %w[--release] => :release
+class ReleaseCommand < Thor
+  default_command :release
 
+  desc "release", "Release projects bundler from release.yml manifest"
+  long_desc <<-LONGDESC
+  LONGDESC
   option :config, default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_CONFIG", './release.yml'),
                   required: true,
                   desc:     "Env: #{ENV_PREFIX}_RELEASE_CONFIG. Path to release manifest"
@@ -73,14 +94,17 @@ class Cli < Thor
 
   def release(*_args)
     opts = options.to_h.dup
+    $logger.level = :debug if opts['verbose']
+
     config = YAML.load_file(File.expand_path(opts['config']))
     config['release'] = opts['name'] || config['release']
 
     release = config['release'].to_s
     suffix = config['suffix']
+    branch = config['branch']
 
     services = config['services'].map do|(name, cfg)| 
-      Retag::Service.new(name, cfg, release, suffix: cfg.fetch('suffix', suffix)) unless name.start_with?('.')
+      Retag::Service.new(name, cfg, release, suffix: cfg.fetch('suffix', suffix), branch: cfg.fetch('branch', branch)) unless name.start_with?('.')
     end.compact
 
     tag_message = "Release #{release} at #{DateTime.now.iso8601}"
@@ -120,4 +144,37 @@ class Cli < Thor
 
 end
 
+
+class Cli < Thor
+
+  def self.exit_on_failure?
+    true
+  end
+  
+  package_name "Retag is cli to manipulate docker images in handy way.
+
+  # Gitlab authorization
+    Using GITLAB_API_ENDPOINT and GITLAB_API_PRIVATE_TOKEN environment variable used for authorization
+
+#{File.basename(__FILE__)}"
+
+  class_option :verbose, type: :boolean
+
+  desc 'version', 'Display version'
+  map %w[-v --version] => :version
+
+  def version
+    say Retag::VERSION
+  end
+
+  desc "repo SUBCOMMAND ...ARGS", "Manage git repository stuffs"
+  subcommand "repo", RepoCommand
+
+  desc "docker SUBCOMMAND ...ARGS", "Manage docker stuffs"
+  subcommand "docker", DockerCommand
+
+  desc "release SUBCOMMAND ...ARGS", "Manage releases"
+  subcommand "release", ReleaseCommand
+end
+
 ::Cli.start

data/lib/retag/repo.rb

@@ -31,7 +31,9 @@ module Retag
 
     def revision
       @revision ||= begin
-        rev, _name = cmd!("git ls-remote #{repo} #{branch}", capture: true).split("\n").select{|line| line["heads/#{branch}"] }.first.split
+        rev_name_pair = cmd!("git ls-remote #{repo} #{branch}", capture: true).split("\n").select{|line| line[/\/#{branch}$/] }.first
+        raise "There is no #{branch} revision at #{repo}" if rev_name_pair.nil?
+        rev, _name = rev_name_pair.split
         rev[0..7]
       end
     end
@@ -39,29 +41,3 @@ module Retag
   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

@@ -9,10 +9,10 @@ module Retag
 
     delegate :revision, :branch, to: :repo
 
-    def initialize(name, config, release, suffix: )
+    def initialize(name, config, release, branch:, suffix:)
       @name = name
       @config = config
-      @repo = Retag::Repo.new(config['repo'], config.fetch('branch', 'master'))
+      @repo = Retag::Repo.new(config['repo'], branch)
       @release = release
       @suffix = suffix
     end

data/lib/retag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Samoilenko Yuri