retag 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3eecc35217225b65ef71c75cc8cf5c5ee199291eadcc61b97a58b4899ab4ae3
-  data.tar.gz: 372810234ee2c03c9829ff86e11ee2b8942831d1fbc18c0ab9e19e34bd5985c3
+  metadata.gz: f11b13578478be3507e9a47f1a011f12cd5ba25a751b3fc84304685c1203f8b0
+  data.tar.gz: f48c1d71d7376ce8aaee00c3f5f8191c0dcc040f660fce1edb73f3c1a3fe6495
 SHA512:
-  metadata.gz: 3bd613b85fee317a71a86fa8fff244826e06ca3d02be87e5ac3297ad418c569e895a9ba6e09349e121b749ca7e4f44b00c245b684867f3f8a8925071f8f36a97
-  data.tar.gz: c12042f6c60820062ab9761ab749ebe904ad843af76f1ef06a9666e9b0c851b436499ca8f3ad787a6961546a022a74c5cd06717eb0012296f9320b906cc42bb9
+  metadata.gz: 1e11360d25de512b9d78feb6fdb0ae3157a05cb75ab02abdb064b5d4616cef46714782b787134ea3a15d529094b22bd5f785b38a82f3af0245bb47438d13ac86
+  data.tar.gz: e505928a71af0331668c835e7c14d7d1b4c9b32a6b9f2072cb1b3e6b75550ac70af526c325027824741ff9e97024bf3555e3a0ad1af1a4e94037b954a84437d7

data/Gemfile.lock

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

data/bin/retag

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'yaml'
+require 'erb'
 require 'thor'
 require 'colorize'
 require 'retag'
@@ -40,8 +41,31 @@ class RepoCommand < Thor
       # Success: there is no such tag
     end if opts['force']
 
+    $logger.info ">>> Repo #{project}"
+    $logger.info "  From ".ljust(5) + "[#{options['ref'].colorize(:yellow)}]".ljust(35)
+    $logger.info "  To ".ljust(5) + "[#{tag.colorize(:yellow)}]".ljust(35)
+
     puts Gitlab.client.create_tag(project, tag, options['ref'], options['message']).inspect
   end
+
+  desc "release <project> <tag>", "Create tag in Gitlab project"
+  long_desc <<-LONGDESC
+  LONGDESC
+
+  option :ref,  default:  ENV.fetch("#{ENV_PREFIX}_RELEASE_REF", 'master'),
+                required: true,
+                type:     :string,
+                desc:     "Gtilab refspec from which create tag"
+
+  option :description,  default:  nil,
+                        type:     :string,
+                        desc:     "description Markdown"
+  def release(project, tag)
+    $logger.info ">>> Repo #{project}"
+    $logger.info "  From ".ljust(5) + "[#{options['ref'].colorize(:yellow)}]".ljust(35)
+    $logger.info "  To ".ljust(5) + "[#{tag.colorize(:yellow)}]".ljust(35)
+    Gitlab.client.create_project_release(project, name: tag, tag_name: tag, description: options['description']&.strip, ref: options['ref'])
+  end
 end
 
 class DockerCommand < Thor
@@ -73,7 +97,11 @@ class DockerCommand < Thor
     tag = opts['suffix'].present? ? "#{tag}-#{opts['suffix']}" : tag
 
     image = ::Retag::Image.new(img, tag)
-    image.retag!(opts['tag'])
+
+    $logger.info ">>> Image #{img.image}"
+    $logger.info "  From ".ljust(5) + "[#{image.tag.colorize(:yellow)}]: ".ljust(35) + image.full
+    newimg = image.retag!(opts['tag'])
+    $logger.info "  To ".ljust(5) + "[#{newimg.tag.colorize(:yellow)}]: ".ljust(35) + newimg.full
   end
 
 end
@@ -92,18 +120,23 @@ class ReleaseCommand < Thor
                   required: false,
                   desc:     "Env: #{ENV_PREFIX}_RELEASE_NAME. Name of the current release"
 
+  option :manifest, default:  './manifest.md',
+                    required: false,
+                    type:     :string,
+                    desc:     "Output file for Markdown manifest of the release"
+
   def release(*_args)
     opts = options.to_h.dup
     $logger.level = :debug if opts['verbose']
 
-    config = YAML.load_file(File.expand_path(opts['config']))
+    config = YAML.load(ERB.new(File.read(File.expand_path(opts['config']))).result)
     config['release'] = opts['name'] || config['release']
 
     release = config['release'].to_s
-    suffix = config['suffix']
-    branch = config['branch']
+    suffix = config['default-suffix']
+    branch = config['default-branch']
 
-    services = config['services'].map do|(name, cfg)| 
+    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?('.')
     end.compact
 
@@ -111,6 +144,8 @@ class ReleaseCommand < Thor
 
     $logger.info "*** Starting '#{tag_message.colorize(mode: :bold)}'...".colorize(:cyan)
 
+    markdown = "## Services\n\n"
+
     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(mode: :bold)} from #{srv.repo.repo} at #{srv.branch.colorize(mode: :bold)}:".colorize(:green)
@@ -122,22 +157,28 @@ class ReleaseCommand < Thor
               $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
+
+              markdown += "* **Name**: `#{srv.name}`<br>**Version**: #{img.tag}<br>**Image**: #{newimg.full}\n"
             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)
+              srv.repo.tag!(release, message: tag_message)
               $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
         end
       end
     end
 
+    File.write(opts['manifest'], markdown.strip)
+
+
+
+
     $logger.info "*** Completed '#{tag_message.colorize(mode: :bold)}'".colorize(:cyan)
 
   end

data/lib/retag/repo.rb

@@ -31,13 +31,27 @@ module Retag
 
     def revision
       @revision ||= begin
-        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?
+        # "^{}" means  the object could be a tag. https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitrevisions.html#_specifying_revisions 
+        # Example:
+        # git ls-remote git@gir.example.com:repo.git | grep release-latest
+        # 174cf2b6685df563e59c5cd0d367996fcf24f0ae        refs/tags/release-latest       <-- annotated tag itself
+        # 47208e276cd277896887417a383e05973278438c        refs/tags/release-latest^{}    <-- WE NEED: original commit tag is references to
+        rev_name_pair = remote_refs(repo, branch+"^{}") # try to find commit tag is references to
+        rev_name_pair ||= remote_refs(repo, branch)     # try to find simple branch or commit
+
+        raise "There is no '#{branch}' revision at #{repo}" if rev_name_pair.nil?
+
         rev, _name = rev_name_pair.split
         rev[0..7]
       end
     end
 
+  private
+
+    def remote_refs repo, branch
+      cmd!("git ls-remote #{repo} #{branch}", capture: true).split("\n").select{|line| line.strip.end_with?("/#{branch}") }.first
+    end
+
   end
 end
 

data/lib/retag/version.rb

@@ -2,7 +2,7 @@
 
 module Retag
 
-  VERSION = '0.1.5'
+  VERSION = '0.1.9'
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler