feat: improving push-functionality

README.md

@@ -1,3 +1,15 @@
 # update-tag
 
-Updates the tag of a repo to the next chosen version according the semver symantic.
+Updates the tag of a repo to the next chosen version according the semver symantic.
+
+## Install
+
+```
+dotnet tool install --global Novaloop.UpdateTag
+```
+
+## Update
+
+```
+dotnet tool update --global Novaloop.UpdateTag
+```

src/Cli/AppRunner.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Application.Commands;
 using Application.Queries;
@@ -19,13 +20,37 @@ namespace Cli
             _mediator = mediator;
         }
 
-        public async Task Run(string repoPath)
+        public async Task Run(string workingDir)
+        {
+            var repoBasePath = await GetRepoBasePath(workingDir);
+            var chosenService = await ChooseService(repoBasePath);
+            var selection = await SelectVersion(repoBasePath, chosenService);
+            await AddVersionTagToRepo(repoBasePath, selection.Version.ToString());
+            await PushToRemote(repoBasePath);
+        }
+
+        private async Task<string> GetRepoBasePath(string workingDir)
+        {
+            var repoBasePath = "";
+            try
+            {
+                repoBasePath = await _mediator.Send(new GetRepoBasePath.Query(workingDir));
+            }
+            catch (CliWrap.Exceptions.CommandExecutionException)
+            {
+                AnsiConsole.Markup("[red]Error:[/] Unable to extract Versions. Are we running inside a git repository?\n\n");
+                Environment.Exit(1);
+            }
+
+            return repoBasePath;
+        }
+
+        private async Task<string> ChooseService(string repoBasePath)
         {
-            // Check if git dir
             var services = new List<string>();
             try
             {
-                services = await _mediator.Send(new GetServicesFromGitRepo.Query(repoPath));
+                services = await _mediator.Send(new GetServicesFromGitRepo.Query(repoBasePath));
             }
             catch (LibGit2Sharp.RepositoryNotFoundException)
             {
@@ -44,8 +69,12 @@ namespace Cli
                         .AddChoices(services));
             }
 
+            return chosenService;
+        }
 
-            var versionInfo = await _mediator.Send(new GetVersionInformationFromRepo.Query(repoPath, chosenService));
+        private async Task<Selection> SelectVersion(string repoBasePath, string chosenService)
+        {
+            var versionInfo = await _mediator.Send(new GetVersionInformationFromRepo.Query(repoBasePath, chosenService));
             Selection selection;
             if (versionInfo != null)
             {
@@ -54,10 +83,10 @@ namespace Cli
                         .Title($"Select new version. (Current version is [green]{versionInfo.CurrentVersion}[/])")
                         .PageSize(10)
                         .AddChoices(
-                            new Selection("rc   ", versionInfo.NextMinorRcVersion),
-                            new Selection("patch", versionInfo.NextPatchVersion),
-                            new Selection("minor", versionInfo.NextMinorVersion),
-                            new Selection("major", versionInfo.NextMajorVersion)
+                            versionInfo
+                                .NextVersions
+                                .Select(nv => new Selection(nv.Title, nv.Version))
+                                .ToList()
                         )
                 );
             }
@@ -80,20 +109,14 @@ namespace Cli
                 Environment.Exit(0);
             }
 
-            try
-            {
-                await _mediator.Send(new AddTagToGitRepo.Command(repoPath, selection.Version.ToString()));
-            }
-            catch (Exception ex)
-            {
-                AnsiConsole.Markup("[red]Error:[/] Unable to write Tag to repository\n\n");
-                AnsiConsole.WriteException(ex);
-                Environment.Exit(1);
-            }
+            return selection;
+        }
 
+        private async Task PushToRemote(string workingDir)
+        {
             try
             {
-                await _mediator.Send(new PushCommitsToRemote.Command(repoPath));
+                await _mediator.Send(new PushCommitsToRemote.Command(workingDir));
             }
             catch (Exception ex)
             {
@@ -102,5 +125,19 @@ namespace Cli
                 Environment.Exit(1);
             }
         }
