oleg 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf6dc4d35d1d56ccd42336c8823eed7084bdc3e2
-  data.tar.gz: 7e606d646f3bb7e4813a883d9d77f6a6d1aecd36
+  metadata.gz: 1959ad4dcb10af988cca489723033a91a9ff9dd5
+  data.tar.gz: a376caa659e4830dfc91ad8137ef62f752a6ecd4
 SHA512:
-  metadata.gz: 5eecfdee1f304905f0103913c4b6f50b8a63c50a0f51ed3eae3c57f709bc5091a6cfac72b3fc352dc38a30f34e2a947fe7d8b9f025b753635a62efae28c0913e
-  data.tar.gz: 93e50b46cb0b4ddb905b3744e5b2c4461f37ca5c385a6809d6dd9b54f08744296f88e615dbf7fdfa5de7e0f4f461c7f433071e03bef39a87b0ed6b1831c7a450
+  metadata.gz: 4b20e1e39fe317138b9b6d61156026c59b6836984f7046239b71a422745463a820207b5436fbc15feb175de31801e21b27b07b158b4f56ba956adf8c75e4a8ad
+  data.tar.gz: 4dbeceee4d089a6e7e16bd2d0cd0281b2f1e8a34760a81d62c79f26d4d50630446e5fda29efb03a1114aa03bb40d3294b580ae561851da918251327dbfa3f04e

data/lib/leg/commands/repo.rb

@@ -58,8 +58,10 @@ class Leg::Commands::Repo < Leg::Commands::BaseCommand
 
     File.write("repo/.git/hooks/post-commit", POST_COMMIT_HOOK)
     File.write("repo/.git/hooks/prepare-commit-msg", PREPARE_COMMIT_MSG_HOOK)
+    File.write("repo/.git/hooks/post-rewrite", POST_REWRITE_HOOK)
     FileUtils.chmod(0755, "repo/.git/hooks/post-commit")
     FileUtils.chmod(0755, "repo/.git/hooks/prepare-commit-msg")
+    FileUtils.chmod(0755, "repo/.git/hooks/post-rewrite")
 
     FileUtils.rm_r(steps)
   end
@@ -67,6 +69,8 @@ class Leg::Commands::Repo < Leg::Commands::BaseCommand
   POST_COMMIT_HOOK = <<~'EOF'
     #!/usr/bin/env ruby
 
+    exit if File.exist?(File.join(ENV['GIT_DIR'], '.git/rebase-merge'))
+
     require 'rugged'
 
     repo = Rugged::Repository.discover
@@ -76,13 +80,20 @@ class Leg::Commands::Repo < Leg::Commands::BaseCommand
     tags << parts.join('-') unless parts.empty?
 
     tags.each do |tag|
-      repo.references.create("refs/tags/#{tag}", commit.oid)
+      unless repo.tags[tag]
+        repo.references.create("refs/tags/#{tag}", commit.oid)
+      end
     end
   EOF
 
   PREPARE_COMMIT_MSG_HOOK = <<~'EOF'
     #!/usr/bin/env ruby
 
+    exit if File.exist?(File.join(ENV['GIT_DIR'], '.git/rebase-merge'))
+
+    msg = File.read(ARGV[0])
+    exit if !msg.lines.first.strip.empty?
+
     require 'rugged'
 
     repo = Rugged::Repository.discover
@@ -105,5 +116,25 @@ class Leg::Commands::Repo < Leg::Commands::BaseCommand
       File.write(ARGV[0], msg)
     end
   EOF
+
+  POST_REWRITE_HOOK = <<~'EOF'
+    #!/usr/bin/env ruby
+
+    require 'rugged'
+
+    repo = Rugged::Repository.discover
+
+    tags = {}
+    repo.tags.each do |tag|
+      tags[tag.target.oid] = tag.name
+    end
+
+    while line = $stdin.gets
+      old_sha1, new_sha1 = line.split
+      if tags[old_sha1]
+        repo.references.update("refs/tags/#{tags[old_sha1]}", new_sha1)
+      end
+    end
+  EOF
 end
 

data/lib/leg/commands/unrepo.rb

@@ -19,21 +19,16 @@ class Leg::Commands::Unrepo < Leg::Commands::BaseCommand
 
     repo = Rugged::Repository.new("repo")
 
-    tag_names = {}
-    repo.tags.each do |tag|
-      if tag.name !~ /\A\d+(\.\d+)*\z/
-        tag_names[tag.target.oid] = tag.name
-      end
-    end
-
     walker = Rugged::Walker.new(repo)
     walker.sorting(Rugged::SORT_TOPO | Rugged::SORT_REVERSE)
     walker.push(repo.branches.find { |b| b.name == "master" }.target)
     walker.each.with_index do |commit, idx|
       step = (idx + 1).to_s
       step_name = step
-      if tag_name = tag_names[commit.oid]
-        step_name += "-#{tag_name}"
+
+      parts = commit.message.lines.first.strip.split('-')
+      if parts.length >= 2
+        step_name += "-#{parts[1..-1].join('-')}"
       end
 
       step_path = File.join(@config[:path], step_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oleg
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeremy Ruten