git-cleanup 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1c01a256001efb10225edd1bb859288bd4ff759a
+  data.tar.gz: 70a4065117fe1418f0deb698ecf0d7bc3b758cf8
+SHA512:
+  metadata.gz: a43ad56a6d29964e36d305747da4918d394c9bf99ba414fe9c9610ae0b13289d845bd0d60c8f393ffb9f35bd73d47be7559a126de4d4eea8c4915210248457fa
+  data.tar.gz: 27d3d3f9a89ecbf33eaeffabb1a40d5a59142070a3f86cacc8cd5385c1bc2cfe27d9c4348167436af3f72ff2c80e6f5e69331930aba3a24883185ab290da3988

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/lib/git-cleanup.rb

@@ -26,16 +26,22 @@ class GitCleanup
       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)
-      commits = branch.commits(master)
-
       msg = "Branch #{branch.to_s} (#{index+1}/#{remote_branches.size})"
       Formatador.display_line
 
       Formatador.display_line("[bold][green]#{msg}[/]")
       Formatador.display_line "[bold][green]" + '-' * msg.size + "[/]"
 
+      # Diff of commit in branch which is not in master
+      begin
+        diff = branch.diff(master)
+      rescue Grit::Git::GitTimeout => e
+        Formatador.display_line("[bold][red] There was an error generating the diff.[/]")
+        Formatador.display_line("[red]Message: #{e.message}")
+        Formatador.display_line("Skipped")
+        next
+      end
+
       if diff.empty?
         Formatador.display_line "[bold]Branch merged.[/] Last commit on branch:"
         last_commit = branch.commit
@@ -57,6 +63,8 @@ class GitCleanup
           next
         end
 
+        commits = branch.commits(master)
+
         Formatador.display_line "[bold]Branch not merged.[/] Commits on branch:"
 
         Formatador.indent {

data/lib/git-cleanup/version.rb

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: git-cleanup
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Martyn Loughran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,27 +60,26 @@ files:
 - lib/git-cleanup/version.rb
 homepage: http://mloughran.github.com/git-cleanup/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple interactive command line tool to help you cleanup your git branch
   detritus
 test_files: []