+
+        private async Task AddVersionTagToRepo(string workingDir, string tag)
+        {
+            try
+            {
+                await _mediator.Send(new AddTagToGitRepo.Command(workingDir, tag));
+            }
+            catch (Exception ex)
+            {
+                AnsiConsole.Markup("[red]Error:[/] Unable to write Tag to repository\n\n");
+                AnsiConsole.WriteException(ex);
+                Environment.Exit(1);
+            }
+        }
     }
 }

src/Cli/Cli.csproj

@@ -9,10 +9,10 @@
         <PackageId>Novaloop.UpdateTag</PackageId>
         <title>Updates the tag of a repo to the next chosen version according the semver symantic.</title>
         <PackageTags>semver;update-tag;tag;git</PackageTags>
-        <Version>0.1.2</Version>
+        <Version>0.1.5</Version>
         <Authors>Matthias Langhard</Authors>
         <Company>Novaloop AG</Company>
-        <PackageProjectUrl>https://gitlab.com/novaloop-oss/novaloop.updatetag</PackageProjectUrl>
+        <PackageProjectUrl>https://gitlab.com/novaloop-oss/novaloop.update-tag</PackageProjectUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 

src/Core/Commands/PushCommitsToRemote.cs

@@ -1,9 +1,11 @@
+using System.Threading;
+using System.Threading.Tasks;
 using Application.Interfaces;
 using MediatR;
 
 namespace Application.Commands
 {
-    public class PushCommitsToRemote : RequestHandler<PushCommitsToRemote.Command>
+    public class PushCommitsToRemote : AsyncRequestHandler<PushCommitsToRemote.Command>
     {
         private readonly IGitRepoWriteService _gitRepoWriteService;
 
@@ -22,10 +24,10 @@ namespace Application.Commands
             }
         }
 
-
-        protected override void Handle(Command request)
+        protected override async Task Handle(Command request, CancellationToken cancellationToken)
         {
-            _gitRepoWriteService.Push(request.RepoPath);
+            await _gitRepoWriteService.PushTags(request.RepoPath);
+            await _gitRepoWriteService.Push(request.RepoPath);
         }
     }
 }

src/Core/Interfaces/IGitRepoReadService.cs

@@ -1,10 +1,12 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Application.Models;
 
 namespace Application.Interfaces
 {
     public interface IGitRepoReadService
     {
-        public IEnumerable<Version> GetAllVersions(string repoPath);
+        IEnumerable<Version> GetAllVersions(string repoPath);
+        Task<string> GetRepoBasePath(string workingDir);
     }
 }

src/Core/Interfaces/IGitRepoWriteService.cs

@@ -1,8 +1,11 @@
+using System.Threading.Tasks;
+
 namespace Application.Interfaces
 {
     public interface IGitRepoWriteService
     {
         void AddTag(string repoPath, string tag);
-        void Push(string repoPath);
+        Task<string> PushTags(string repoPath);
+        Task<string> Push(string repoPath);
     }
 }

src/Core/Models/Version.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -19,7 +20,7 @@ namespace Application.Models
             Patch = patch;
         }
 
-        public Version(int major, int minor, int patch, int rc)
+        public Version(int major, int minor, int patch, int? rc)
         {
             Major = major;
             Minor = minor;
@@ -32,7 +33,16 @@ namespace Application.Models
             Major = major;
             Minor = minor;
             Patch = patch;
-            Rc = ExtractNumberFromRcString(rc);
+            Rc = rc == null ? null : ExtractNumberFromRcString(rc);
+            Service = service ?? "";
+        }
+
+        public Version(int major, int minor, int patch, int? rc, string service)
+        {
+            Major = major;
+            Minor = minor;
+            Patch = patch;
+            Rc = rc;
             Service = service ?? "";
         }
 
@@ -75,62 +85,118 @@ namespace Application.Models
             return sb.ToString();
         }
 
