git_eraser 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2a260bb2d50039ee1c4a8cf97d7113ff7b5cb51dee191ddb18c3ea19f381d1
-  data.tar.gz: 93a8034decfab3b1d3ef4dc5e8b8d6dc5bde6405bc95053d0aefe40bce06db58
+  metadata.gz: 61f89f4cfe8c92ef7f463912ed445bf6f77b1b60ad8117c1f70e11d70847bcbc
+  data.tar.gz: d33df662cd6391e2c945c7fdf5ef134727fa2b6a6ff6c674e553e502f20eca11
 SHA512:
-  metadata.gz: 25f0806bc3ed68855ecf58bae3747e7febd66cef2f718cd8ee8397f3f58fa3030b58ba001b85334a2d05eeac4ce51a0843e8980a374cc8925146e3912b68f6ca
-  data.tar.gz: 3dae50239cac78518abb2345959f425db9d948e7b3b62de912f831d142e6f87ee25f19b13a934440c0debba0d6201124f0096bc29e4a50fb1b80f1af6ed23137
+  metadata.gz: e24527a9ec43fc498bd8f957d463580102ae6a64f9fd4e5f4d3bc6619508a490d95156b03cfe2fe7d218cd74d0e18ad9c05de42b9378e28f214fb32b01051223
+  data.tar.gz: 24aa72ecedd6591fbb9060c3a81f44d1bc886391716b5106695d2e34187a45a9d2a100649083b37b3a4ae73863426072e77df42d2ee0d1bfea3808c9d8ad583f

data/lib/git_eraser.rb

@@ -4,6 +4,7 @@ require "highline"
 require "rainbow"
 require "httpclient"
 require "git"
+require 'whirly'
 
 module GitEraser
   class Error < StandardError; end
@@ -44,7 +45,7 @@ module GitEraser
             puts "    🧹 #{index + 1}. #{local_branch}"
           end
 
-          puts "\n\n"
+          puts "\n"
         rescue
           Helper.new.print_no_git_error_message
         end
@@ -67,7 +68,7 @@ module GitEraser
             puts "    🧹 #{index + 1}. #{origin_branch}"
           end
 
-          puts "\n\n"
+          puts "\n"
         rescue
           Helper.new.print_no_git_error_message
         end
@@ -86,12 +87,12 @@ module GitEraser
             puts "    🧹 #{index + 1}. #{local_branch}"
           end
 
-          puts "\n\n"
+          puts "\n"
 
           inputStream = HighLine.new
           should_delete_branches = inputStream.agree("Delete these branches? (y/n) ")
           if should_delete_branches == true
-            puts "\n\n"
+            puts "\n"
             g.checkout('master')
             g.branches.local.each_with_index do |local_branch, index|
               begin
@@ -105,8 +106,9 @@ module GitEraser
                 puts "    #{index + 1}. Can't remove '#{local_branch}' ❌"
               end
             end
+            puts "\n#{Rainbow("All local branches that merged to master had been deleted successfuly").underline.bright.green} 🎉🎉"
           end
-          puts "\n\n"
+          puts "\n"
         rescue
           Helper.new.print_no_git_error_message
         end
@@ -125,38 +127,42 @@ module GitEraser
             puts "    🧹 #{index + 1}. #{origin_branch}"
           end
 
-          puts "\n\n"
+          puts "\n"
 
           inputStream = HighLine.new
           should_delete_branches = inputStream.agree("Delete these branches? (y/n) ")
 
           if should_delete_branches == true
-            puts "\n\n"
-            g.checkout('master')
-            g.pull('origin', 'master')
-            array_of_remote_deleted_branches = []
-            g.branches.remote.each_with_index do |origin_branch, index|
-              begin
-                branch_string = origin_branch.to_s
-                branch_string['remotes/origin/'] = ''
-                g.checkout(branch_string)
-                if g.branch('master').contains?(branch_string) && branch_string != 'master'
-                  system "git push -u origin --delete #{branch_string} -q"
-                  puts "    #{index + 1}. '#{origin_branch}' Removed ✅"
-                  array_of_remote_deleted_branches.append(branch_string)
-                elsif branch_string == 'master'
-                  puts "    #{index + 1}. '#{origin_branch}' Can't remove 'master' branch ❌"
-                else
-                  puts "    #{index + 1}. '#{origin_branch}' Not merged into 'master' ❌"
+            puts "\n"
+            Whirly.start do
+              Whirly.status = "Deleting Origin Branches..."
+              g.checkout('master')
+              g.pull('origin', 'master')
+              array_of_remote_deleted_branches = []
+              g.branches.remote.each_with_index do |origin_branch, index|
+                begin
+                  branch_string = origin_branch.to_s
+                  branch_string['remotes/origin/'] = ''
+                  g.checkout(branch_string)
+                  if g.branch('master').contains?(branch_string) && branch_string != 'master'
+                    system "git push -u origin --delete #{branch_string} -q"
+                    puts "    #{index + 1}. '#{origin_branch}' Removed ✅"
+                    array_of_remote_deleted_branches.append(branch_string)
+                  elsif branch_string == 'master'
+                    puts "    #{index + 1}. '#{origin_branch}' Can't remove 'master' branch ❌"
+                  else
+                    puts "    #{index + 1}. '#{origin_branch}' Not merged into 'master' ❌"
+                  end
+                rescue
+                  puts "    #{index + 1}. Can't remove '#{origin_branch}' ❌"
                 end
-              rescue
-                puts "    #{index + 1}. Can't remove '#{origin_branch}' ❌"
               end
+              g.checkout('master')
+              delete_local_after_origin(array_of_remote_deleted_branches)
+              puts "\n#{Rainbow("All origin branches that merged to master had been deleted successfuly").underline.bright.green} 🎉🎉"
             end
-            g.checkout('master')
-            delete_local_after_origin(array_of_remote_deleted_branches)
           end
-          puts "\n\n"
+          puts "\n"
         rescue
           Helper.new.print_no_git_error_message
         end
@@ -169,9 +175,9 @@ module GitEraser
         begin
           g = Git.open("#{current_directory}")
           g.branches.local.each do |local_branch|
-            puts "Local: #{local_branch}"
+            # puts "Local: #{local_branch}"
             branches.each do |value|
-              puts "coming: #{value}"
+              # puts "coming: #{value}"
               if local_branch.to_s == value
                 local_branch.delete
               end
@@ -224,7 +230,7 @@ Here is a preview of your #{git_type} branches: \n\n"
 "
       puts "#{text2} \n"
       puts "Welcome to the #{Rainbow("Git Eraser").underline.bright.red} 🧹🧹 project! \n\n"
-      puts "⚠️⚠️ There is no #{Rainbow("git").underline.bright.red} directory here 😡 \n\n"
+      puts "⚠️⚠️ There is no #{Rainbow("git").underline.bright.red} directory here 😡 \n"
     end
 
     def print_no_flag_error_message
@@ -238,7 +244,7 @@ Here is a preview of your #{git_type} branches: \n\n"
 "
       puts "#{text2} \n"
       puts "Welcome to the #{Rainbow("Git Eraser").underline.bright.red} 🧹🧹 project! \n\n"
-      puts "⚠️⚠️ You didn't specify any flag, please use --local or --origin flag 😡 \n\n"
+      puts "⚠️⚠️ You didn't specify any flag, please use --local or --origin flag 😡 \n"
     end
   end
 

data/lib/git_eraser/version.rb

@@ -1,3 +1,3 @@
 module GitEraser
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_eraser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - KarimEbrahem
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.3
+- !ruby/object:Gem::Dependency
+  name: whirly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement