Merge pull request #95 from Particular/issue-94

Escape TeamCity parameter values, fixes #94

Author: andreasohlund

GitFlowVersion/BuildServers/TeamCity.cs

@@ -22,12 +22,26 @@ public void PerformPreProcessingSteps(string gitDirectory)
 
         public string GenerateSetParameterMessage(string name, string value)
         {
-            return string.Format("##teamcity[setParameter name='GitFlowVersion.{0}' value='{1}']", name, value);
+            return string.Format("##teamcity[setParameter name='GitFlowVersion.{0}' value='{1}']", name, EscapeValue(value));
         }
 
         public string GenerateSetVersionMessage(string versionToUseForBuildNumber)
         {
-            return string.Format("##teamcity[buildNumber '{0}']", versionToUseForBuildNumber);
+            return string.Format("##teamcity[buildNumber '{0}']", EscapeValue(versionToUseForBuildNumber));
+        }
+
+        static string EscapeValue(string value)
+        {
+            // List of escape values from http://confluence.jetbrains.com/display/TCD8/Build+Script+Interaction+with+TeamCity
+
+            value = value.Replace("|", "||");
+            value = value.Replace("'", "|'");
+            value = value.Replace("[", "|[");
+            value = value.Replace("]", "|]");
+            value = value.Replace("\r", "|r");
+            value = value.Replace("\n", "|n");
+
+            return value;
         }
     }
 }

Tests/BuildServers/TeamCityTests.cs

@@ -12,4 +12,12 @@ public void Develop_branch()
         Assert.AreEqual("##teamcity[buildNumber '0.0.0-Unstable4']", tcVersion);
     }
 
+    [Test]
+    public void EscapeValues()
+    {
+        var versionBuilder = new TeamCity();
+        var tcVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
+        Assert.AreEqual("##teamcity[setParameter name='GitFlowVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion);
+    }
+
 }