git-cleanup 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c01a256001efb10225edd1bb859288bd4ff759a
-  data.tar.gz: 70a4065117fe1418f0deb698ecf0d7bc3b758cf8
+  metadata.gz: c71bda049aa163b749a147322acc36d8bfafc87b
+  data.tar.gz: aff6ab2596677702fb2915f6a435ec7c7ac9f4df
 SHA512:
-  metadata.gz: a43ad56a6d29964e36d305747da4918d394c9bf99ba414fe9c9610ae0b13289d845bd0d60c8f393ffb9f35bd73d47be7559a126de4d4eea8c4915210248457fa
-  data.tar.gz: 27d3d3f9a89ecbf33eaeffabb1a40d5a59142070a3f86cacc8cd5385c1bc2cfe27d9c4348167436af3f72ff2c80e6f5e69331930aba3a24883185ab290da3988
+  metadata.gz: 3af50982b8e936a1a0e3deb619d4ec2f24753782fcdca21d50031ebf17bc75e7fa37389f5b2636a13d2d28dcaa9dd1929556e0e97f3f81fa71c7591b69db5782
+  data.tar.gz: 6d7a4dad3124c0dd8a48fa3393f8df882898f6e70b50da4901b78aa64ac1669d933518e304ff098458a0964dd0ee55afaa63388feed5f0cdffbc93a1b5f56883

data/README.md

@@ -1,3 +1,5 @@
+**NOTICE**: Please use Ruby 1.9.3 (this gem relies on grit which is now unmaintained, and has issues with newer Rubies). Volunteers sought for upgrade to [rugged](https://github.com/libgit2/rugged).
+
 # git-cleanup
 
 A simple interactive command line tool to help you cleanup your git branch detritus.

data/bin/git-cleanup

@@ -18,6 +18,9 @@ opts = OptionParser.new do |opts|
 	opts.on("-o","--only FILTER", "Only branches that match FILTER will be included") do |only_filter|
 		conf[:only_filter] = only_filter
 	end
+	opts.on("-m", "--master BRANCH", "Consider BRANCH the \"master\" branch") do |branch|
+	  conf[:master_branch] = branch
+	end
   opts.on("-v", "--version", "Shows version") do
     puts GitCleanup::VERSION
     exit

data/git-cleanup.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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 'grit', '~> 2.5.0'
   s.add_dependency 'formatador', '~> 0.2.1'
 
   s.files         = `git ls-files`.split("\n")

data/lib/git-cleanup.rb

@@ -12,9 +12,21 @@ end
 
 class GitCleanup
   def self.run(options = {})
-    repo = Grit::Repo.new(Dir.pwd)
+    begin
+      repo = Grit::Repo.new(Dir.pwd)
+    rescue Grit::InvalidGitRepositoryError
+      Formatador.display_line(%Q{[bold][red] Could not find git repository in "#{Dir.pwd}".[/]})
+      exit
+    end
+
+    master_branch_name = options[:master_branch] || 'master'
     
-    master = repo.heads.find { |h| h.name == 'master' }
+    master = repo.heads.find { |h| h.name == master_branch_name }
+
+    unless master
+      Formatador.display_line(%Q{[bold][red] Could not find branch "#{master_branch_name}". Try using "-m BRANCH" to specify the master branch.[/]})
+      exit
+    end
 
     self.prune(repo)
 
@@ -23,7 +35,7 @@ class GitCleanup
     remote_branches = Branch.remote(repo).select { |b| b.commit.lazy_source }
 
     remote_branches.sort.reverse.each_with_index do |branch, index|
-      next if branch.name == 'master'
+      next if branch.name == master_branch_name
       next if options[:only_filter] and !branch.name.match(options[:only_filter])
 
       msg = "Branch #{branch.to_s} (#{index+1}/#{remote_branches.size})"

data/lib/git-cleanup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-cleanup
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Martyn Loughran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A simple interactive command line tool to help you cleanup your git branch