feat: improving push-functionality

.gitlab-ci.yml

@@ -10,7 +10,7 @@ running tests for tag:
 
 publish to nuget:
   only:
-    - /^v+\d*.\d*.\d*$/ # gets triggered if the commit tag is in the form n.n.n where n is any number
+    - /^\d*.\d*.\d*$/ # gets triggered if the commit tag is in the form n.n.n where n is any number
   image: mcr.microsoft.com/dotnet/sdk:5.0
   stage: publish
   script:

src/Cli/AppRunner.cs

@@ -26,8 +26,7 @@ namespace Cli
             var chosenService = await ChooseService(repoBasePath);
             var selection = await SelectVersion(repoBasePath, chosenService);
             await AddVersionTagToRepo(repoBasePath, selection.Version.ToString());
-            await PushTagsToRemote(repoBasePath);
-            await PushCommitsToRemote(repoBasePath);
+            await PushToRemote(repoBasePath);
         }
 
         private async Task<string> GetRepoBasePath(string workingDir)
@@ -103,15 +102,6 @@ namespace Cli
                             new Selection("no", null)
                         )
                 );
-                var serviceName = AnsiConsole.Prompt(
-                    new TextPrompt<string>("[grey][[Optional]][/] Enter [green]service name[/]:")
-                        .AllowEmpty()
-                );
-
-                if (!string.IsNullOrWhiteSpace(serviceName))
-                {
-                    selection.Version.SetService(serviceName.Trim());
-                }
             }
 
             if (selection.Version == null)
@@ -122,27 +112,11 @@ namespace Cli
             return selection;
         }
 
-        private async Task PushTagsToRemote(string workingDir)
+        private async Task PushToRemote(string workingDir)
         {
             try
             {
-                var output = await _mediator.Send(new PushTagsToRemote.Command(workingDir));
-                AnsiConsole.Write(output);
-            }
-            catch (Exception ex)
-            {
-                AnsiConsole.Markup("[red]Error:[/] Tag was written but unable to push to remote\n\n");
-                AnsiConsole.WriteException(ex);
-                Environment.Exit(1);
-            }
-        }
-
-        private async Task PushCommitsToRemote(string workingDir)
-        {
-            try
-            {
-                var output = await _mediator.Send(new PushCommitsToRemote.Command(workingDir));
-                AnsiConsole.Write(output);
+                await _mediator.Send(new PushCommitsToRemote.Command(workingDir));
             }
             catch (Exception ex)
             {

src/Cli/Cli.csproj

@@ -9,7 +9,7 @@
         <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.3.1</Version>
+        <Version>0.1.5</Version>
         <Authors>Matthias Langhard</Authors>
         <Company>Novaloop AG</Company>
         <PackageProjectUrl>https://gitlab.com/novaloop-oss/novaloop.update-tag</PackageProjectUrl>

src/Core/Commands/PushCommitsToRemote.cs

@@ -3,9 +3,9 @@ using System.Threading.Tasks;
 using Application.Interfaces;
 using MediatR;
 
-namespace Application.Queries
+namespace Application.Commands
 {
-    public class PushCommitsToRemote : IRequestHandler<PushCommitsToRemote.Command, string>
+    public class PushCommitsToRemote : AsyncRequestHandler<PushCommitsToRemote.Command>
     {
         private readonly IGitRepoWriteService _gitRepoWriteService;
 
@@ -14,7 +14,7 @@ namespace Application.Queries
             _gitRepoWriteService = gitRepoWriteService;
         }
 
-        public class Command : IRequest<string>
+        public class Command : IRequest
         {
             public string RepoPath { get; }
 
@@ -24,10 +24,10 @@ namespace Application.Queries
             }
         }
 
-
-        public async Task<string> Handle(Command request, CancellationToken ct)
+        protected override async Task Handle(Command request, CancellationToken cancellationToken)
         {
-            return await _gitRepoWriteService.Push(request.RepoPath, ct);
+            await _gitRepoWriteService.PushTags(request.RepoPath);
+            await _gitRepoWriteService.Push(request.RepoPath);
         }
     }
 }

src/Core/Interfaces/IGitRepoWriteService.cs

@@ -1,4 +1,3 @@
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Application.Interfaces
@@ -6,7 +5,7 @@ namespace Application.Interfaces
     public interface IGitRepoWriteService
     {
         void AddTag(string repoPath, string tag);
-        Task<string> PushTags(string repoPath, CancellationToken cancellationToken);
-        Task<string> Push(string repoPath, CancellationToken ct);
+        Task<string> PushTags(string repoPath);
+        Task<string> Push(string repoPath);
     }
 }

src/Core/Models/Version.cs

@@ -57,13 +57,12 @@ namespace Application.Models
         public int Minor { get; private set; }
         public int Patch { get; private set; }
         public int? Rc { get; private set; }
