Using properties instead of methods on GitRepository

Author: GeertvanHorrik

src/GitTools.Core.Tests/Git/GitRepositoryFactoryTests.cs

@@ -49,10 +49,10 @@ public void WorksCorrectlyWithRemoteRepository(string branchName, string expecte
 
                     using (var gitRepository = GitRepositoryFactory.CreateRepository(repositoryInfo))
                     {
-                        dynamicRepositoryPath = gitRepository.GetDotGitDirectory();
+                        dynamicRepositoryPath = gitRepository.DotGitDirectory;
 
                         gitRepository.IsDynamic.ShouldBe(true);
-                        gitRepository.GetDotGitDirectory().ShouldBe(expectedDynamicRepoLocation + "\\.git");
+                        gitRepository.DotGitDirectory.ShouldBe(expectedDynamicRepoLocation + "\\.git");
 
                         var currentBranch = gitRepository.Repository.Head.CanonicalName;
 
@@ -94,7 +94,7 @@ public void UpdatesExistingDynamicRepository()
 
                     using (var gitRepository = GitRepositoryFactory.CreateRepository(repositoryInfo))
                     {
-                        dynamicRepositoryPath = gitRepository.GetDotGitDirectory();
+                        dynamicRepositoryPath = gitRepository.DotGitDirectory;
                     }
 
                     var newCommit = mainRepositoryFixture.Repository.MakeACommit();
@@ -145,7 +145,7 @@ public void PicksAnotherDirectoryNameWhenDynamicRepoFolderTaken()
                     using (var gitRepository = GitRepositoryFactory.CreateRepository(repositoryInfo))
                     {
                         gitRepository.IsDynamic.ShouldBe(true);
-                        gitRepository.GetDotGitDirectory().ShouldBe(expectedDynamicRepoLocation + "_1\\.git");
+                        gitRepository.DotGitDirectory.ShouldBe(expectedDynamicRepoLocation + "_1\\.git");
                     }
                 }
             }
@@ -164,6 +164,20 @@ public void PicksAnotherDirectoryNameWhenDynamicRepoFolderTaken()
             }
         }
 
+        [Test]
+        public void ThrowsExceptionWhenNotEnoughInfo()
+        {
+            var tempDir = Path.GetTempPath();
+
+            var repositoryInfo = new RepositoryInfo
+            {
+                Url = tempDir,
+                Branch = "master"
+            };
+
+            Should.Throw<Exception>(() => GitRepositoryFactory.CreateRepository(repositoryInfo));
+        }
+
         [Test]
         public void UsingDynamicRepositoryWithFeatureBranchWorks()
         {

src/GitTools.Core/GitTools.Core.Shared/Git/GitRepository.cs

@@ -9,25 +9,18 @@ public GitRepository(IRepository repository, bool isDynamic)
         {
             Repository = repository;
             IsDynamic = isDynamic;
+
+            ProjectRootDirectory = repository.Info.WorkingDirectory;
+            DotGitDirectory = Path.Combine(ProjectRootDirectory, ".git");
         }
 
         public IRepository Repository { get; private set; }
 
         public bool IsDynamic { get; private set; }
 
-        // TODO: Consider using properties
-        public string GetDotGitDirectory()
-        {
-            var rootDirectory = GetProjectRootDirectory();
-            var directory = Path.Combine(rootDirectory, ".git");
-            return directory;
-        }
+        public string DotGitDirectory { get; private set; }
 
-        // TODO: Consider using properties
-        public string GetProjectRootDirectory()
-        {
-            return Repository.Info.WorkingDirectory;
-        }
+        public string ProjectRootDirectory { get; private set; }
 
         protected override void DisposeManaged()
         {

src/GitTools.Core/GitTools.Core.Shared/Git/GitRepositoryFactory.cs

@@ -26,9 +26,14 @@ public static GitRepository CreateRepository(RepositoryInfo repositoryInfo, bool
             // TODO: find a better way to check for existing repositories
             if (!string.IsNullOrWhiteSpace(repositoryInfo.Directory))
             {
-                repositoryDirectory = repositoryInfo.Directory;
+                var expectedDirectory = Path.Combine(repositoryInfo.Directory, ".git");
+                if (Directory.Exists(expectedDirectory))
+                {
+                    repositoryDirectory = expectedDirectory;
+                }
             }
-            else
+
+            if (string.IsNullOrWhiteSpace(repositoryDirectory))
             {
                 isDynamicRepository = true;
 
@@ -37,6 +42,12 @@ public static GitRepository CreateRepository(RepositoryInfo repositoryInfo, bool
                     repositoryInfo.Url, repositoryInfo.Branch, noFetch);
             }
 
+            if (string.IsNullOrWhiteSpace(repositoryDirectory))
+            {
+                Log.Warn("Could not create a repository, not enough information was specified");
+                return null;
+            }
+
             // TODO: Should we do something with fetch for existing repositoriess?
 
             var repository = new Repository(repositoryDirectory);