git-cleanup 0.1.3 → 0.2.0

data/bin/git-cleanup

@@ -1,3 +1,35 @@
 require 'git-cleanup'
+require 'optparse'
 
-GitCleanup.run
+trap("INT") {
+  Formatador.redisplay("[bold][yellow]No more cleanup[/]\n")
+  exit(1)
+}
+
+conf = {
+	:skip_unmerged => false
+}
+
+opts = OptionParser.new do |opts|
+	opts.banner = "Usage: git-cleanup [OPTIONS] -- ... commands"
+	opts.on("-s", "--skip-unmerged", "Unmerge branches will be skipped") do |u|
+		conf[:skip_unmerged] = true
+	end
+  opts.on("-v", "--version", "Shows version") do
+    puts GitCleanup::VERSION
+    exit
+  end
+	opts.on("-h", "--help", "Shows this help") do
+    puts opts
+    exit
+  end
+end
+
+begin
+  opts.parse!(ARGV)
+rescue OptionParser::ParseError => ex
+  $stderr.puts ex
+  exit 1
+end
+
+GitCleanup.run(conf)

data/git-cleanup.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+require "git-cleanup/version"
 
 Gem::Specification.new do |s|
   s.name        = "git-cleanup"
-  s.version     = "0.1.3"
+  s.version     = GitCleanup::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Martyn Loughran"]
   s.email       = ["me@mloughran.com"]
@@ -12,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Command line tool for interactively cleaning up old git branches (remotely and locally)}
   
   s.add_dependency 'grit', '~> 2.2.0'
+  s.add_dependency 'formatador', '~> 0.2.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/git-cleanup.rb

@@ -1,15 +1,22 @@
 require 'grit'
 require 'tempfile'
-
+require 'formatador'
 # Grit.debug = true
 
+# No default indent
+class Formatador
+  def initialize
+    @indent = 0
+  end
+end
+
 class GitCleanup
-  def self.run
+  def self.run(options = {})
     repo = Grit::Repo.new(Dir.pwd)
     
     master = repo.heads.find { |h| h.name == 'master' }
 
-    # self.prune(repo)
+    self.prune(repo)
 
     local_branches = repo.branches.map { |b| b.name }
 
@@ -23,28 +30,39 @@ class GitCleanup
       commits = branch.commits(master)
 
       msg = "Branch #{branch.to_s} (#{index+1}/#{remote_branches.size})"
-      puts
-      puts msg
-      puts '-' * msg.size
-      puts "Latest commits:\n"
-      puts commits
+      Formatador.display_line
+
+      Formatador.display_line("[bold][green]#{msg}[/]")
+      Formatador.display_line "[bold][green]" + '-' * msg.size + "[/]"
 
       if diff.empty?
+        Formatador.display_line "Branch merged. Last commit on branch:"
         last_commit = branch.commit
         if last_commit
-          puts "Last commit:"
-          puts "Author: #{last_commit.author}"
-          puts "Date:   #{last_commit.committed_date}"
-          puts "SHA:    #{last_commit.sha}"
-          puts "#{last_commit.message}"
-          puts
+          Formatador.indent {
+            Formatador.display_line "Author: #{last_commit.author}"
+            Formatador.display_line "Date:   #{last_commit.committed_date}"
+            Formatador.display_line "SHA:    #{last_commit.sha}"
+            Formatador.display_line "#{last_commit.message}"
+          }
         end
 
-        Helper.boolean 'All commits merged. Do you want the branch deleted?' do
+        Helper.boolean 'Do you want the branch deleted?' do
           branch.delete(local_branches)
         end
       else
-        Helper.boolean "Branch not merged. Do you want to see a diff?" do
+        if options[:skip_unmerged]
+          Helper.info "Branch not merged. Skipped"
+          next
+        end
+
+        Formatador.display_line "Branch not merged. Commits on branch:"
+
+        Formatador.indent {
+          Formatador.display_lines commits.split("\n")
+        }
+
+        Helper.boolean "Do you want to see a diff?" do
           Tempfile.open('diff') do |tempfile|
             tempfile << diff
             tempfile.flush