-        public string Service { get; private set; }
+        public string Service { get; }
 
 
         public override string ToString()
         {
             var sb = new StringBuilder();
-            sb.Append('v');
             sb.Append(Major);
             sb.Append('.');
             sb.Append(Minor);
@@ -199,10 +198,5 @@ namespace Application.Models
         {
             return Rc != null;
         }
-
-        public void SetService(string service)
-        {
-            Service = service;
-        }
     }
 }

src/Core/Queries/GetVersionInformationFromRepo.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Application.Interfaces;
 using Application.Models;
 using MediatR;
 
 namespace Application.Queries
 {
-    public class GetVersionInformationFromRepo : IRequestHandler<GetVersionInformationFromRepo.Query, VersionInformation>
+    public class GetVersionInformationFromRepo : RequestHandler<GetVersionInformationFromRepo.Query, VersionInformation>
     {
         public class Query : IRequest<VersionInformation>
         {
@@ -29,7 +27,7 @@ namespace Application.Queries
             _gitRepoReadService = gitRepoReadService;
         }
 
-        public async Task<VersionInformation> Handle(Query request, CancellationToken cancellationToken)
+        protected override VersionInformation Handle(Query request)
         {
             var versions = _gitRepoReadService
                 .GetAllVersions(request.RepositoryPath);
@@ -44,11 +42,10 @@ namespace Application.Queries
                 .OrderByDescending(v => v.Major)
                 .ThenByDescending(v => v.Minor)
                 .ThenByDescending(v => v.Patch)
-                .ThenByDescending(v => v.Rc == null)
                 .ThenByDescending(v => v.Rc)
                 .FirstOrDefault();
 
-            return await Task.FromResult(currentVersion == null ? null : new VersionInformation(currentVersion));
+            return currentVersion == null ? null : new VersionInformation(currentVersion);
         }
     }
 }

src/Core/Queries/PushTagsToRemote.cs

@@ -1,33 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Application.Interfaces;
-using MediatR;
-
-namespace Application.Queries
-{
-    public class PushTagsToRemote : IRequestHandler<PushTagsToRemote.Command, string>
-    {
-        private readonly IGitRepoWriteService _gitRepoWriteService;
-
-        public PushTagsToRemote(IGitRepoWriteService gitRepoWriteService)
-        {
-            _gitRepoWriteService = gitRepoWriteService;
-        }
-
-        public class Command : IRequest<string>
-        {
-            public string RepoPath { get; }
-
-            public Command(string repoPath)
-            {
-                RepoPath = repoPath;
-            }
-        }
-
-
-        public async Task<string> Handle(Command request, CancellationToken ct)
-        {
-            return await _gitRepoWriteService.PushTags(request.RepoPath, ct);
-        }
-    }
-}

src/Infrastructure/Services/GitRepoWriteService.cs

@@ -1,4 +1,3 @@
-using System.Threading;
 using System.Threading.Tasks;
 using Application.Interfaces;
 using CliWrap;
@@ -15,21 +14,21 @@ namespace Infrastructure.Services
             repo.ApplyTag(tag);
         }
 
-        public async Task<string> PushTags(string repoPath, CancellationToken ct)
+        public async Task<string> PushTags(string repoPath)
         {
             var result = await Cli.Wrap("git")
                 .WithArguments("push --tags")
                 .WithWorkingDirectory(repoPath)
-                .ExecuteBufferedAsync(ct);
+                .ExecuteBufferedAsync();
             return result.StandardOutput.Trim();
         }
 
-        public async Task<string> Push(string repoPath, CancellationToken ct)
+        public async Task<string> Push(string repoPath)
         {
             var result = await Cli.Wrap("git")
                 .WithArguments("push")
                 .WithWorkingDirectory(repoPath)
-                .ExecuteBufferedAsync(ct);
+                .ExecuteBufferedAsync();
 
             return result.StandardOutput.Trim();
         }

tests/update-tag.tests/GetVersionInformationFromRepoTests.cs

@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using Application.Interfaces;
-using Application.Models;
-using Application.Queries;
-using Moq;
-using Xunit;
-
-namespace UpdateTag.Tests
-{
-    public class GetVersionInformationFromRepoTests
-    {
-        [Fact]
-        public async void DoesReadCurrentVersionCorrectly()
-        {
-            // Arrange
-            var mockedVersionList = new List<Version>
-            {
-                new Version(0, 1, 5),
-                new Version(0, 1, 7),
-                new Version(0, 2, 0),
-                new Version(0, 2, 0, 0),
-                new Version(0, 2, 0, 1),
-                new Version(0, 2, 0, 2)
-            };
-            var gitRepoMock = new Mock<IGitRepoReadService>();
-            gitRepoMock.Setup(m => m.GetAllVersions(It.IsAny<string>()))
-                .Returns(mockedVersionList);
-            var handler = new GetVersionInformationFromRepo(gitRepoMock.Object);
-            var query = new GetVersionInformationFromRepo.Query("");
-
-            // Act
-            var versionInformation = await handler.Handle(query, CancellationToken.None);
-
-            // Assert
-            Assert.Equal("v0.2.0", versionInformation.CurrentVersion.ToString());
-        }
-    }
-}

