git_commands 3.2.8 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbe7c65035ffcdc39c81b47463b9314aa07ab8a3
-  data.tar.gz: e0ce45188c080726af5ce804af1da49f2c5ed874
+  metadata.gz: cc41c685ee29b19f620cbf0048aabc586edd6afe
+  data.tar.gz: b0f79689c6acfff02ba0063949758c9882b56047
 SHA512:
-  metadata.gz: 0f165f80fcdb236a9da0549bd496f23573e996a3a8c4252a5b22e069350ac0007fd75268e585041eb6bb10546db5f597bc51eb48ae10f48bfa73e5736f3b266a
-  data.tar.gz: 9defaf6c85f58a02fcfe511e358443b4ff472074911f0ccea4ef4eca31c80f57e7416f42b990def0cae5b4b75bcada4107c23aed996923578aa0e535448f79ea
+  metadata.gz: 68a1bfc9f4ebd26648c29150a8d12a019cee51338d39e05de19bdae3202bdd74ea549595b644d710ed9ffef5655bacacc9dbba0003e6a66e24f08eb0d232d812
+  data.tar.gz: d6328e5ff3d553be85d27572e62160b7bafbd727af9e01f0ec45ead34e6415aaf076359ed290da75dc5d8620f874c325d595bc923d0163375657a375b523beb3

data/lib/git_commands/computer.rb

@@ -53,21 +53,21 @@ module GitCommands
 
     def aggregate
       temp = "temp/#{@timestamp}"
-      aggregate = "release/#{@timestamp}"
-      confirm("Aggregate branches into #{aggregate}") do
+      release = "release/#{@timestamp}"
+      confirm("Aggregate branches into #{release}") do
         enter_repo do
-          `git branch #{aggregate}`
+          `git branch #{release}`
           @branches.each do |branch|
             warning("Merging branch: #{branch}")
             `git checkout -b #{temp} origin/#{branch} --no-track`
-            exit unless rebase_with_master
-            `git rebase #{aggregate}`
-            `git checkout #{aggregate}`
+            remove_locals([temp, release]) && exit unless rebase_with_master
+            `git rebase #{release}`
+            `git checkout #{release}`
             `git merge #{temp}`
             `git branch -D #{temp}`
           end      
         end
-        success("#{aggregate} branch created")
+        success("#{release} branch created")
       end
     end
 
@@ -98,9 +98,9 @@ module GitCommands
       end
     end
 
-    private def remove_locals
+    private def remove_locals(branches = @branches)
       `git checkout #{Branch::MASTER}`
-      @branches.each do |branch|
+      branches.each do |branch|
         `git branch -D #{branch}`
       end
     end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.2.8"
+  VERSION = "3.2.9"
 end

metadata

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