git-cleanup 0.1.1 → 0.1.2

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Rakefile

@@ -1,19 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "git-cleanup"
-    gem.summary = %Q{Simplify cleaning up old git branches}
-    gem.description = %Q{Simplify cleaning up old git branches}
-    gem.email = "me@mloughran.com"
-    gem.homepage = "http://github.com/mloughran/git-cleanup"
-    gem.authors = ["Martyn Loughran"]
-    gem.add_dependency 'grit', '~> 2.2.0'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/git-cleanup.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "git-cleanup"
+  s.version     = "0.1.2"
+  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.add_dependency 'grit', '~> 2.2.0'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/git-cleanup.rb

@@ -16,13 +16,18 @@ class GitCleanup
     remote_branches = Branch.remote(repo).select { |b| b.commit.lazy_source }
 
     remote_branches.sort.each_with_index do |branch, index|
+      next if branch.name == 'master'
+
       # Diff of commit in branch which is not in master
       diff = branch.diff(master)
+      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
 
       if diff.empty?
         last_commit = branch.commit

data/lib/git-cleanup/branch.rb

@@ -21,6 +21,10 @@ class GitCleanup
     def diff(ref)
       @repo.git.native(:diff, {}, "#{ref.commit.sha}...#{@ref.commit.sha}")
     end
+
+    def commits(ref)
+      @repo.git.native(:log, {}, "#{ref.commit.sha}..#{@ref.commit.sha}")
+    end
   
     def commit
       @ref.commit

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-cleanup
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Martyn Loughran
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +00:00
-default_executable: git-cleanup
+date: 2011-02-15 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -31,23 +34,25 @@ dependencies:
         version: 2.2.0
   type: :runtime
   version_requirements: *id001
-description: Simplify cleaning up old git branches
-email: me@mloughran.com
+description: Command line tool for interactively cleaning up old git branches (remotely and locally)
+email: 
+- me@mloughran.com
 executables: 
 - git-cleanup
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/git-cleanup
+- git-cleanup.gemspec
 - lib/git-cleanup.rb
 - lib/git-cleanup/branch.rb
 - lib/git-cleanup/helper.rb
@@ -56,30 +61,34 @@ homepage: http://github.com/mloughran/git-cleanup
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: Simplify cleaning up old git branches
+summary: Command line tool for interactively cleaning up old git branches (remotely and locally)
 test_files: []