Add ability to cleanup a partial pull check

Author: evanphx

bin/gx-pull-check

@@ -16,6 +16,26 @@ current_branch = head.name
 url = ARGV.shift
 cmd = ARGV.shift || "rake"
 
+if current_branch == "gx-pull-check" and url == "done"
+  puts "Cleaning up pull-check..."
+  current_branch = File.read(".git/pull-check-origin").strip
+
+  repo.git.checkout({}, current_branch)
+  repo.git.branch({:D => true}, "gx-pull-check")
+
+  File.unlink ".git/pull-check-origin"
+
+  exit 0
+elsif current_branch == "gx-pull-check"
+  puts "Currently handling a pull check already, please finish it first."
+  exit 1
+end
+
+unless url
+  puts "Usage: gx-pull-check URL [command to test]"
+  exit 1
+end
+
 puts "Performing pull check on '#{url}'"
 
 url += ".patch"
@@ -30,6 +50,10 @@ if $?.exitstatus != 0
   exit 1
 end
 
+File.open ".git/pull-check-origin", "w" do |f|
+  f.puts current_branch
+end
+
 puts "Step 2: Apply the pull request..."
 repo.git.branch({}, "gx-pull-check")
 repo.git.checkout({}, "gx-pull-check")
@@ -58,4 +82,6 @@ puts "Everything ran fine, feel free to merge the pull request!"
 repo.git.checkout({}, current_branch)
 repo.git.branch({:D => true}, "gx-pull-check")
 
+File.unlink ".git/pull-check-origin"
+
 File.unlink patch

lib/gx.rb

@@ -1,3 +1,3 @@
 class Gx
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end