+        private Version Copy()
+        {
+            return new Version(Major, Minor, Patch, Rc, Service);
+        }
+
         public Version NextMajor()
         {
-            var nextVersion = new Version(Major, Minor, Patch, Rc.ToString(), Service);
-            nextVersion.BumpMajor();
+            if (Rc != null)
+            {
+                throw new ArgumentException("Cannot create next Major. Release RC first.");
+            }
+
+            var nextVersion = Copy();
+            nextVersion.Major++;
+            nextVersion.Minor = 0;
+            nextVersion.Patch = 0;
             return nextVersion;
         }
 
         public Version NextMinor()
         {
-            var nextVersion = new Version(Major, Minor, Patch, Rc.ToString(), Service);
-            nextVersion.BumpMinor();
+            if (Rc != null)
+            {
+                throw new ArgumentException("Cannot create next Minor. Release RC first.");
+            }
+
+            var nextVersion = Copy();
+            nextVersion.Minor++;
+            nextVersion.Patch = 0;
             return nextVersion;
         }
 
         public Version NextPatch()
         {
-            var nextVersion = new Version(Major, Minor, Patch, Rc.ToString(), Service);
-            nextVersion.BumpPatch();
+            if (Rc != null)
+            {
+                throw new ArgumentException("Cannot create next Patch. Release RC first.");
+            }
+
+            var nextVersion = Copy();
+            nextVersion.Patch++;
             return nextVersion;
         }
 
         public Version NextRc()
         {
-            var nextVersion = new Version(Major, Minor, Patch, Rc.ToString(), Service);
-            nextVersion.BumpRc();
+            if (Rc == null)
+            {
+                throw new ArgumentException("Cannot create next RC. Not an RC.");
+            }
+
+            var nextVersion = Copy();
+            nextVersion.Rc++;
             return nextVersion;
         }
 
-        public void BumpMajor()
+        public Version CreatePatchRc()
         {
-            Major++;
-            Minor = 0;
-            Patch = 0;
-            Rc = null;
+            if (Rc != null)
+            {
+                throw new ArgumentException("Cannot create RC. Already an RC.");
+            }
+
+            var nextVersion = Copy();
+            nextVersion.Patch++;
+            nextVersion.Rc = 0;
+            return nextVersion;
         }
 
-        public void BumpMinor()
+        public Version CreateMinorRc()
         {
-            Minor++;
-            Patch = 0;
-            Rc = null;
+            if (Rc != null)
+            {
+                throw new ArgumentException("Cannot create RC. Already an RC.");
+            }
+
+            var nextVersion = Copy();
+            nextVersion.Minor++;
+            nextVersion.Patch = 0;
+            nextVersion.Rc = 0;
+            return nextVersion;
         }
 
-        public void BumpPatch()
+        public Version CreateMajorRc()
         {
-            Patch++;
-            Rc = null;
+            if (Rc != null)
+            {
+                throw new ArgumentException("Cannot create RC. Already an RC.");
+            }
+
+            var nextVersion = Copy();
+            nextVersion.Major++;
+            nextVersion.Minor = 0;
+            nextVersion.Patch = 0;
+            nextVersion.Rc = 0;
+            return nextVersion;
         }
 
-        public void BumpRc()
+        public Version ReleaseRc()
         {
             if (Rc == null)
             {
-                BumpMinor();
+                throw new ArgumentException("Cannot release RC. Not an RC.");
             }
-            Rc = Rc == null ? 0 : Rc + 1;
+
+            var nextVersion = new Version(Major, Minor, Patch, (string)null, Service);
+            return nextVersion;
+        }
+
+        public bool IsRc()
+        {
+            return Rc != null;
         }
     }
 }

