Fix mibexsoftware#102 add renamed binary files and excluded file cases

src/main/scala/ch/mibex/bitbucket/sonar/diff/GitDiffParser.scala

@@ -24,6 +24,8 @@ object GitDiffParser extends RegexParsers {
 
   case class FileChange(oldFile: String, newFile: String)
 
+  case class ExcludePattern(pattern: String)
+
   sealed trait Diff
   case class BinaryDiff() extends Diff
   case class GitDiff(gitDiffHeader: FileChange, header: ExtendedDiffHeader, hunks: List[Hunk]) extends Diff {
@@ -57,10 +59,16 @@ object GitDiffParser extends RegexParsers {
 
   def readUpToNextDiffOrEnd = """(?s).+?(?=((?:diff --git)|$))\n?""".r
 
-  def binaryDiff: Parser[BinaryDiff] = gitDiffHeader ~ extendedDiffHeader ~ "GIT binary patch" ~ readUpToNextDiffOrEnd  ^^ {
+  def binaryDiff: Parser[BinaryDiff] = gitDiffHeader ~ extendedDiffHeader ~ (("GIT binary patch" ~ readUpToNextDiffOrEnd) | binaryFilesDiff | excludedFile)  ^^ {
     _ => BinaryDiff()
   }
 
+  def binaryFilesDiff: Parser[FileChange] = "Binary files " ~> (("a/" ~> filePath) ~ (" and b/" ~> filePath)) <~ " differ" <~ nl ^^ {
+    case oldF ~ newF => FileChange(oldF, newF)
+  }
+
+  def excludedFile: Parser[ExcludePattern] = "File excluded by pattern " ~> """"(.+?)"""".r <~ nl ^^ { p => ExcludePattern(p) }
+
   def gitDiff: Parser[GitDiff] = gitDiffHeader ~ extendedDiffHeader ~ hunks ^^ {
     case fc ~ h ~ hs => GitDiff(fc, h, hs)
   }
@@ -101,7 +109,7 @@ object GitDiffParser extends RegexParsers {
 
   def fileMode: Parser[Int] = """[0-7]{6}""".r ^^ { _.toInt }
 
-  def filePath: Parser[String] = """.+?(?=(\sb/)|(\r?\n))""".r
+  def filePath: Parser[String] = """.+?(?=((\sand)?\sb/)|((\sdiffer)?\r?\n))""".r
 
   def similarity: Parser[Int] = """\d{1,3}""".r ^^ { _.toInt }