git-dd 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119a68302f596f42f45c28c892a860ead6bce8c4
-  data.tar.gz: 9e31472c5a09d088600e257989893fdb1e896318
+  metadata.gz: 562eabc3a7f3fd637d288a411e945901465abccf
+  data.tar.gz: 11463fec56a906f9a9f08e6d16ebf86aa743791b
 SHA512:
-  metadata.gz: 97938c6dfc866361558d3bfa6455eb469ad3c21819e27d6cff2d791a67a5c2569aa524606c9f291e95087db184ca0c9de8d57031032a8485208063047bc1fbf3
-  data.tar.gz: 7ad7282cc21c882c32832098cc4d4ae3bfa3e860a694161bb2583b034cf9ddc6ce1751ecfa8729644b5b9dc0a3be0a2afd4a1ee07dbcfa78e91c0e6bb4211f0a
+  metadata.gz: c8822502d974cf99b5c5a52ba498740157d0b578b6ed5cf34bf52c3e8a1b017de0b41cc7afbca75a818eb17b784897bb8b2b99d14a606676f887d14006e295eb
+  data.tar.gz: 63cfd3aa24afde3ff38cb63ffb7e110bd38b0cbd9a26429072f56c032ff8e1bda8252bc54676c2ac71ba3617d9da38b56236e2112b46ffbe2f6e9383d9aabc9c

data/lib/git-dd.rb

@@ -5,16 +5,26 @@ require 'rainbow/ext/string'
 
 class GitDD
   def run
-    branches = `git branch`
-    branches = branches.split("\n").select do |b|
-      b != current_branch_with_mark && !b.include?("* (HEAD detached at")
-    end
+    branch_names = `git branch`
+    return if $?.exitstatus != 0
+
+    branch_names = branch_names.split("\n")
+
+    branches_with_more_info = `git branch -vv`
+    branches_with_more_info = branches_with_more_info.split("\n")
+
+    return if branch_names.size != branches_with_more_info.size
+
+    branches = {}
+    branch_names.each_with_index { |b, i| branches[b] = branches_with_more_info[i] }
 
-    if branches.size == 0
+    if branches.size == 1
       puts "You only have one branch."
       return
     end
 
+    branches = branches.select { |k, v| k != current_branch_with_mark && !k.include?("* (HEAD detached at") }
+
     puts "Current branch is: #{current_branch.color(:green)}"
 
     prompt = TTY::Prompt.new(interrupt: :exit)
@@ -25,12 +35,18 @@ class GitDD
       end
     end
 
-    branches_to_delete = prompt.multi_select("Choose branches to delete:", branches, per_page: 20, help: '')
+    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}
+    end
+
+    branches_to_delete.each { |b| puts b.color(:red) }
 
     ensure_delete = !prompt.no?('Are you sure?')
 
     if ensure_delete
-      branches_to_delete.each { |b| puts `git branch -D #{b}`}
+      branches_to_delete.each do |b|
+        puts `git branch -D #{b}`.chomp.color(:yellow)
+      end
     end
   end
 
@@ -41,8 +57,6 @@ class GitDD
   end
 
   def current_branch
-    return @current_branch if @current_branch
-    @current_branch ||= `git rev-parse --abbrev-ref HEAD`
-    @current_branch = @current_branch.gsub("\n", '')
+    @current_branch ||= `git rev-parse --abbrev-ref HEAD`.chomp
   end
 end

metadata

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