Merge pull request #783 from adamralph/refactor

refactor: align ignoreHeight parameter
adamralph · Jul 24, 2022 · 4055269 · 4055269
2 parents d916c09 + bb5e768
commit 4055269
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/MinVer.Lib/Versioner.cs b/MinVer.Lib/Versioner.cs
@@ -7,7 +7,7 @@ namespace MinVer.Lib;
 
 public static class Versioner
 {
-    public static Version GetVersion(string workDir, string tagPrefix, MajorMinor minMajorMinor, string buildMeta, VersionPart autoIncrement, string defaultPreReleasePhase, ILogger log, bool ignoreHeight = false)
+    public static Version GetVersion(string workDir, string tagPrefix, MajorMinor minMajorMinor, string buildMeta, VersionPart autoIncrement, string defaultPreReleasePhase, bool ignoreHeight, ILogger log)
     {
         log = log ?? throw new ArgumentNullException(nameof(log));
 

diff --git a/MinVerTests.Lib/AutoIncrement.cs b/MinVerTests.Lib/AutoIncrement.cs
@@ -23,7 +23,7 @@ public static async Task RtmVersionIncrement(string tag, VersionPart autoIncreme
             await Commit(path);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", autoIncrement, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", autoIncrement, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());

diff --git a/MinVerTests.Lib/BuildMetadata.cs b/MinVerTests.Lib/BuildMetadata.cs
@@ -20,7 +20,7 @@ public static async Task NoCommits(string buildMetadata, string expectedVersion)
             await EnsureEmptyRepository(path);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -36,7 +36,7 @@ public static async Task NoTag(string buildMetadata, string expectedVersion)
             await EnsureEmptyRepositoryAndCommit(path);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -57,7 +57,7 @@ public static async Task CurrentTag(string tag, string buildMetadata, string exp
             await Tag(path, tag);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -79,7 +79,7 @@ public static async Task PreviousTag(string tag, string buildMetadata, string ex
             await Commit(path);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());

diff --git a/MinVerTests.Lib/DefaultPreReleasePhases.cs b/MinVerTests.Lib/DefaultPreReleasePhases.cs
@@ -20,7 +20,7 @@ public static async Task DefaultPreReleasePhase(string phase, string expectedVer
             await EnsureEmptyRepositoryAndCommit(path);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, phase, NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, phase, false, NullLogger.Instance);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());

diff --git a/MinVerTests.Lib/LogMessages.cs b/MinVerTests.Lib/LogMessages.cs
@@ -68,7 +68,7 @@ git checkout main
             var log = new TestLogger();
 
             // act
-            _ = Versioner.GetVersion(path, "", minMajorMinor, "", default, "", log);
+            _ = Versioner.GetVersion(path, "", minMajorMinor, "", default, "", false, log);
 
             // assert
             var logMessages = log.ToString();

diff --git a/MinVerTests.Lib/MinMajorMinor.cs b/MinVerTests.Lib/MinMajorMinor.cs
@@ -19,7 +19,7 @@ public static async Task NoCommits()
             await EnsureEmptyRepository(path);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 2), "", default, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 2), "", default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal("1.2.0-alpha.0", actualVersion.ToString());
@@ -38,7 +38,7 @@ public static async Task Tagged(string tag, int major, int minor, string expecte
             var logger = new TestLogger();
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(major, minor), "", default, "", logger);
+            var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(major, minor), "", default, "", false, logger);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -57,7 +57,7 @@ public static async Task NotTagged()
             await EnsureEmptyRepositoryAndCommit(path);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 0), "", default, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 0), "", default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal("1.0.0-alpha.0", actualVersion.ToString());

diff --git a/MinVerTests.Lib/TagPrefixes.cs b/MinVerTests.Lib/TagPrefixes.cs
@@ -22,7 +22,7 @@ public static async Task TagPrefix(string tag, string prefix, string expectedVer
             await Tag(path, tag);
 
             // act
-            var actualVersion = Versioner.GetVersion(path, prefix, MajorMinor.Zero, "", default, "", NullLogger.Instance);
+            var actualVersion = Versioner.GetVersion(path, prefix, MajorMinor.Zero, "", default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal(expectedVersion, actualVersion.ToString());

diff --git a/MinVerTests.Lib/Versions.cs b/MinVerTests.Lib/Versions.cs
@@ -85,7 +85,7 @@ git tag 1.1.0 -a -m '.'
             {
                 await Checkout(path, sha);
 
-                var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", log);
+                var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", false, log);
                 var versionString = version.ToString();
                 var tagName = $"v/{versionString}";
 
@@ -114,7 +114,7 @@ public static async Task EmptyRepo()
             await EnsureEmptyRepository(path);
 
             // act
-            var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", NullLogger.Instance);
+            var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal("0.0.0-alpha.0", version.ToString());
@@ -128,7 +128,7 @@ public static void NoRepo()
             EnsureEmptyDirectory(path);
 
             // act
-            var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", NullLogger.Instance);
+            var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", false, NullLogger.Instance);
 
             // assert
             Assert.Equal("0.0.0-alpha.0", version.ToString());

diff --git a/minver-cli/Program.cs b/minver-cli/Program.cs
@@ -78,7 +78,7 @@ private static int Main(string[] args)
                 return 0;
             }
 
-            var version = Versioner.GetVersion(workDir, options.TagPrefix ?? "", options.MinMajorMinor ?? MajorMinor.Zero, options.BuildMeta ?? "", options.AutoIncrement ?? default, options.DefaultPreReleasePhase ?? "", log, options.IgnoreHeight ?? false);
+            var version = Versioner.GetVersion(workDir, options.TagPrefix ?? "", options.MinMajorMinor ?? MajorMinor.Zero, options.BuildMeta ?? "", options.AutoIncrement ?? default, options.DefaultPreReleasePhase ?? "", options.IgnoreHeight ?? false, log);
 
             Console.Out.WriteLine(version);