git-dd 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18a12242e43da137f3b7f46d5fbb61da544f9bd3
-  data.tar.gz: d0e18114fc7615f5b0ec9cd9165f5d583444f510
+  metadata.gz: 5115a3ac2184af4b5c7b5da6918b945649bc968c
+  data.tar.gz: d38a39047fbd1d13eda7692e420b6a760201f137
 SHA512:
-  metadata.gz: 80db41e5854589d321d3a52bb7891d1bf8fcb6a0d9826767c61a164e12724613f43d74990b9060d3881f1affaae275830da6da05df38a26342b9e4caf8c47f90
-  data.tar.gz: be30606ceaf468593cc221eb22c57a52646a7d8a0b05225e02d5c2e283c092d47a8fdabbd3a4cbfc0075b14baaa462f284669bce8716233cefbe0d0621928d59
+  metadata.gz: f3043e7132eb2d38aec46a3fede7905365ec33b45e81bc79ced688061ea8a3bf2f285fbeb0a121bd32abedb7dd88d8b5623255e7d6df051bfa6a7bfff7c41edb
+  data.tar.gz: 6966dd36a6793924dbd97ec28c052f20f3a35aa8c0747c1656ebb8bca706987e7941bb80e3f7f50aff7676dafabc513f03ff53fb3f1742fc31eb96aebbfac695

data/bin/git-dd

@@ -1,5 +1,25 @@
 #!/usr/bin/env ruby
 
 require 'git-dd'
+require 'git-dd/version'
+require 'slop'
 
-GitDD.new.run
+opts = Slop::Options.new
+opts.banner = "usage: git dd [options] ..."
+opts.null '[no options]', 'select branches to delete'
+opts.bool '-m', '--merged', 'delete branches have been merged into current branch'
+opts.bool '-v', '--version', 'print the version'
+opts.bool '-h', '--help', 'print help'
+
+parser = Slop::Parser.new(opts)
+result = parser.parse(ARGV).to_hash
+
+if result[:version]
+  puts GitDD::VERSION
+elsif result[:merged]
+  GitDD.new.delete_merged_branches
+elsif result[:help]
+  puts opts
+else
+  GitDD.new.select_branches_to_delete
+end

data/lib/git-dd.rb

@@ -2,76 +2,57 @@
 
 require 'tty-prompt'
 require 'rainbow/ext/string'
-require 'const.rb'
+require_relative './git-dd/const.rb'
 
 class GitDD
   attr_accessor :prompt
   MERGED = "merged"
   UNMERGE = "unmerge"
+  DETACHED = "* (HEAD detached at"
 
-  def run(test_prompt = nil)
-    branch_names = `git branch`
-    return if $?.exitstatus != 0
+  def initialize(test_prompt = nil)
+    if test_prompt
+      @prompt = test_prompt
+    else
+      @prompt = TTY::Prompt.new(interrupt: :exit)
+    end
 
-    branch_names = branch_names.split("\n")
+    @prompt.on(:keypress) { |event| exit 1 if event.value == 'q' }
+  end
 
-    branches_vv =
-      begin
-        str = `git branch -vv`
-        str.split("\n")
-      rescue
-        str = `git branch`
-        str.split("\n")
-      end
+  def delete_merged_branches()
+    return print(NO_MERGED_BRANCH) if merged_branches.size == 0
 
-    return if branch_names.size != branches_vv.size
+    puts "Branches have been merged into: #{current_branch.color(:green)}"
 
-    branches_for_select = {}
-    branch_names.each_with_index { |b, i| branches_for_select[b] = branches_vv[i] }
+    merged_branches.each { |b| puts " "*4 + branches_for_select[b] }
 
-    if branches_for_select.size == 1
-      return print(ONLY_ONE_BRANCH)
-    end
+    ensure_delete = !prompt.no?('Are you sure?')
 
-    branches_for_select = branches_for_select.select { |k, v| k != current_branch_with_mark && !k.include?("* (HEAD detached at") }
+    merged_branches.each { |b| delete(b) } if ensure_delete
 