src/Core/Models/VersionInformation.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace Application.Models
 {
     public class VersionInformation
@@ -5,16 +7,36 @@ namespace Application.Models
         public VersionInformation(Version currentVersion)
         {
             CurrentVersion = currentVersion;
-            NextMajorVersion = currentVersion.NextMajor();
-            NextMinorVersion = currentVersion.NextMinor();
-            NextPatchVersion = currentVersion.NextPatch();
-            NextMinorRcVersion = currentVersion.NextRc();
+            if (currentVersion.IsRc())
+            {
+                NextVersions.Add(new NextVersion("next rc", currentVersion.NextRc()));
+                NextVersions.Add(new NextVersion("release", currentVersion.ReleaseRc()));
+            }
+            else
+            {
+                NextVersions.Add(new NextVersion("patch-rc", currentVersion.CreatePatchRc()));
+                NextVersions.Add(new NextVersion("minor-rc", currentVersion.CreateMinorRc()));
+                NextVersions.Add(new NextVersion("minor-rc", currentVersion.CreateMajorRc()));
+                NextVersions.Add(new NextVersion("patch   ", currentVersion.NextPatch()));
+                NextVersions.Add(new NextVersion("minor   ", currentVersion.NextMinor()));
+                NextVersions.Add(new NextVersion("major   ", currentVersion.NextMajor()));
+            }
         }
 
         public Version CurrentVersion { get; }
-        public Version NextMajorVersion { get; }
-        public Version NextMinorVersion { get; }
-        public Version NextPatchVersion { get; }
-        public Version NextMinorRcVersion { get; }
+
+        public List<NextVersion> NextVersions = new List<NextVersion>();
+    }
+
+    public class NextVersion
+    {
+        public NextVersion(string title, Version version)
+        {
+            Title = title;
+            Version = version;
+        }
+
+        public string Title { get; }
+        public Version Version { get; }
     }
 }

src/Core/Queries/GetRepoBasePath.cs

@@ -0,0 +1,33 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Application.Interfaces;
+using MediatR;
+
+namespace Application.Queries
+{
+    public class GetRepoBasePath : IRequestHandler<GetRepoBasePath.Query, string>
+    {
+        public class Query : IRequest<string>
+        {
+            public Query(string workingDir)
+            {
+                WorkingDir = workingDir;
+            }
+
+            public string WorkingDir { get; }
+        }
+
+        private readonly IGitRepoReadService _gitRepoReadService;
+
+        public GetRepoBasePath(IGitRepoReadService gitRepoReadService)
+        {
+            _gitRepoReadService = gitRepoReadService;
+        }
+
+
+        public async Task<string> Handle(Query request, CancellationToken cancellationToken)
+        {
+            return await _gitRepoReadService.GetRepoBasePath(request.WorkingDir);
+        }
+    }
+}

src/Infrastructure/Infrastructure.csproj

@@ -9,6 +9,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <PackageReference Include="CliWrap" Version="3.3.3" />
       <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="semver" Version="2.0.6" />

src/Infrastructure/Services/GitRepoReadService.cs

@@ -1,5 +1,8 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Application.Interfaces;
+using CliWrap;
+using CliWrap.Buffered;
 using LibGit2Sharp;
 using Semver;
 using Version = Application.Models.Version;
@@ -8,6 +11,15 @@ namespace Infrastructure.Services
 {
     public class GitRepoReadService : IGitRepoReadService
     {
+        public async Task<string> GetRepoBasePath(string workingDir)
+        {
+            var result = await Cli.Wrap("git")
+                .WithArguments("rev-parse --show-toplevel")
+                .WithWorkingDirectory(workingDir)
+                .ExecuteBufferedAsync();
+            return result.StandardOutput.Trim();
+        }
+
         public IEnumerable<Version> GetAllVersions(string repoPath)
         {
             using var repo = new Repository(repoPath);

src/Infrastructure/Services/GitRepoWriteService.cs

@@ -1,4 +1,7 @@
+using System.Threading.Tasks;
 using Application.Interfaces;
+using CliWrap;
+using CliWrap.Buffered;
 using LibGit2Sharp;
 
 namespace Infrastructure.Services
@@ -11,10 +14,23 @@ namespace Infrastructure.Services
             repo.ApplyTag(tag);
         }
 
-        public void Push(string repoPath)
+        public async Task<string> PushTags(string repoPath)
         {
-            using var repo = new Repository(repoPath);
-            repo.Network.Push(repo.Head);
+            var result = await Cli.Wrap("git")
+                .WithArguments("push --tags")
+                .WithWorkingDirectory(repoPath)
+                .ExecuteBufferedAsync();
+            return result.StandardOutput.Trim();
+        }
+
+        public async Task<string> Push(string repoPath)
+        {
+            var result = await Cli.Wrap("git")
+                .WithArguments("push")
+                .WithWorkingDirectory(repoPath)
+                .ExecuteBufferedAsync();
+
+            return result.StandardOutput.Trim();
         }
     }
 }

