Remote Proxy

Author: arturcic

src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs

@@ -12,6 +12,7 @@
 using Branch = GitVersion.Branch;
 using BranchCollection = GitVersion.BranchCollection;
 using ReferenceCollection = GitVersion.ReferenceCollection;
+using Remote = GitVersion.Remote;
 
 namespace GitVersionCore.Tests
 {

src/GitVersionCore.Tests/Mocks/MockRepository.cs

@@ -1,7 +1,6 @@
 using System;
 using GitVersion;
 using GitVersion.Logging;
-using Remote = LibGit2Sharp.Remote;
 namespace GitVersionCore.Tests.Mocks
 {
     public class MockRepository : IGitRepository

src/GitVersionCore/Core/Abstractions/IGitRepository.cs

@@ -1,6 +1,5 @@
 using System;
 using GitVersion.Logging;
-using LibGit2Sharp;
 
 namespace GitVersion
 {

src/GitVersionCore/Core/GitModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using GitVersion.Helpers;
 using LibGit2Sharp;
 using LibGit2Sharp.Handlers;
@@ -131,6 +132,25 @@ protected Branch()
         public virtual bool IsTracking => innerBranch != null && innerBranch.IsTracking;
     }
 
+    public class Remote
+    {
+        private readonly LibGit2Sharp.Remote innerRemote;
+
+        private Remote(LibGit2Sharp.Remote remote)
+        {
+            innerRemote = remote;
+        }
+
+        protected Remote()
+        {
+        }
+        public static implicit operator LibGit2Sharp.Remote(Remote d) => d?.innerRemote;
+        public static explicit operator Remote(LibGit2Sharp.Remote b) => b is null ? null : new Remote(b);
+        public virtual string Name => innerRemote.Name;
+        public virtual string Url => innerRemote.Url;
+        public virtual string RefSpecs => string.Join(", ", innerRemote.FetchRefSpecs.Select(r => r.Specification));
+    }
+
     public class BranchCollection : IEnumerable<Branch>
     {
         private readonly LibGit2Sharp.BranchCollection innerCollection;

src/GitVersionCore/Core/GitPreparer.cs

@@ -157,7 +157,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur
                 }
                 else
                 {
-                    log.Info($"Fetching from remote '{remote.Name}' using the following refspecs: {string.Join(", ", remote.FetchRefSpecs.Select(r => r.Specification))}.");
+                    log.Info($"Fetching from remote '{remote.Name}' using the following refspecs: {remote.RefSpecs}.");
                     repository.Commands.Fetch(remote.Name, new string[0], authentication, null);
                 }
 

src/GitVersionCore/Core/GitRepository.cs

@@ -206,14 +206,14 @@ public Remote EnsureOnlyOneRemoteIsDefined(ILog log)
                 var remote = remotes.Single();
                 log.Info($"One remote found ({remote.Name} -> '{remote.Url}').");
                 AddMissingRefSpecs(log, remote);
-                return remote;
+                return (Remote)remote;
             }
 
             var message = $"{howMany} remote(s) have been detected. When being run on a build server, the Git repository is expected to bear one (and no more than one) remote.";
             throw new WarningException(message);
         }
 
-        private void AddMissingRefSpecs(ILog log, Remote remote)
+        private void AddMissingRefSpecs(ILog log, LibGit2Sharp.Remote remote)
         {
             if (remote.FetchRefSpecs.Any(r => r.Source == "refs/heads/*"))
                 return;