retag 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2e731e32312b3a61a674ad910c1193b77130f6b7f72a93ec0675580bd5b078
-  data.tar.gz: 97835c0e4826a38949abd6de5882652705594eba0c24b501c8cec96a23f44151
+  metadata.gz: '08fafd02b0f8303e61cf27f338a7f06cf0c15ddd3c0d3f46d90ef5cd3af70736'
+  data.tar.gz: 1cf4a60243193e23ebceb8e039c1cee3995f1511eb627fbe782a05dbcd9ab508
 SHA512:
-  metadata.gz: d8bcbd2c1f5d286e9729b93179c6b03905533d2d71a06b07b361a55994a69ad9ccd981c94a37ea925f69caceb390591eee716cd4656a359c9a47e13a911d844c
-  data.tar.gz: 0352ce3e3aab8140a8e65cde805f5ca7846238a9725178a5c42dada297f90ca3c45bdcdc7a143c3ee34b8ce71204cdaaf7b455b29d8a1175fafc8da6b1cfef56
+  metadata.gz: b6bb908c029857da4d61be1c4ff47a13a2addd99966a41206b4326a961c675f5b0a4ec51a865b6a56f3cd1389238c8694d5cbe2a5a5f0ed435c3ff424ef1ce81
+  data.tar.gz: bc4dfbcdabf013a4f9e1c981d272a212712471e5ac4697a0343c47c220e9464e416ed4f0fe386ecb6c50d4a274e13bb23569e5797917e364f4a66e78ba2e2ba6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    retag (0.1.4)
+    retag (0.1.6)
       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'
@@ -31,8 +32,8 @@ class RepoCommand < Thor
                     desc:     "Tag message"
 
   def tag(project, tag)
-    $logger.level = :debug if opts['verbose']
     opts = options.to_h.dup
+    $logger.level = :debug if opts['verbose']
 
     begin 
       Gitlab.client.delete_tag(project, tag).inspect
@@ -42,6 +43,22 @@ class RepoCommand < Thor
 
     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)
+    Gitlab.client.create_project_release(project, name: tag, tag_name: tag, description: options['description'], ref: options['ref'])
+  end
 end
 
 class DockerCommand < Thor
@@ -65,8 +82,8 @@ class DockerCommand < Thor
   "
 
   def tag(*_args)
-    $logger.level = :debug if opts['verbose']
     opts = options.to_h.dup
+    $logger.level = :debug if opts['verbose']
 
     img, tag = opts['image'].split(':')
     tag ||= 'latest'
@@ -96,14 +113,14 @@ class ReleaseCommand < Thor
     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
 

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.4'
+  VERSION = '0.1.8'
 
 end
 

metadata

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