retag 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3eecc35217225b65ef71c75cc8cf5c5ee199291eadcc61b97a58b4899ab4ae3
-  data.tar.gz: 372810234ee2c03c9829ff86e11ee2b8942831d1fbc18c0ab9e19e34bd5985c3
+  metadata.gz: ab9f253e8ff9f3a7bfd637ddaa844cff811d3c75f79fde036bdacd8eb1f58f91
+  data.tar.gz: d36f32cb6b21896c28901f18420ef1ccf4207e4cf2683c42407bebd52662f761
 SHA512:
-  metadata.gz: 3bd613b85fee317a71a86fa8fff244826e06ca3d02be87e5ac3297ad418c569e895a9ba6e09349e121b749ca7e4f44b00c245b684867f3f8a8925071f8f36a97
-  data.tar.gz: c12042f6c60820062ab9761ab749ebe904ad843af76f1ef06a9666e9b0c851b436499ca8f3ad787a6961546a022a74c5cd06717eb0012296f9320b906cc42bb9
+  metadata.gz: 484c2c98bf6d72545501c1b4b43e139579ee37af5b8f0e1c7e5bf1c28998a8ba4c039fb4a2e7042edbdbf56304420d28b186104863599834c1a6db3ab8c78249
+  data.tar.gz: 390312a1b807c7790a80e4bb5e9f68c6644455b267dcbdd965d260af58106030b9b11cbc1477f21ac78f6a230660e09aef1d32313e94a5301f37b32bef60cd5d

data/Gemfile.lock

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

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.6'
 
 end
 

metadata

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