chore: updates README.md

README.md

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

src/Cli/AppRunner.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Application.Commands;
 using Application.Queries;
@@ -20,37 +19,13 @@ namespace Cli
             _mediator = mediator;
         }
 
-        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)
+        public async Task Run(string repoPath)
         {
+            // Check if git dir
             var services = new List<string>();
             try
             {
-                services = await _mediator.Send(new GetServicesFromGitRepo.Query(repoBasePath));
+                services = await _mediator.Send(new GetServicesFromGitRepo.Query(repoPath));
             }
             catch (LibGit2Sharp.RepositoryNotFoundException)
             {
@@ -69,12 +44,8 @@ namespace Cli
                         .AddChoices(services));
             }
 
-            return chosenService;
-        }
 
-        private async Task<Selection> SelectVersion(string repoBasePath, string chosenService)
-        {
-            var versionInfo = await _mediator.Send(new GetVersionInformationFromRepo.Query(repoBasePath, chosenService));
+            var versionInfo = await _mediator.Send(new GetVersionInformationFromRepo.Query(repoPath, chosenService));
             Selection selection;
             if (versionInfo != null)
             {
@@ -83,10 +54,10 @@ namespace Cli
                         .Title($"Select new version. (Current version is [green]{versionInfo.CurrentVersion}[/])")
                         .PageSize(10)
                         .AddChoices(
-                            versionInfo
-                                .NextVersions
-                                .Select(nv => new Selection(nv.Title, nv.Version))
-                                .ToList()
+                            new Selection("rc   ", versionInfo.NextMinorRcVersion),
+                            new Selection("patch", versionInfo.NextPatchVersion),
+                            new Selection("minor", versionInfo.NextMinorVersion),
+                            new Selection("major", versionInfo.NextMajorVersion)
                         )
                 );
             }
@@ -109,14 +80,20 @@ namespace Cli
                 Environment.Exit(0);
             }
 
-            return selection;
-        }
-
-        private async Task PushToRemote(string workingDir)
-        {
             try
             {
-                await _mediator.Send(new PushCommitsToRemote.Command(workingDir));
+                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);
+            }
+
+            try
+            {
+                await _mediator.Send(new PushCommitsToRemote.Command(repoPath));
             }
             catch (Exception ex)
             {
@@ -125,19 +102,5 @@ 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,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.1.2</Version>
+        <Version>0.1.0</Version>
         <Authors>Matthias Langhard</Authors>
         <Company>Novaloop AG</Company>
         <PackageProjectUrl>https://gitlab.com/novaloop-oss/novaloop.updatetag</PackageProjectUrl>

src/Core/Commands/PushCommitsToRemote.cs

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

src/Core/Interfaces/IGitRepoReadService.cs

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

src/Core/Interfaces/IGitRepoWriteService.cs

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

src/Core/Models/Version.cs

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

src/Core/Models/VersionInformation.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Application.Models
 {
     public class VersionInformation
@@ -7,34 +5,16 @@ namespace Application.Models
         public VersionInformation(Version currentVersion)
         {
             CurrentVersion = currentVersion;
-            if (currentVersion.IsRc())
-            {
-                NextVersions.Add(new NextVersion("next rc", currentVersion.NextRc()));
-                NextVersions.Add(new NextVersion("release", currentVersion.ReleaseRc()));
-            }
-            else
-            {
-                NextVersions.Add(new NextVersion("rc", currentVersion.CreateRc()));
-                NextVersions.Add(new NextVersion("patch", currentVersion.NextPatch()));
-                NextVersions.Add(new NextVersion("minor", currentVersion.NextMinor()));
-                NextVersions.Add(new NextVersion("major", currentVersion.NextMajor()));
-            }
+            NextMajorVersion = currentVersion.NextMajor();
+            NextMinorVersion = currentVersion.NextMinor();
+            NextPatchVersion = currentVersion.NextPatch();
+            NextMinorRcVersion = currentVersion.NextRc();
         }
 
         public Version CurrentVersion { 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; }
+        public Version NextMajorVersion { get; }
+        public Version NextMinorVersion { get; }
+        public Version NextPatchVersion { get; }
+        public Version NextMinorRcVersion { get; }
     }
 }

src/Core/Queries/GetRepoBasePath.cs

@@ -1,33 +0,0 @@
-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,7 +9,6 @@
     </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,8 +1,5 @@
 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;
@@ -11,15 +8,6 @@ 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,7 +1,4 @@
-using System.Threading.Tasks;
 using Application.Interfaces;
-using CliWrap;
-using CliWrap.Buffered;
 using LibGit2Sharp;
 
 namespace Infrastructure.Services
@@ -14,12 +11,10 @@ namespace Infrastructure.Services
             repo.ApplyTag(tag);
         }
 
-        public async Task Push(string repoPath)
+        public void Push(string repoPath)
         {
-            await Cli.Wrap("git")
-                .WithArguments("push --tags")
-                .WithWorkingDirectory(repoPath)
-                .ExecuteBufferedAsync();
+            using var repo = new Repository(repoPath);
+            repo.Network.Push(repo.Head);
         }
     }
 }

tests/update-tag.tests/VersionInformationTests.cs

@@ -1,46 +0,0 @@
-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);
-            Assert.Contains("1.0.1", versions);
-            Assert.Equal(2, versions.Count);
-        }
-
-        [Fact]
-        public void CorrectNextVersionsFromMinor()
-
-        {
-            // 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.1-RC.0", versions);
-            Assert.Contains("1.0.2", versions);
-            Assert.Contains("1.1.0", versions);
-            Assert.Contains("2.0.0", versions);
-            Assert.Equal(4, versions.Count);
-        }
-    }
-}

tests/update-tag.tests/VersionTests.cs

@@ -9,10 +9,13 @@ namespace UpdateTag.Tests
         [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)
+        [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)
 
         {
-            var version = new Version(major, minor, patch, rc, service).NextMajor();
+            var version = new Version(major, minor, patch, rc, service);
+            version.BumpMajor();
             Assert.Equal(expected, version.ToString());
         }
 
@@ -21,10 +24,13 @@ namespace UpdateTag.Tests
         [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)
+        [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)
 
         {
-            var version = new Version(major, minor, patch, rc, service).NextMinor();
+            var version = new Version(major, minor, patch, rc, service);
+            version.BumpMinor();
             Assert.Equal(expected, version.ToString());
         }
 
@@ -32,29 +38,27 @@ namespace UpdateTag.Tests
         [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)
+        [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)
 
         {
-            var version = new Version(major, minor, patch, rc, service).NextPatch();
+            var version = new Version(major, minor, patch, rc, service);
+            version.BumpPatch();
             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 NextRc(int major, int minor, int patch, string rc, string service, string expected)
+        public void BumpRc(int major, int minor, int patch, string rc, string service, string expected)
 
         {
-            var version = new Version(major, minor, patch, rc, service).NextRc();
-            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();
+            var version = new Version(major, minor, patch, rc, service);
+            version.BumpRc();
             Assert.Equal(expected, version.ToString());
         }
     }