rebase_pusher 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 210c9f95029d1cae3b877543d0ff198a4265c821be7259f5408f58a4418448e6
-  data.tar.gz: 8c7f2eb6e24a355cdb253847085850002e825788b3452abe4ad6a05773b47943
+  metadata.gz: ea6b60854fd639a3a3568a751ed96b6e8dbc60990af06c897352a0945d930ec5
+  data.tar.gz: dabea95fa123961a2303c5843a4772251a7abd0e5f63051459ed781693a0933a
 SHA512:
-  metadata.gz: e0923d87a648c7fd793bc13d8156248ae2f025f02f1e016e06aa83c8253020711ed25bff2f491612342698215a1eff1d9352000a163ec13afebe6636e159353e
-  data.tar.gz: 1c1a9cfb77237650ff34a277b967a7bb353c868604f86c42d6e35a8f851e27a3226620d65b6ab668594677120b00ebbfcefbf5f5f0b4658c274069cacb2452dd
+  metadata.gz: ca2fbba0884864ea4904621f896a0a85506fa65a292934bc3087aea23fb342c4dc6d56620dd0e1bce1a42f68fb174ea216ca5a6243372536b367d03ea97a1f8f
+  data.tar.gz: 20bc3a2fe1848e6fb6374585116410bf603e67528517d1413e2bc81c58e3f329c40dbfbc5e1d470d14a282e742d25d51f92127ec984a084a3954fc54a9486724

data/bin/rebase_push

@@ -15,6 +15,7 @@ OptionParser.new do |opts|
 
     Example:
         rebase_push -t reset
+        rebase_push -t reset --ignore branch1,branch2,branch3
         rebase_push -t rebase
         rebase_push -t force_push # this is slow, calm down
         rebase_push -t reset && rebase_push -t rebase
@@ -34,6 +35,10 @@ OptionParser.new do |opts|
   opts.on("-v", "--verbose", "Run verbosely") do |v|
     options[:verbose] = v
   end
+
+  opts.on("--ignore branch1,branch2", Array, "Specify ignored branches") do |branches|
+    options[:ignored_branches] = branches.uniq
+  end
 end.parse!
 
 RebasePusher.new(options).run

data/lib/rebase_pusher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RebasePusher
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/rebase_pusher.rb

@@ -23,12 +23,12 @@ class RebasePusher
   end
 
   def run
-    io.puts "skipped branches: #{branches - my_branches}"
+    io.puts "skipped branches: #{branches - to_operate_branches}"
     sh("git checkout --quiet #{default_branch}")
 
     case options[:operation_type]
     when :rebase
-      my_branches.each do |branch|
+      to_operate_branches.each do |branch|
         io.print "." if !options[:verbose]
         sh("git rebase --quiet #{default_branch} #{branch}")
       end
@@ -36,7 +36,7 @@ class RebasePusher
       io.puts if !options[:verbose]
       io.puts "all my branches are rebased"
     when :reset
-      my_branches.each do |branch|
+      to_operate_branches.each do |branch|
         io.print "." if !options[:verbose]
         sh("git branch --force #{branch} #{branch}@{u}")
       end
@@ -46,7 +46,7 @@ class RebasePusher
     when :force_push
       # https://git-scm.com/docs/git-push
       # refspec: <src>:<dst>
-      my_branches.each do |branch|
+      to_operate_branches.each do |branch|
         io.print "." if !options[:verbose]
         sh("git push origin --quiet --force-with-lease --force-if-includes #{branch}:#{branch}")
       end
@@ -56,22 +56,26 @@ class RebasePusher
     else
       raise "NOT SUPPORTTED"
     end
-
+  ensure
     sh("git checkout --quiet #{original_branch}")
   end
 
   private
 
-  # Ensure I never touch other people's branch
-  def my_branches
-    @my_branches ||= branches.select do |branch|
+  def to_operate_branches
+    @to_operate_branches ||= branches.select do |branch|
       merge_base_commitid = sh("git merge-base #{default_branch} #{branch}").chomp
+      # Make sure I never touch other people's branch
       author_emails = sh("git log --format='%ae' #{merge_base_commitid}..#{branch}").split("\n").uniq
 
-      !author_emails.empty? && author_emails.all? { |email| email == my_email }
+      !ignored_branches?(branch) && !author_emails.empty? && author_emails.all? { |email| email == my_email }
     end
   end
 
+  def ignored_branches?(branch)
+    options[:ignored_branches].include?(branch)
+  end
+
   def default_branch
     @default_branch ||= sh("git rev-parse --abbrev-ref origin/HEAD").chomp
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rebase_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - lijunwei
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies: []
 description: git rebase and push for all my branches
 email: