novaloop-oss/novaloop.update-tag
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: improves next version selection

Browse Source
This commit is contained in:
Matthias Langhard
2021-11-03 08:23:41 +01:00
parent 0ca934cfa8
commit 808f0e4564
5 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cli/Cli.csproj
View File

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

32
src/Core/Models/Version.cs
View File

@@ -141,7 +141,7 @@ namespace Application.Models
return nextVersion;
}
public Version CreateRc()
public Version CreatePatchRc()
{
if (Rc != null)
{
@@ -149,6 +149,36 @@ namespace Application.Models
}
var nextVersion = Copy();
nextVersion.Patch++;
nextVersion.Rc = 0;
return nextVersion;
}
public Version CreateMinorRc()
{
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 Version CreateMajorRc()
{
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;
}

10
src/Core/Models/VersionInformation.cs
View File

@@ -14,10 +14,12 @@ namespace Application.Models
}
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()));
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()));
}
}

18
tests/update-tag.tests/VersionInformationTests.cs
View File

@@ -18,13 +18,13 @@ namespace UpdateTag.Tests
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.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 CorrectNextVersionsFromMinor()
public void CorrectNextVersionsFromNonRc()
{
// Arrange
@@ -36,11 +36,13 @@ namespace UpdateTag.Tests
// 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);
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);
}
}
}

27
tests/update-tag.tests/VersionTests.cs
View File

@@ -49,6 +49,33 @@ namespace UpdateTag.Tests
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")]