(cleanup) - combine TempFileTracker with InvalidFileChecker into FileHelper

arturcic · arturcic · commit 1430eab9f905 · 2019-06-06T16:40:13.000+03:00
diff --git a/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs b/src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
@@ -39,7 +39,7 @@ public void VerifyIgnoreNonAssemblyInfoFile()
 ");
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new[] { "SomeOtherFile.cs" }, projectFile);
+        FileHelper.CheckForInvalidFiles(new[] { "SomeOtherFile.cs" }, projectFile);
     }
 
     [Test]
@@ -55,7 +55,7 @@ public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileV
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
     }
 
@@ -73,7 +73,7 @@ public void VerifyUnformattedAttributeFoundCSharp([Values("AssemblyVersion", "As
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
     }
 
@@ -90,7 +90,7 @@ public void VerifyCommentWorksCSharp([Values("AssemblyVersion", "AssemblyFileVer
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
+        FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
     }
 
     [Test]
@@ -109,7 +109,7 @@ public class Temp
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
+        FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
     }
 
     [Test]
@@ -127,7 +127,7 @@ public class {0}
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
+        FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);
     }
 
     [Test]
@@ -143,7 +143,7 @@ Imports System.Reflection
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
     }
 
@@ -161,7 +161,7 @@ Imports System.Reflection
 ", attribute);
         }
 
-        var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);
         Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
     }
 
@@ -178,7 +178,7 @@ Imports System.Reflection
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
+        FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
     }
 
     [Test]
@@ -196,7 +196,7 @@ End Class
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
+        FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
     }
 
     [Test]
@@ -213,6 +213,6 @@ End Class
 ", attribute);
         }
 
-        InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
+        FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);
     }
 }
diff --git a/src/GitVersionTask/FileHelper.cs b/src/GitVersionTask/FileHelper.cs
@@ -5,14 +5,45 @@
 using System.Text.RegularExpressions;
 using GitVersion;
 