-    puts "Current branch is: #{current_branch.color(:green)}"
+    return merged_branches
+  end
 
-    if test_prompt
-      prompt = test_prompt
-    else
-      prompt = TTY::Prompt.new(interrupt: :exit)
-    end
-    prompt.on(:keypress) { |event| return if event.value == 'q' }
+  def select_branches_to_delete()
+    return if branches.size != branches_vv.size
+    return print(ONLY_ONE_BRANCH) if branches_for_select.size == 0
 
-    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
+    puts "Current branch is: #{current_branch.color(:green)}"
 
-    branches_to_delete = prompt.multi_select("Choose branches to delete:", per_page: 20, help: '',echo: false) do |menu|
+    prompt_options = { per_page: 20, help: '', echo: false }
+    prompt_help = "Choose branches to delete:"
+    branches_to_delete = @prompt.multi_select(prompt_help, prompt_options) do |menu|
       branches_for_select.each { |k, v| menu.choice(v, k) }
     end
 
-    if branches_to_delete.size == 0
-      return print(NO_BRANCH_SELECTED)
-    end
+    return print(NO_BRANCH_SELECTED) if branches_to_delete.size == 0
 
-    branches_to_delete.each do |b|
-      puts " "*4 + branches_for_select[b]
-    end
+    branches_to_delete.each { |b| puts " "*4 + branches_for_select[b] }
 
     ensure_delete = !prompt.no?('Are you sure?')
 
-    if ensure_delete
-      branches_to_delete.each do |b|
-        puts `git branch -D #{b}`.chomp.color(:yellow)
-      end
-    end
+    branches_to_delete.each { |b| delete(b) } if ensure_delete
 
     return branches_to_delete
   end
@@ -86,7 +67,7 @@ class GitDD
     @current_branch ||= `git rev-parse --abbrev-ref HEAD`.chomp
   end
 
-  def merged_branch_names
+  def merged_branches
     return @merged_branches if @merged_branches
 
     @merged_branches = `git branch --merged`
@@ -95,12 +76,53 @@ class GitDD
     @merged_branches = @merged_branches.select { |b| b != current_branch_with_mark }
   end
 
-  def merged?(branch_name)
-    merged_branch_names.include? branch_name
+  def branches
+    return @branches if @branches
+
+    @branches = `git branch`
+    @branches = @branches.split("\n")
+  end
+
+  def branches_vv
+    @branches_vv ||=
+      begin
+        str = `git branch -vv`
+        str.split("\n")
+      rescue
+        str = `git branch`
+        str.split("\n")
+      end
+  end
+
+  def branches_for_select
+    return @branches_for_select if @branches_for_select
+
+    @branches_for_select = {}
+    branches.each_with_index { |b, i| @branches_for_select[b] = branches_vv[i] }
+
+    @branches_for_select = @branches_for_select.select \
+      { |k, v| k != current_branch_with_mark && !k.include?(DETACHED) }
+
+    @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
+  end
+
+  def merged?(branch)
+    merged_branches.include? branch
   end
 
   def print(return_message)
     puts return_message
     return_message
   end
+
+  def delete(branch)
+    puts `git branch -D #{branch}`.chomp.color(:yellow)
+  end
 end

data/lib/git-dd/const.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+NO_BRANCH_SELECTED = "No branch selected"
+ONLY_ONE_BRANCH = "You only have one branch"
+NO_MERGED_BRANCH = "No merged branch"

data/lib/git-dd/version.rb

@@ -0,0 +1,3 @@
+class GitDD
+  VERSION = "0.4.0".freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-dd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Weiqing Chu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -28,16 +28,30 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +70,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -74,8 +88,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/git-dd
-- lib/const.rb
 - lib/git-dd.rb
+- lib/git-dd/const.rb
+- lib/git-dd/version.rb
 homepage: https://github.com/Sanster/git-dd
 licenses:
 - MIT

data/lib/const.rb

@@ -1,4 +0,0 @@
-# encoding: utf-8
-
-NO_BRANCH_SELECTED = "No branch selected"
-ONLY_ONE_BRANCH = "You only have one branch"