git_commands 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d715f8ac8ef6b5bf01a245a2133b7d519a299a
-  data.tar.gz: 25aa0aa99a3ce31fa2b451eadc5a78f7abe3f77f
+  metadata.gz: cdad6f742ea09e2b50d560714ee7a74b7848ffc5
+  data.tar.gz: 88697a5add19a72d6cbb0602e1ee423aa6bcbb6b
 SHA512:
-  metadata.gz: 52d78c66d5ad58c572b4494d351245ec15e693b52bbc7d524bf5f1e2af3e6530fda2aac73a8c95af637421d1d7f872c16b6e33ffe27739b749c312a125dd191f
-  data.tar.gz: 55fbd08440747822e4480eec3ac4b375fc93ad0e98a20ad865ed26247a89e87d12b5c538c3d4df1b5842bf6e09f6c4598ee5bf0146ff3484785c9526d595cca0
+  metadata.gz: 90a1dbe956bb86468132c4993d2443ead432a6998dcaf6f1e64f320971a97bf466bbdee99dc81ae7b854f40782299bab8ad357bc5644adfceca07fe20db4483f
+  data.tar.gz: 38774eda256e02d2e4ba318de4e031862392ab9ecbb785121b0525dd8df05331627e42ba68e02ebeaf51f5f8da9f9156a389fb43aacc2215266f1ae6f930fdf3

data/lib/git_commands/branch.rb

@@ -59,8 +59,9 @@ module GitCommands
       @name == MASTER
     end
 
-    private def exists?
-      `git rev-parse --verify origin/#{@name} 2> /dev/null`.match(/^[0-9a-z]+/)
+    def exists?(remote = true)
+      origin = ORIGIN if remote
+      `git rev-parse --verify #{origin}#{@name} 2> /dev/null`.match(/^[0-9a-z]+/)
     end
   end
 end

data/lib/git_commands/command.rb

@@ -16,7 +16,6 @@ module GitCommands
     def initialize(repo:, branches:, repo_klass: Repository, branch_klass: Branch, out: STDOUT)
       @out = out
       @repo = repo_klass.new(repo)
-      @conflictual = []
       Dir.chdir(@repo) do
         @branches = branch_klass.factory(branches)
         @timestamp = Time.new.strftime("%Y-%m-%d")
@@ -26,12 +25,10 @@ module GitCommands
 
     def purge
       enter_repo do
-        @branches.each do |branch|
-          warning("Removing branch: #{branch}")
-          confirm("Remove local branch") do
-            `git branch -D #{branch}`
-          end
-          confirm("Remove remote branch") do
+        confirm("Proceed removing these branches") do
+          @branches.each do |branch|
+            warning("Removing branch: #{branch}")
+            `git branch -D #{branch}` if branch.exists?(false)
             `git push origin :#{branch}`
           end
         end
@@ -45,13 +42,12 @@ module GitCommands
             warning("Rebasing branch: #{branch}")
             `git checkout #{branch}`
             `git pull origin #{branch}`
-            @conflictual << branch && next unless rebase_with_master
+            next unless rebase_with_master
             `git push -f origin #{branch}`
             `git checkout #{Branch::MASTER}`
             `git branch -D #{branch}`
-            success "Rebased successfully!"
+            success("Rebased successfully!")
           end
-          delete_conflictual
         end
       end
     end
@@ -65,16 +61,14 @@ module GitCommands
           @branches.each do |branch|
             warning("Merging branch: #{branch}")
             `git checkout -b #{temp} origin/#{branch} --no-track`
-            @conflictual << branch && next unless rebase_with_master
+            exit unless rebase_with_master
             `git rebase #{aggregate}`
             `git checkout #{aggregate}`
             `git merge #{temp}`
-            `git branch -d #{temp}`
+            `git branch -D #{temp}`
           end      
-          `git checkout #{Branch::MASTER}`
         end
-        delete_conflictual
-        success "#{aggregate} branch created"
+        success("#{aggregate} branch created")
       end
     end
 
@@ -82,7 +76,7 @@ module GitCommands
       fail GitError, "No branches loaded!" if @branches.empty?
       size = @branches.to_a.size
       plural = size > 1 ? "es" : ""
-      success "Successfully loaded #{size} branch#{plural}:"
+      success("Successfully loaded #{size} branch#{plural}:")
       @out.puts @branches.each_with_index.map { |branch, i| "#{(i+1).to_s.rjust(2, "0")}. #{branch}" } + [""]
     end
 
@@ -98,14 +92,6 @@ module GitCommands
       error("Got conflicts, aborting rebase!")
     end
 
-    private def delete_conflictual
-      return if @conflictual.empty?
-      `git checkout #{Branch::MASTER}`
-      @conflictual.each do |branch|
-        `git branch -D #{branch}`
-      end
-    end
-
     private def enter_repo
       Dir.chdir(@repo) do
         pull_master

data/lib/git_commands/prompt.rb

@@ -12,7 +12,7 @@ module GitCommands
     end
 
     def warning(message)
-      out.puts "\n#{message}...".yellow
+      out.puts "\n#{message}".yellow
     end
 
     def success(message)

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.2.4"
+  VERSION = "3.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - costajob