git-cleanremote 0.0.2 → 0.0.3

data/README.md

@@ -19,7 +19,8 @@ Usage:
 Options:
   [--dryrun]
   [--version]
-  [--ask]            # Default: true
+  [--ask]            # Default: true, will ask to delete the branches
+  [--local]          # Default: false, deletes the local copy as well
   [--remote=REMOTE]  # Default: origin
 ```
 

data/lib/git-cleanremote.rb

@@ -7,8 +7,9 @@ module Git
     autoload :Branch, 'git-cleanremote/branch'
 
     argument :branch_name, :default => 'master', :type => :string, :desc => "The remote branch to cleanup"
-    class_option :dryrun, :type => :boolean
-    class_option :version, :type => :boolean
+    class_option :dryrun, :type => :boolean, :default => false
+    class_option :version, :type => :boolean, :default => false
+    class_option :local, :type => :boolean, :default => false
     class_option :ask, :type => :boolean, :default => true
     class_option :remote, :type => :string, :default => "origin"
     desc "Cleans up a remote branch."

data/lib/git-cleanremote/branch.rb

@@ -22,4 +22,13 @@ class Git::CleanRemote::Branch
     true
   end
 
+  def local_delete!
+    error = ''
+    status = Open4::popen4("git branch -D #{name}") do |pid, stdin, stdout, stderr|
+      error = stderr.gets.to_s
+    end
+    raise StandardError, error if status.to_i > 0
+    true
+  end
+
 end

data/lib/git-cleanremote/cleaner.rb

@@ -5,9 +5,9 @@ class Git::CleanRemote::Cleaner < Thor::Shell::Color
   def initialize(branch, options={})
     @padding = 0
     return say ["git-cleanremote", Git::CleanRemoteVersion::STRING].join(' ') if options[:version]
-    options = options.dup
-    @branch = branch
-    @remote = options.delete :remote
+    options  = options.dup
+    @branch  = branch
+    @remote  = options.delete :remote
     @options = options
     if options[:dryrun]
       dryrun
@@ -24,6 +24,8 @@ class Git::CleanRemote::Cleaner < Thor::Shell::Color
       [branch.to_s, set_color("will be deleted!", :red)]
     end
     print_table array
+    count = array.count
+    say "\n" + [count, (count == 1 ? 'branch' : 'branches'), 'will be deleted!'].join(' ')
   end
 
   def run
@@ -43,14 +45,25 @@ class Git::CleanRemote::Cleaner < Thor::Shell::Color
 
   def delete_merged_branches
     say "Deleting branches on #{remote}", :blue, true
-    @merged_branches.each do |branch|
+    status  = @merged_branches.reduce({}) do |hash, branch|
+      hash[:success] ||= 0
+      hash[:error]   ||= 0
       begin
         branch.delete!
+        branch.local_delete! if options[:local]
         say [set_color("DELETED", :yellow), branch].join(" ")
+        hash[:success] += 1
       rescue => message
         say [set_color("ERROR  ", :red), branch, set_color(message, :magenta)].join(" ")
+        hash[:error] += 1
       end
+      hash
     end
+    system "git fetch #{remote} --prune"
+    message = []
+    message << [status[:success], (status[:success] == 1 ? 'deletion' : 'deletions')].join(' ')
+    message << [status[:error], (status[:error] == 1 ? 'error' : 'errors')].join(' ')
+    say message.join(', ')
   end
 
   def get_merged_branches

data/lib/git-cleanremote/version.rb

@@ -1,5 +1,5 @@
 module Git
   class CleanRemoteVersion
-    STRING = "0.0.2"
+    STRING = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-cleanremote
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor