Merge pull request #8 from praxxis/master

Add an option that lets you specify the "master" branch

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

lib/git-cleanup.rb

@@ -12,9 +12,21 @@ def initialize
 
 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 @@ def self.run(options = {})
     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})"

lib/git-cleanup/version.rb

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