tests/update-tag.tests/VersionInformationTests.cs

@@ -0,0 +1,48 @@
+using System.Linq;
+using Application.Models;
+using Xunit;
+
+namespace UpdateTag.Tests
+{
+    public class VersionInformationTests
+    {
+        [Fact]
+        public void CorrectNextVersionsFromRc()
+
+        {
+            // Arrange
+            var version = new Version(1, 0, 1, 1);
+
+            // Act
+            var versionInformation = new VersionInformation(version);
+            var versions = versionInformation.NextVersions.Select(nv => nv.Version.ToString()).ToList();
+
+            // Assert
+            Assert.Contains("1.0.1-RC.2", versions); // next rc
+            Assert.Contains("1.0.1", versions); // release rc
+            Assert.Equal(2, versions.Count);
+        }
+
+        [Fact]
+        public void CorrectNextVersionsFromNonRc()
+
+        {
+            // Arrange
+            var version = new Version(1, 0, 1);
+
+            // Act
+            var versionInformation = new VersionInformation(version);
+            var versions = versionInformation.NextVersions.Select(nv => nv.Version.ToString()).ToList();
+
+
+            // Assert
+            Assert.Contains("1.0.2-RC.0", versions); // patch RC
+            Assert.Contains("1.1.0-RC.0", versions); // minor RC
+            Assert.Contains("2.0.0-RC.0", versions); // major RC
+            Assert.Contains("1.0.2", versions); // next patch
+            Assert.Contains("1.1.0", versions); // next minor
+            Assert.Contains("2.0.0", versions); // next major
+            Assert.Equal(6, versions.Count);
+        }
+    }
+}

tests/update-tag.tests/VersionTests.cs

@@ -9,13 +9,10 @@ namespace UpdateTag.Tests
         [InlineData(1, 0, 0, "", "", "2.0.0")]
         [InlineData(1, 1, 0, "", "", "2.0.0")]
         [InlineData(1, 1, 1, "", "", "2.0.0")]
-        [InlineData(1, 1, 1, "RC.4", "", "2.0.0")]
-        [InlineData(1, 1, 1, "RC.4", "ErpNext", "2.0.0+ErpNext")]
-        public void BumpMajor(int major, int minor, int patch, string rc, string service, string expected)
+        public void NextMajor(int major, int minor, int patch, string rc, string service, string expected)
 
         {
-            var version = new Version(major, minor, patch, rc, service);
-            version.BumpMajor();
+            var version = new Version(major, minor, patch, rc, service).NextMajor();
             Assert.Equal(expected, version.ToString());
         }
 
@@ -24,13 +21,10 @@ namespace UpdateTag.Tests
         [InlineData(1, 0, 0, "", "", "1.1.0")]
         [InlineData(1, 1, 0, "", "", "1.2.0")]
         [InlineData(1, 1, 1, "", "", "1.2.0")]
