git-dd 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97dc4a649420571ccf91bc81296d361f7d5cf391
-  data.tar.gz: aa5ab72e486ce86dc61918d3eb3971c0c910527c
+  metadata.gz: 195328aea93732112ec5983e715276cbeb0935c6
+  data.tar.gz: 2966d39bef25e8662fc79b558655c3a526c9f35d
 SHA512:
-  metadata.gz: 9dd51a8d265e0649b8d01f5ce17ce0b88a69436dbfda4bb984a59266eb07f0c3e434d8ae07c9128d4e626aa22d581d61ae48e79eb8ccbcbada90f6418d8df69f
-  data.tar.gz: b65485880763ff0e485e964a93c47ff307c6cddf6c7d36e9e8e12b789fb2c5c7b3bd8b396e7541ab4d0911e97950a795e0faddc66da23f130912e0b77ca9bfda
+  metadata.gz: 29f6c41b4eed286729fa726edfd4d15947132cee51caddfe8b5e02316f86805060f9096824ce895eb0ae4e9fd94303200d4456dcc9ad70bdc6fa5bc419cc1d9c
+  data.tar.gz: 780bf3989ebca32acdc24e43e9859099e31b5594192a7d4ff113c593fd74d7b9bbb2b365bdddfb0da9aa65fe3cc13e6633e122d8dacca4d0eac8cd13cc7a43a2

data/lib/git-dd.rb

@@ -6,6 +6,8 @@ require 'const.rb'
 
 class GitDD
   attr_accessor :prompt
+  MERGED = "merged"
+  UNMERGE = "unmerge"
 
   def run(test_prompt = nil)
     branch_names = `git branch`
@@ -13,24 +15,25 @@ class GitDD
 
     branch_names = branch_names.split("\n")
 
-    branches_with_more_info = `git branch -vv`
-    begin
-      branches_with_more_info = branches_with_more_info.split("\n")
-    rescue
-      branches_with_more_info = `git branch`
-      branches_with_more_info = branches_with_more_info.split("\n")
-    end
+    branches_vv =
+      begin
+        str = `git branch -vv`
+        str.split("\n")
+      rescue
+        str = `git branch`
+        str.split("\n")
+      end
 
-    return if branch_names.size != branches_with_more_info.size
+    return if branch_names.size != branches_vv.size
 
-    branches = {}
-    branch_names.each_with_index { |b, i| branches[b] = branches_with_more_info[i] }
+    branches_for_select = {}
+    branch_names.each_with_index { |b, i| branches_for_select[b] = branches_vv[i] }
 
-    if branches.size == 1
+    if branches_for_select.size == 1
       return print(ONLY_ONE_BRANCH)
     end
 
-    branches = branches.select { |k, v| k != current_branch_with_mark && !k.include?("* (HEAD detached at") }
+    branches_for_select = branches_for_select.select { |k, v| k != current_branch_with_mark && !k.include?("* (HEAD detached at") }
 
     puts "Current branch is: #{current_branch.color(:green)}"
 
@@ -39,22 +42,28 @@ class GitDD
     else
       prompt = TTY::Prompt.new(interrupt: :exit)
     end
-
-    prompt.on(:keypress) do |event|
-      if event.value == 'q'
-        return
-      end
+    prompt.on(:keypress) { |event| return if event.value == 'q' }
+
+    branches_for_select.each do |k, v|
+      branches_for_select[k] =
+        if merged?(k)
+          MERGED.color(:green) + " " + v
+        else
+          UNMERGE.color(:red) + v
+        end
     end
 
     branches_to_delete = prompt.multi_select("Choose branches to delete:", per_page: 20, help: '',echo: false) do |menu|
-      branches.each { |k, v| menu.choice v, k}
+      branches_for_select.each { |k, v| menu.choice(v, k) }
     end
 
     if branches_to_delete.size == 0
       return print(NO_BRANCH_SELECTED)
     end
 
-    branches_to_delete.each { |b| puts b.color(:red) }
+    branches_to_delete.each do |b|
+      puts " "*4 + branches_for_select[b]
+    end
 
     ensure_delete = !prompt.no?('Are you sure?')
 
@@ -77,6 +86,19 @@ class GitDD
     @current_branch ||= `git rev-parse --abbrev-ref HEAD`.chomp
   end
 
+  def merged_branch_names
+    return @merged_branches if @merged_branches
+
+    @merged_branches = `git branch --merged`
+    @merged_branches = @merged_branches.split("\n")
+
+    @merged_branches = @merged_branches.select { |b| b != current_branch_with_mark }
+  end
+
+  def merged?(branch_name)
+    merged_branch_names.include? branch_name
+  end
+
   def print(return_message)
     puts return_message
     return_message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-dd
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Weiqing Chu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt