git-cleanup 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +7 -0
  2. data/Gemfile +1 -1
  3. data/lib/git-cleanup.rb +12 -4
  4. data/lib/git-cleanup/version.rb +1 -1
  5. metadata +7 -13
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 1c01a256001efb10225edd1bb859288bd4ff759a
4
+ data.tar.gz: 70a4065117fe1418f0deb698ecf0d7bc3b758cf8
5
+ SHA512:
6
+ metadata.gz: a43ad56a6d29964e36d305747da4918d394c9bf99ba414fe9c9610ae0b13289d845bd0d60c8f393ffb9f35bd73d47be7559a126de4d4eea8c4915210248457fa
7
+ data.tar.gz: 27d3d3f9a89ecbf33eaeffabb1a40d5a59142070a3f86cacc8cd5385c1bc2cfe27d9c4348167436af3f72ff2c80e6f5e69331930aba3a24883185ab290da3988
data/Gemfile CHANGED
@@ -1,2 +1,2 @@
1
- source :rubygems
1
+ source "https://rubygems.org"
2
2
  gemspec
data/lib/git-cleanup.rb CHANGED
@@ -26,16 +26,22 @@ class GitCleanup
26
26
  next if branch.name == 'master'
27
27
  next if options[:only_filter] and !branch.name.match(options[:only_filter])
28
28
 
29
- # Diff of commit in branch which is not in master
30
- diff = branch.diff(master)
31
- commits = branch.commits(master)
32
-
33
29
  msg = "Branch #{branch.to_s} (#{index+1}/#{remote_branches.size})"
34
30
  Formatador.display_line
35
31
 
36
32
  Formatador.display_line("[bold][green]#{msg}[/]")
37
33
  Formatador.display_line "[bold][green]" + '-' * msg.size + "[/]"
38
34
 
35
+ # Diff of commit in branch which is not in master
36
+ begin
37
+ diff = branch.diff(master)
38
+ rescue Grit::Git::GitTimeout => e
39
+ Formatador.display_line("[bold][red] There was an error generating the diff.[/]")
40
+ Formatador.display_line("[red]Message: #{e.message}")
41
+ Formatador.display_line("Skipped")
42
+ next
43
+ end
44
+
39
45
  if diff.empty?
40
46
  Formatador.display_line "[bold]Branch merged.[/] Last commit on branch:"
41
47
  last_commit = branch.commit
@@ -57,6 +63,8 @@ class GitCleanup
57
63
  next
58
64
  end
59
65
 
66
+ commits = branch.commits(master)
67
+
60
68
  Formatador.display_line "[bold]Branch not merged.[/] Commits on branch:"
61
69
 
62
70
  Formatador.indent {
data/lib/git-cleanup/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class GitCleanup
2
- VERSION = "0.2.1"
2
+ VERSION = "0.2.2"
3
3
  end
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-cleanup
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
5
- prerelease:
4
+ version: 0.2.2
6
5
  platform: ruby
7
6
  authors:
8
7
  - Martyn Loughran
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2012-10-26 00:00:00.000000000 Z
11
+ date: 2013-04-04 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: grit
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: formatador
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ~>
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ~>
44
39
  - !ruby/object:Gem::Version
@@ -65,27 +60,26 @@ files:
65
60
  - lib/git-cleanup/version.rb
66
61
  homepage: http://mloughran.github.com/git-cleanup/
67
62
  licenses: []
63
+ metadata: {}
68
64
  post_install_message:
69
65
  rdoc_options: []
70
66
  require_paths:
71
67
  - lib
72
68
  required_ruby_version: !ruby/object:Gem::Requirement
73
- none: false
74
69
  requirements:
75
- - - ! '>='
70
+ - - '>='
76
71
  - !ruby/object:Gem::Version
77
72
  version: '0'
78
73
  required_rubygems_version: !ruby/object:Gem::Requirement
79
- none: false
80
74
  requirements:
81
- - - ! '>='
75
+ - - '>='
82
76
  - !ruby/object:Gem::Version
83
77
  version: '0'
84
78
  requirements: []
85
79
  rubyforge_project:
86
- rubygems_version: 1.8.24
80
+ rubygems_version: 2.0.0
87
81
  signing_key:
88
- specification_version: 3
82
+ specification_version: 4
89
83
  summary: A simple interactive command line tool to help you cleanup your git branch
90
84
  detritus
91
85
  test_files: []