checking ambigous and obsolete config files at workingDirectory and rootProjectDirectory

Author: sergiorykov

src/GitVersionCore.Tests/TestFileSystem.cs

@@ -101,4 +101,9 @@ public long GetLastDirectoryWrite(string path)
     {
         return 1;
     }
+
+    public bool PathsEqual(string path, string otherPath)
+    {
+        return path == otherPath;
+    }
 }

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -1,6 +1,7 @@
 namespace GitVersion
 {
     using System.Collections.Generic;
+    using System.ComponentModel;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -151,25 +152,70 @@ public static string GetEffectiveConfigAsString(string gitDirectory, IFileSystem
             return stringBuilder.ToString();
         }
 
+        public static void Verify(GitPreparer gitPreparer, IFileSystem fileSystem)
+        {
+            var workingDirectory = gitPreparer.WorkingDirectory;
+            var projectRootDirectory = gitPreparer.GetProjectRootDirectory();
+
+            if(fileSystem.PathsEqual(workingDirectory, projectRootDirectory))
+            {
+                WarnAboutObsoleteConfigFile(workingDirectory, fileSystem);
+                return;
+            }
+
+            WarnAboutObsoleteConfigFile(workingDirectory, fileSystem);
+            WarnAboutObsoleteConfigFile(projectRootDirectory, fileSystem);
+
+            var workingConfigFile = GetConfigFilePath(workingDirectory, fileSystem);
+            var projectRootConfigFile = GetConfigFilePath(projectRootDirectory, fileSystem);
+
+            bool hasConfigInWorkingDirectory = fileSystem.Exists(workingConfigFile);
+            bool hasConfigInProjectRootDirectory = fileSystem.Exists(projectRootConfigFile);
+            if (hasConfigInProjectRootDirectory && hasConfigInWorkingDirectory)
+            {
+                throw new WarningException(string.Format("Ambigous config file selection from '{0}' and '{1}'", workingConfigFile, projectRootConfigFile));
+            }
+        }
+
+        public static readonly string DefaultConfigFileName = "GitVersion.yml";
+        public static readonly string ObsoleteConfigFileName = "GitVersionConfig.yaml";
+
         static string GetConfigFilePath(string workingDirectory, IFileSystem fileSystem)
         {
-            var ymlPath = Path.Combine(workingDirectory, "GitVersion.yml");
+            var ymlPath = Path.Combine(workingDirectory, DefaultConfigFileName);
             if (fileSystem.Exists(ymlPath))
             {
                 return ymlPath;
             }
 
-            var deprecatedPath = Path.Combine(workingDirectory, "GitVersionConfig.yaml");
+            var deprecatedPath = Path.Combine(workingDirectory, ObsoleteConfigFileName);
             if (fileSystem.Exists(deprecatedPath))
             {
-                Logger.WriteWarning("'GitVersionConfig.yaml' is deprecated, use 'GitVersion.yml' instead.");
-
                 return deprecatedPath;
             }
 
             return ymlPath;
         }
 
+        static bool WarnAboutObsoleteConfigFile(string workingDirectory, IFileSystem fileSystem)
+        {
+            var deprecatedConfigFilePath = Path.Combine(workingDirectory, ObsoleteConfigFileName);
+            if (!fileSystem.Exists(deprecatedConfigFilePath))
+            {
+                return false;
+            }
+
+            var defaultConfigFilePath = Path.Combine(workingDirectory, DefaultConfigFileName);
+            if (fileSystem.Exists(defaultConfigFilePath))
+            {
+                Logger.WriteWarning(string.Format("Ambigous config files at '{0}': '{1}' (deprecated) and '{2}'. Will be used '{2}'", workingDirectory, ObsoleteConfigFileName, DefaultConfigFileName));
+                return true;
+            }
+
+            Logger.WriteWarning(string.Format("'{0}' is deprecated, use '{1}' instead.", deprecatedConfigFilePath, DefaultConfigFileName));
+            return true;
+        }
+
         public static void Init(string workingDirectory, IFileSystem fileSystem, IConsole console)
         {
             var configFilePath = GetConfigFilePath(workingDirectory, fileSystem);

src/GitVersionCore/ExecuteCore.cs

@@ -103,7 +103,7 @@ static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch
         VersionVariables ExecuteInternal(string targetBranch, string commitId, IRepository repo, GitPreparer gitPreparer, string projectRoot, IBuildServer buildServer, Config overrideConfig = null)
         {
             var versionFinder = new GitVersionFinder();
-            var configuration = ConfigurationProvider.Provide(projectRoot, fileSystem, overrideConfig: overrideConfig);
+           var configuration = ConfigurationProvider.Provide(projectRoot, fileSystem, overrideConfig: overrideConfig);
 
             var gitVersionContext = new GitVersionContext(repo, configuration, commitId : commitId);
             var semanticVersion = versionFinder.FindVersion(gitVersionContext);

src/GitVersionCore/GitPreparer.cs

@@ -29,6 +29,11 @@ public GitPreparer(string targetUrl, string dynamicRepositoryLocation, Authentic
             this.targetPath = targetPath.TrimEnd('/', '\\');
         }
 
+        public string WorkingDirectory
+        {
+            get { return targetPath; }
+        }
+
         public bool IsDynamicGitRepository
         {
             get { return !string.IsNullOrWhiteSpace(DynamicGitRepositoryPath); }

src/GitVersionCore/Helpers/FileSystem.cs

@@ -1,11 +1,14 @@
 namespace GitVersion.Helpers
 {
+    using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
 
     public class FileSystem : IFileSystem
     {
+        private static readonly bool runningOnMono = Type.GetType("Mono.Runtime") != null;
+
         public void Copy(string @from, string to, bool overwrite)
         {
             File.Copy(from, to, overwrite);
@@ -70,5 +73,17 @@ public long GetLastDirectoryWrite(string path)
                 .Max()
                 .Ticks;
         }
+
+        public bool PathsEqual(string path, string otherPath)
+        {
+            var comparison = runningOnMono
+                ? StringComparison.InvariantCulture
+                : StringComparison.InvariantCultureIgnoreCase;
+
+            return string.Equals(
+                Path.GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
+                Path.GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
+                comparison);
+        }
     }
 }

src/GitVersionCore/Helpers/IFileSystem.cs

@@ -17,5 +17,7 @@ public interface IFileSystem
         void CreateDirectory(string path);
         bool DirectoryExists(string path);
         long GetLastDirectoryWrite(string path);
+
+        bool PathsEqual(string path, string otherPath);
     }
 }

src/GitVersionExe/Program.cs

@@ -64,6 +64,7 @@ static int VerifyArgumentsAndRun()
                 }
 
                 ConfigureLogging(arguments);
+                VerifyConfiguration(arguments, fileSystem);
 
                 if (!Directory.Exists(arguments.TargetPath))
                 {
@@ -124,6 +125,11 @@ static int VerifyArgumentsAndRun()
             return 0;
         }
 
+        private static void VerifyConfiguration(Arguments arguments, IFileSystem fileSystem)
+        {
+            var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation,arguments.Authentication,arguments.NoFetch,arguments.TargetPath);
+            ConfigurationProvider.Verify(gitPreparer, fileSystem);
+        }
 
         static void ConfigureLogging(Arguments arguments)
         {