git-cleanup 0.2.0 → 0.2.1

data/README.md

@@ -0,0 +1,38 @@
+# git-cleanup
+
+A simple interactive command line tool to help you cleanup your git branch detritus.
+
+This is what git-cleanup does:
+
+  1. Iterates over all remote branches (assumes origin), starting with the newest. For each branch:
+  2. If the branch has been merged into master it offers to delete it, first remotely then locally.
+  3. If the branch has not been merged it shows you all the un-merged commits, and offers to show you a diff (in your `GIT_EDITOR`). This makes it easy to determine whether the branch should be removed or not.  
+     Once you have viewed the diff you will be asked whether you wish to delete the branch as before.
+
+**Every destructive operation is interactive** - nothing unexpected will happen to your repo. It's perfectly fine to `Ctrl-C` at any time if you get bored of deleting branches and want to do some real work.
+
+## Usage
+
+Install the gem
+
+    $ gem install git-cleanup
+
+Inside a git repo, just run git-cleanup
+
+    $ git-cleanup
+
+Use `--skip-unmerged` to ignore un-merged branches
+
+    $ git-cleanup --skip-unmerged
+    
+Use `--only` to only consider branch names that have this substring
+
+    $ git-cleanup --only myname
+
+Be careful, if you delete a critical branch it's not my fault. Piping in `yes` is a bad idea.
+
+## Hacking
+
+There are no tests, this was a quick hack to get the job done.
+
+Pragmatic patches welcome, please open an issue first to discuss.

data/bin/git-cleanup

@@ -12,9 +12,12 @@ conf = {
 
 opts = OptionParser.new do |opts|
 	opts.banner = "Usage: git-cleanup [OPTIONS] -- ... commands"
-	opts.on("-s", "--skip-unmerged", "Unmerge branches will be skipped") do |u|
+	opts.on("-s", "--skip-unmerged", "Unmerged branches will be skipped") do |u|
 		conf[:skip_unmerged] = true
 	end
+	opts.on("-o","--only FILTER", "Only branches that match FILTER will be included") do |only_filter|
+		conf[:only_filter] = only_filter
+	end
   opts.on("-v", "--version", "Shows version") do
     puts GitCleanup::VERSION
     exit

data/git-cleanup.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Martyn Loughran"]
   s.email       = ["me@mloughran.com"]
-  s.homepage    = "http://github.com/mloughran/git-cleanup"
-  s.summary     = %q{Command line tool for interactively cleaning up old git branches (remotely and locally)}
-  s.description = %q{Command line tool for interactively cleaning up old git branches (remotely and locally)}
+  s.homepage    = "http://mloughran.github.com/git-cleanup/"
+  s.summary     = %q{A simple interactive command line tool to help you cleanup your git branch detritus}
+  s.description = %q{A simple interactive command line tool to help you cleanup your git branch detritus}
   
   s.add_dependency 'grit', '~> 2.2.0'
   s.add_dependency 'formatador', '~> 0.2.1'

data/lib/git-cleanup.rb

@@ -24,6 +24,7 @@ class GitCleanup
 
     remote_branches.sort.reverse.each_with_index do |branch, index|
       next if branch.name == 'master'
+      next if options[:only_filter] and !branch.name.match(options[:only_filter])
 
       # Diff of commit in branch which is not in master
       diff = branch.diff(master)
@@ -36,7 +37,7 @@ class GitCleanup
       Formatador.display_line "[bold][green]" + '-' * msg.size + "[/]"
 
       if diff.empty?
-        Formatador.display_line "Branch merged. Last commit on branch:"
+        Formatador.display_line "[bold]Branch merged.[/] Last commit on branch:"
         last_commit = branch.commit
         if last_commit
           Formatador.indent {
@@ -47,22 +48,22 @@ class GitCleanup
           }
         end
 
-        Helper.boolean 'Do you want the branch deleted?' do
+        Helper.boolean '[bold]Branch merged.[/] Do you want the branch deleted?' do
           branch.delete(local_branches)
         end
       else
         if options[:skip_unmerged]
-          Helper.info "Branch not merged. Skipped"
+          Helper.info "[bold]Branch not merged.[/] Skipped"
           next
         end
 
-        Formatador.display_line "Branch not merged. Commits on branch:"
+        Formatador.display_line "[bold]Branch not merged.[/] Commits on branch:"
 
         Formatador.indent {
           Formatador.display_lines commits.split("\n")
         }
 
-        Helper.boolean "Do you want to see a diff?" do
+        Helper.boolean "[bold]Branch not merged.[/] Do you want to see a diff?" do
           Tempfile.open('diff') do |tempfile|
             tempfile << diff
             tempfile.flush

data/lib/git-cleanup/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-cleanup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70356485463960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70356485463960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70356485462640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,9 +37,14 @@ dependencies:
         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)
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+description: A simple interactive command line tool to help you cleanup your git branch
+  detritus
 email:
 - me@mloughran.com
 executables:
@@ -42,20 +52,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
 - .gitignore
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
 - bin/git-cleanup
 - git-cleanup.gemspec
 - lib/git-cleanup.rb
 - lib/git-cleanup/branch.rb
 - lib/git-cleanup/helper.rb
 - lib/git-cleanup/version.rb
-homepage: http://github.com/mloughran/git-cleanup
+homepage: http://mloughran.github.com/git-cleanup/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -75,10 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Command line tool for interactively cleaning up old git branches (remotely
-  and locally)
+summary: A simple interactive command line tool to help you cleanup your git branch
+  detritus
 test_files: []
-has_rdoc: 

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/README.rdoc

@@ -1,17 +0,0 @@
-= git-cleanup
-
-Description goes here.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Martyn Loughran. See LICENSE for details.

data/VERSION

@@ -1 +0,0 @@
-0.1.2