From a979c8199ad2d60d5bed4c06b9a6d024c1c52a04 Mon Sep 17 00:00:00 2001
From: Roland Walker <walker@pobox.com>
Date: Fri, 6 Jun 2014 09:50:01 -0400
Subject: [PATCH] expand trailing '+' when not part of version number

---
 developer/bin/cask_namer | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/developer/bin/cask_namer b/developer/bin/cask_namer
index 2105091816..c0308d12ad 100755
--- a/developer/bin/cask_namer
+++ b/developer/bin/cask_namer
@@ -66,6 +66,7 @@ PRESERVE_TRAILING_PATS = [
                           %r{mp3}i,
                           %r{3[\s-]*d}i,
                           %r{diff3}i,
+                          %r{\A[^\d]+\+\Z}i,
                          ]
 
 # The code that employs these patterns against App names
@@ -308,7 +309,7 @@ class CaskFileName < String
     EXPANDED_SYMBOLS.each do |k, v|
       cask_file_name.gsub!(k, " #{v} ")
     end
-    cask_file_name
+    cask_file_name.sub(/ +\Z/, '')
   end
 
   def add_extension