retag 0.1.6 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9f253e8ff9f3a7bfd637ddaa844cff811d3c75f79fde036bdacd8eb1f58f91
-  data.tar.gz: d36f32cb6b21896c28901f18420ef1ccf4207e4cf2683c42407bebd52662f761
+  metadata.gz: 4cde121c1134315e7af8b6f3b99287852eff68bfaedd8cd45149672b10c2f39a
+  data.tar.gz: 2347a0a62ff16b0d850bbd408b62584ed5831c8407259ae039b3b4ba4e7ece4b
 SHA512:
-  metadata.gz: 484c2c98bf6d72545501c1b4b43e139579ee37af5b8f0e1c7e5bf1c28998a8ba4c039fb4a2e7042edbdbf56304420d28b186104863599834c1a6db3ab8c78249
-  data.tar.gz: 390312a1b807c7790a80e4bb5e9f68c6644455b267dcbdd965d260af58106030b9b11cbc1477f21ac78f6a230660e09aef1d32313e94a5301f37b32bef60cd5d
+  metadata.gz: e380ab0f64df32dee97b74f97c4d3960e2505b5b1cf055fb9fd6870dab52a8cce245968f5c6854993e5036e0de01e7bdf4a4a7497f576512c07ed075a2718da9
+  data.tar.gz: 459d326b5e1d396e1fc721fe8b4c98cf4c8398318cd3392bfb9de1e0864e9ca4ce64b34b77f85d7ec3def20f0a56395d24e59b8e319dcca70c29e7c0d40b5595

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retag (0.1.6)
+    retag (0.1.10)
       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 #{image.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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.10
 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