@@ -52,7 +70,7 @@ class GitCleanup
             if ENV["GIT_EDITOR"]
               `#{ENV["GIT_EDITOR"]} #{tempfile.path}`
             else
-              puts diff
+              Formatador.display_line diff
             end
           end
           Helper.boolean "Do you want the branch deleted?" do
@@ -66,7 +84,7 @@ class GitCleanup
   # Prunes branches that have already been removed on origin
   def self.prune(repo)
     list = repo.git.native(:remote, {}, 'prune', '-n', "origin")
-    if list.any?
+    if !list.empty?
       Helper.boolean "Planning to prune the following. Ok?\n#{list}" do
         repo.git.native(:remote, {}, 'prune', "origin")
       end
@@ -76,3 +94,4 @@ end
 
 require 'git-cleanup/branch'
 require 'git-cleanup/helper'
+require 'git-cleanup/version'

data/lib/git-cleanup/branch.rb

@@ -11,7 +11,7 @@ class GitCleanup
     def initialize(repo, ref)
       @repo = repo
       @ref = ref
-      @remote, @name = ref.name.split('/')
+      @remote, @name = ref.name.split('/', 2)
     end
   
     def to_s
@@ -31,15 +31,15 @@ class GitCleanup
     end
 
     def delete(local_branches = nil)
-      puts "Deleting..."
+      Formatador.display('[red]Deleting...[/]')
       @repo.git.native(:push, {}, @remote, ":#{@name}")
-      puts "Done"
+      Formatador.display_line('[red]done[/]')
 
       if local_branches && local_branches.include?(name)
         Helper.boolean "There is also a local branch called #{name}. Would you like to delete that too?" do
-          puts "Deleting..."
-          @repo.git.native(:branch, {}, '-d', name)
-          puts "Done"
+        Formatador.display('[red]Deleting...[/]')
+        @repo.git.native(:branch, {}, '-d', name)
+        Formatador.display_line('[red]done[/]')
         end
       end
     end

data/lib/git-cleanup/helper.rb

@@ -1,7 +1,8 @@
 class GitCleanup
   module Helper
     def self.boolean(question, &block)
-      puts "#{question} (y/n)"
+      Formatador.display_line ""
+      Formatador.display("[bold][blue][QUESTION][/] #{question} (y/n)[/] ")
       answer = STDIN.gets.chomp
       if answer == 'y'
         yield
@@ -11,5 +12,9 @@ class GitCleanup
         boolean(question, &block)
       end
     end
+    
+    def self.info(info)
+      Formatador.display_line "[bold][yellow][INFO][/] #{info}[/]"
+    end
   end
 end

data/lib/git-cleanup/version.rb

@@ -0,0 +1,3 @@
+class GitCleanup
+  VERSION = "0.2.0"
+end

metadata

@@ -1,39 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-cleanup
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Martyn Loughran
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: grit
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70356485463960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
-  version_requirements: *id001
-description: Command line tool for interactively cleaning up old git branches (remotely and locally)
-email: 
+  prerelease: false
+  version_requirements: *70356485463960
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: &70356485462640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70356485462640
+description: Command line tool for interactively cleaning up old git branches (remotely
+  and locally)
+email:
 - me@mloughran.com
-executables: 
+executables:
 - git-cleanup
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -46,33 +54,31 @@ files:
 - lib/git-cleanup.rb
 - lib/git-cleanup/branch.rb
 - lib/git-cleanup/helper.rb
-has_rdoc: true
+- lib/git-cleanup/version.rb
 homepage: http://github.com/mloughran/git-cleanup
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Command line tool for interactively cleaning up old git branches (remotely and locally)
+summary: Command line tool for interactively cleaning up old git branches (remotely
+  and locally)
 test_files: []
-
+has_rdoc: