Improve brew pull to close issues.

1 files changed, 21 insertions, 6 deletions

diff --git a/Library/Contributions/examples/brew-pull.rb b/Library/Contributions/examples/brew-pull.rb
index 81a50bf76..41d8a671f 100755
--- a/Library/Contributions/examples/brew-pull.rb
+++ b/Library/Contributions/examples/brew-pull.rb
@@ -16,25 +16,40 @@ end
 HOMEBREW_REPOSITORY.cd do
   ARGV.each do|arg|
     # This regex should work, if it's too precise, feel free to fix it.
-    if !arg.match 'https:\/\/github.com\/\w+\/homebrew\/(pull\/\d+|commit\/\w{4,40})'
+    urlmatch = arg.match 'https:\/\/github.com\/\w+\/homebrew\/(pull\/(\d+)|commit\/\w{4,40})'
+    if !urlmatch
       ohai 'Ignoring URL:', "Not a GitHub pull request or commit: #{arg}"
       next
     end
-    
+
     # GitHub provides commits'/pull-requests' raw patches using this URL.
     url = arg + '.patch'
-    
+
     # The cache directory seems like a good place to put patches.
     patchpath = (HOMEBREW_CACHE+File.basename(url))
     curl url, '-o', patchpath
-    
+
     # Makes sense to squash whitespace errors, we don't want them.
     ohai 'Applying patch'
     safe_system 'git', 'am', '--signoff', '--whitespace=fix', patchpath
-    
+
+    issue = urlmatch[2]
+    if issue
+      ohai "Patch closes issue ##{issue}"
+      message = `git log HEAD^..HEAD --format=%B`
+      
+      # If this is a pull request, append a close message.
+      if !message.include? 'Closes #'
+        issueline = "Closes ##{issue}."
+        signed = 'Signed-off-by:'
+        message = message.gsub signed, issueline + "\n\n" + signed
+        safe_system 'git', 'commit', '--amend', '-q', '-m', message
+      end
+    end
+
     ohai 'Patch changed:'
     safe_system 'git', 'diff', 'HEAD^..HEAD', '--stat'
-    
+
     if install
       status, filename = `git diff HEAD^..HEAD --name-status`.split()
       # Don't try and do anything to removed files.