-public static class InvalidFileChecker
+public static class FileHelper
 {
     private static readonly Dictionary<string, Func<string, string, bool>> versionAttributeFinders = new Dictionary<string, Func<string, string, bool>>()
     {
         { ".cs", CSharpFileContainsVersionAttribute },
         { ".vb", VisualBasicFileContainsVersionAttribute }
     };
 
+    public static string TempPath;
+
+    static FileHelper()
+    {
+        TempPath = Path.Combine(Path.GetTempPath(), "GitVersionTask");
+        Directory.CreateDirectory(TempPath);
+    }
+
+    public static void DeleteTempFiles()
+    {
+        if (!Directory.Exists(TempPath))
+        {
+            return;
+        }
+
+        foreach (var file in Directory.GetFiles(TempPath))
+        {
+            if (File.GetLastWriteTime(file) < DateTime.Now.AddDays(-1))
+            {
+                try
+                {
+                    File.Delete(file);
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    //ignore contention
+                }
+            }
+        }
+    }
+
     public static void CheckForInvalidFiles(IEnumerable<string> compileFiles, string projectFile)
     {
         foreach (var compileFile in GetInvalidFiles(compileFiles, projectFile))
diff --git a/src/GitVersionTask/GitVersionTaskUtils.cs b/src/GitVersionTask/GitVersionTaskUtils.cs
@@ -72,7 +72,7 @@ Func<string, string, string> fileNameNoIntermediatePath
             if (intermediateOutputPath == null)
             {
                 fileName = fileNameWithIntermediatePath(projectFile, fileExtension);
-                workingDirectory = TempFileTracker.TempPath;
+                workingDirectory = FileHelper.TempPath;
             }
             else
             {
diff --git a/src/GitVersionTask/TempFileTracker.cs b/src/GitVersionTask/TempFileTracker.cs
diff --git a/src/GitVersionTask/UpdateAssemblyInfo.cs b/src/GitVersionTask/UpdateAssemblyInfo.cs
@@ -11,9 +11,9 @@ public static class UpdateAssemblyInfo
 
         private static Output InnerExecute(Input input, TaskLogger logger)
         {
-            TempFileTracker.DeleteTempFiles();
+            FileHelper.DeleteTempFiles();
 
-            InvalidFileChecker.CheckForInvalidFiles(input.CompileFiles, input.ProjectFile);
+            FileHelper.CheckForInvalidFiles(input.CompileFiles, input.ProjectFile);
 
             if (!GitVersionTaskUtils.GetVersionVariables(input, out var versionVariables))
             {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void VerifyIgnoreNonAssemblyInfoFile()`
`39`	`39`	`");`
`40`	`40`	`}`
`41`	`41`
`42`		`- InvalidFileChecker.CheckForInvalidFiles(new[] { "SomeOtherFile.cs" }, projectFile);`
	`42`	`+ FileHelper.CheckForInvalidFiles(new[] { "SomeOtherFile.cs" }, projectFile);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`[Test]`
`@@ -55,7 +55,7 @@ public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileV`
`55`	`55`	`", attribute);`
`56`	`56`	`}`
`57`	`57`
`58`		`- var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);`
	`58`	`+ var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);`
`59`	`59`	`Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));`
`60`	`60`	`}`
`61`	`61`
`@@ -73,7 +73,7 @@ public void VerifyUnformattedAttributeFoundCSharp([Values("AssemblyVersion", "As`
`73`	`73`	`", attribute);`
`74`	`74`	`}`
`75`	`75`
`76`		`- var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);`
	`76`	`+ var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile), attribute);`
`77`	`77`	`Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));`
`78`	`78`	`}`
`79`	`79`
`@@ -90,7 +90,7 @@ public void VerifyCommentWorksCSharp([Values("AssemblyVersion", "AssemblyFileVer`
`90`	`90`	`", attribute);`
`91`	`91`	`}`
`92`	`92`
`93`		`- InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);`
	`93`	`+ FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`[Test]`
`@@ -109,7 +109,7 @@ public class Temp`
`109`	`109`	`", attribute);`
`110`	`110`	`}`
`111`	`111`
`112`		`- InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);`
	`112`	`+ FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`[Test]`
`@@ -127,7 +127,7 @@ public class {0}`
`127`	`127`	`", attribute);`
`128`	`128`	`}`
`129`	`129`
`130`		`- InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);`
	`130`	`+ FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.cs" }, projectFile);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`[Test]`
`@@ -143,7 +143,7 @@ Imports System.Reflection`
`143`	`143`	`", attribute);`
`144`	`144`	`}`
`145`	`145`
`146`		`- var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);`
	`146`	`+ var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);`
`147`	`147`	`Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));`
`148`	`148`	`}`
`149`	`149`
`@@ -161,7 +161,7 @@ Imports System.Reflection`
`161`	`161`	`", attribute);`
`162`	`162`	`}`
`163`	`163`
`164`		`- var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);`
	`164`	`+ var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile), attribute);`
`165`	`165`	`Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));`
`166`	`166`	`}`
`167`	`167`
`@@ -178,7 +178,7 @@ Imports System.Reflection`
`178`	`178`	`", attribute);`
`179`	`179`	`}`
`180`	`180`
`181`		`- InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);`
	`181`	`+ FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`[Test]`
`@@ -196,7 +196,7 @@ End Class`
`196`	`196`	`", attribute);`
`197`	`197`	`}`
`198`	`198`
`199`		`- InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);`
	`199`	`+ FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`[Test]`
`@@ -213,6 +213,6 @@ End Class`
`213`	`213`	`", attribute);`
`214`	`214`	`}`
`215`	`215`
`216`		`- InvalidFileChecker.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);`
	`216`	`+ FileHelper.CheckForInvalidFiles(new[] { "AssemblyInfo.vb" }, projectFile);`
`217`	`217`	`}`
`218`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ Func<string, string, string> fileNameNoIntermediatePath`
`72`	`72`	`if (intermediateOutputPath == null)`
`73`	`73`	`{`
`74`	`74`	`fileName = fileNameWithIntermediatePath(projectFile, fileExtension);`
`75`		`- workingDirectory = TempFileTracker.TempPath;`
	`75`	`+ workingDirectory = FileHelper.TempPath;`
`76`	`76`	`}`
`77`	`77`	`else`
`78`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ public static class UpdateAssemblyInfo`
`11`	`11`
`12`	`12`	`private static Output InnerExecute(Input input, TaskLogger logger)`
`13`	`13`	`{`
`14`		`- TempFileTracker.DeleteTempFiles();`
	`14`	`+ FileHelper.DeleteTempFiles();`
`15`	`15`
`16`		`- InvalidFileChecker.CheckForInvalidFiles(input.CompileFiles, input.ProjectFile);`
	`16`	`+ FileHelper.CheckForInvalidFiles(input.CompileFiles, input.ProjectFile);`
`17`	`17`
`18`	`18`	`if (!GitVersionTaskUtils.GetVersionVariables(input, out var versionVariables))`
`19`	`19`	`{`