fix: changelog config not applied when working with non-monorepo

versionize · Jun 15, 2024 · 69c5014 · 69c5014
1 parent 38ad49d
commit 69c5014
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 4 deletions.
diff --git a/Versionize.Tests/ProgramTests.cs b/Versionize.Tests/ProgramTests.cs
@@ -60,13 +60,51 @@ public void ShouldReadConfigurationFromConfigFile()
     {
         TempProject.CreateCsharpProject(_testSetup.WorkingDirectory);
 
+        var config = new ConfigurationContract
+        {
+            SkipDirty = true,
+            Changelog = new ChangelogOptions
+            {
+                Header = "My Custom header"
+            }
+        };
+        var json = JsonConvert.SerializeObject(config);
+
         File.WriteAllText(Path.Join(_testSetup.WorkingDirectory, "hello.txt"), "First commit");
-        File.WriteAllText(Path.Join(_testSetup.WorkingDirectory, ".versionize"), @"{ ""skipDirty"": true }");
+        File.WriteAllText(Path.Join(_testSetup.WorkingDirectory, ".versionize"), json);
 
         var exitCode = Program.Main(new[] { "-w", _testSetup.WorkingDirectory });
 
         exitCode.ShouldBe(0);
         File.Exists(Path.Join(_testSetup.WorkingDirectory, "CHANGELOG.md")).ShouldBeTrue();
+        File.ReadAllText(Path.Join(_testSetup.WorkingDirectory, "CHANGELOG.md")).ShouldContain("My Custom header");
+        _testSetup.Repository.Commits.Count().ShouldBe(1);
+    }
+
+    [Fact]
+    public void ShouldReadConfigurationFromConfigFileInCustomDirectory()
+    {
+        TempProject.CreateCsharpProject(_testSetup.WorkingDirectory);
+
+        var config = new ConfigurationContract
+        {
+            SkipDirty = true,
+            Changelog = new ChangelogOptions
+            {
+                Header = "My Custom header"
+            }
+        };
+        var json = JsonConvert.SerializeObject(config);
+        var configDir = Path.Join(_testSetup.WorkingDirectory, "..");
+
+        File.WriteAllText(Path.Join(_testSetup.WorkingDirectory, "hello.txt"), "First commit");
+        File.WriteAllText(Path.Join(_testSetup.WorkingDirectory, "..", ".versionize"), json);
+
+        var exitCode = Program.Main(new[] { "-w", _testSetup.WorkingDirectory, "--configDir", configDir, "--skip-dirty" });
+
+        exitCode.ShouldBe(0);
+        File.Exists(Path.Join(_testSetup.WorkingDirectory, "CHANGELOG.md")).ShouldBeTrue();
+        File.ReadAllText(Path.Join(_testSetup.WorkingDirectory, "CHANGELOG.md")).ShouldContain("My Custom header");
         _testSetup.Repository.Commits.Count().ShouldBe(1);
     }
 

diff --git a/Versionize/Program.cs b/Versionize/Program.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using McMaster.Extensions.CommandLineUtils;
 using Versionize.CommandLine;
 using Versionize.Versioning;
@@ -154,8 +154,7 @@ private static ConfigurationContract FromJsonFile(string filePath, bool inspectM
     {
         var project =
             optionalConfiguration?.Projects.FirstOrDefault(x =>
-                x.Name.Equals(projectName, StringComparison.OrdinalIgnoreCase))
-            ?? configuration.Project;
+                x.Name.Equals(projectName, StringComparison.OrdinalIgnoreCase));
         if (project != null)
         {
             project.Changelog =