tests/update-tag.tests/VersionInformationTests.cs

@@ -18,8 +18,8 @@ namespace UpdateTag.Tests
             var versions = versionInformation.NextVersions.Select(nv => nv.Version.ToString()).ToList();
 
             // Assert
-            Assert.Contains("v1.0.1-RC.2", versions); // next rc
-            Assert.Contains("v1.0.1", versions); // release rc
+            Assert.Contains("1.0.1-RC.2", versions); // next rc
+            Assert.Contains("1.0.1", versions); // release rc
             Assert.Equal(2, versions.Count);
         }
 
@@ -36,12 +36,12 @@ namespace UpdateTag.Tests
 
 
             // Assert
-            Assert.Contains("v1.0.2-RC.0", versions); // patch RC
-            Assert.Contains("v1.1.0-RC.0", versions); // minor RC
-            Assert.Contains("v2.0.0-RC.0", versions); // major RC
-            Assert.Contains("v1.0.2", versions); // next patch
-            Assert.Contains("v1.1.0", versions); // next minor
-            Assert.Contains("v2.0.0", versions); // next major
+            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

@@ -6,9 +6,9 @@ namespace UpdateTag.Tests
     public class VersionTests
     {
         [Theory]
-        [InlineData(1, 0, 0, "", "", "v2.0.0")]
-        [InlineData(1, 1, 0, "", "", "v2.0.0")]
-        [InlineData(1, 1, 1, "", "", "v2.0.0")]
+        [InlineData(1, 0, 0, "", "", "2.0.0")]
+        [InlineData(1, 1, 0, "", "", "2.0.0")]
+        [InlineData(1, 1, 1, "", "", "2.0.0")]
         public void NextMajor(int major, int minor, int patch, string rc, string service, string expected)
 
         {
@@ -18,9 +18,9 @@ namespace UpdateTag.Tests
 
 
         [Theory]
-        [InlineData(1, 0, 0, "", "", "v1.1.0")]
-        [InlineData(1, 1, 0, "", "", "v1.2.0")]
-        [InlineData(1, 1, 1, "", "", "v1.2.0")]
+        [InlineData(1, 0, 0, "", "", "1.1.0")]
+        [InlineData(1, 1, 0, "", "", "1.2.0")]
+        [InlineData(1, 1, 1, "", "", "1.2.0")]
         public void NextMinor(int major, int minor, int patch, string rc, string service, string expected)
 
         {
@@ -29,9 +29,9 @@ namespace UpdateTag.Tests
         }
 
         [Theory]
-        [InlineData(1, 0, 0, "", "", "v1.0.1")]
-        [InlineData(1, 1, 0, "", "", "v1.1.1")]
-        [InlineData(1, 1, 1, "", "", "v1.1.2")]
+        [InlineData(1, 0, 0, "", "", "1.0.1")]
+        [InlineData(1, 1, 0, "", "", "1.1.1")]
+        [InlineData(1, 1, 1, "", "", "1.1.2")]
         public void NextPatch(int major, int minor, int patch, string rc, string service, string expected)
 
         {
@@ -40,8 +40,8 @@ namespace UpdateTag.Tests
         }
 
         [Theory]
-        [InlineData(1, 1, 1, "RC.4", "", "v1.1.1-RC.5")]
-        [InlineData(1, 1, 1, "RC.4", "ErpNext", "v1.1.1-RC.5+ErpNext")]
+        [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 NextRc(int major, int minor, int patch, string rc, string service, string expected)
 
         {
@@ -50,8 +50,8 @@ namespace UpdateTag.Tests
         }
 
         [Theory]
-        [InlineData(1, 1, 1, null, "", "v1.1.2-RC.0")]
-        [InlineData(1, 1, 1, null, "ErpNext", "v1.1.2-RC.0+ErpNext")]
+        [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();
@@ -59,8 +59,8 @@ namespace UpdateTag.Tests
         }
 
         [Theory]
-        [InlineData(1, 1, 1, null, "", "v1.2.0-RC.0")]
-        [InlineData(1, 1, 1, null, "ErpNext", "v1.2.0-RC.0+ErpNext")]
+        [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();
@@ -68,8 +68,8 @@ namespace UpdateTag.Tests
         }
 
         [Theory]
-        [InlineData(1, 1, 1, null, "", "v2.0.0-RC.0")]
-        [InlineData(1, 1, 1, null, "ErpNext", "v2.0.0-RC.0+ErpNext")]
+        [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();
@@ -77,8 +77,8 @@ namespace UpdateTag.Tests
         }
 
         [Theory]
-        [InlineData(1, 1, 1, "RC.4", "", "v1.1.1")]
-        [InlineData(1, 1, 1, "RC.4", "ErpNext", "v1.1.1+ErpNext")]
+        [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();

tests/update-tag.tests/update-tag.tests.csproj

@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>