-        [InlineData(1, 1, 1, "RC.4", "", "1.2.0")]
-        [InlineData(1, 1, 1, "RC.4", "ErpNext", "1.2.0+ErpNext")]
-        public void BumpMinor(int major, int minor, int patch, string rc, string service, string expected)
+        public void NextMinor(int major, int minor, int patch, string rc, string service, string expected)
 
         {
-            var version = new Version(major, minor, patch, rc, service);
-            version.BumpMinor();
+            var version = new Version(major, minor, patch, rc, service).NextMinor();
             Assert.Equal(expected, version.ToString());
         }
 
@@ -38,27 +32,56 @@ namespace UpdateTag.Tests
         [InlineData(1, 0, 0, "", "", "1.0.1")]
         [InlineData(1, 1, 0, "", "", "1.1.1")]
         [InlineData(1, 1, 1, "", "", "1.1.2")]
-        [InlineData(1, 1, 1, "RC.4", "", "1.1.2")]
-        [InlineData(1, 1, 1, "RC.4", "ErpNext", "1.1.2+ErpNext")]
-        public void BumpPatch(int major, int minor, int patch, string rc, string service, string expected)
+        public void NextPatch(int major, int minor, int patch, string rc, string service, string expected)
 
         {
-            var version = new Version(major, minor, patch, rc, service);
-            version.BumpPatch();
+            var version = new Version(major, minor, patch, rc, service).NextPatch();
             Assert.Equal(expected, version.ToString());
         }
 
         [Theory]
-        [InlineData(1, 0, 0, "", "", "1.1.0-RC.0")]
-        [InlineData(1, 1, 0, "", "", "1.2.0-RC.0")]
-        [InlineData(1, 1, 1, "", "", "1.2.0-RC.0")]
         [InlineData(1, 1, 1, "RC.4", "", "1.1.1-RC.5")]
         [InlineData(1, 1, 1, "RC.4", "ErpNext", "1.1.1-RC.5+ErpNext")]
-        public void BumpRc(int major, int minor, int patch, string rc, string service, string expected)
+        public void NextRc(int major, int minor, int patch, string rc, string service, string expected)
 
         {
-            var version = new Version(major, minor, patch, rc, service);
-            version.BumpRc();
+            var version = new Version(major, minor, patch, rc, service).NextRc();
+            Assert.Equal(expected, version.ToString());
+        }
+
+        [Theory]
+        [InlineData(1, 1, 1, null, "", "1.1.2-RC.0")]
+        [InlineData(1, 1, 1, null, "ErpNext", "1.1.2-RC.0+ErpNext")]
+        public void CreatePatchRc(int major, int minor, int patch, string rc, string service, string expected)
+        {
+            var version = new Version(major, minor, patch, rc, service).CreatePatchRc();
+            Assert.Equal(expected, version.ToString());
+        }
+
+        [Theory]
+        [InlineData(1, 1, 1, null, "", "1.2.0-RC.0")]
+        [InlineData(1, 1, 1, null, "ErpNext", "1.2.0-RC.0+ErpNext")]
+        public void CreateMinorRc(int major, int minor, int patch, string rc, string service, string expected)
+        {
+            var version = new Version(major, minor, patch, rc, service).CreateMinorRc();
+            Assert.Equal(expected, version.ToString());
+        }
+
+        [Theory]
+        [InlineData(1, 1, 1, null, "", "2.0.0-RC.0")]
+        [InlineData(1, 1, 1, null, "ErpNext", "2.0.0-RC.0+ErpNext")]
+        public void CreateMajroRc(int major, int minor, int patch, string rc, string service, string expected)
+        {
+            var version = new Version(major, minor, patch, rc, service).CreateMajorRc();
+            Assert.Equal(expected, version.ToString());
+        }
+
+        [Theory]
+        [InlineData(1, 1, 1, "RC.4", "", "1.1.1")]
+        [InlineData(1, 1, 1, "RC.4", "ErpNext", "1.1.1+ErpNext")]
+        public void ReleaseRc(int major, int minor, int patch, string rc, string service, string expected)
+        {
+            var version = new Version(major, minor, patch, rc, service).ReleaseRc();
             Assert.Equal(expected, version.ToString());
         }
     }