Rename build server API

src/BuildServers/AppVeyor/Cake.Issues.BuildServer.AppVeyor/AppVeyorBuildServer.cs

@@ -8,7 +8,7 @@
 /// <summary>
 /// Class for posting issues to AppVeyor.
 /// </summary>
-public class AppVeyorBuildServer : BaseBuildServerSystem
+public class AppVeyorBuildServer : BaseBuildServer
 {
     private readonly ICakeContext context;
     private readonly AppVeyorBuildSettings settings;

src/BuildServers/AppVeyor/Cake.Issues.BuildServer.AppVeyor/AppVeyorBuildsAliases.cs

@@ -29,7 +29,7 @@ public static class AppVeyorBuildsAliases
     /// </example>
     [CakeMethodAlias]
     [CakeAliasCategory(BuildServerAliasConstants.BuildServerCakeAliasCategory)]
-    public static IBuildServerSystem AppVeyorBuilds(
+    public static IBuildServer AppVeyorBuilds(
         this ICakeContext context)
     {
         context.NotNull();
@@ -64,7 +64,7 @@ public static IBuildServerSystem AppVeyorBuilds(
     /// </example>
     [CakeMethodAlias]
     [CakeAliasCategory(BuildServerAliasConstants.BuildServerCakeAliasCategory)]
-    public static IBuildServerSystem AppVeyorBuilds(
+    public static IBuildServer AppVeyorBuilds(
         this ICakeContext context,
         AppVeyorBuildSettings settings)
     {

src/BuildServers/GitHubActions/Cake.Issues.BuildServer.GitHubActions/GitHubActionsBuildServer.cs

@@ -9,7 +9,7 @@
 /// <summary>
 /// Class for posting issues to GitHub Actions.
 /// </summary>
-public class GitHubActionsBuildServer : BaseBuildServerSystem
+public class GitHubActionsBuildServer : BaseBuildServer
 {
     private static readonly char[] Separator = ['\n'];
     private readonly GitHubActionsBuildSettings settings;

src/BuildServers/GitHubActions/Cake.Issues.BuildServer.GitHubActions/GitHubActionsBuildsAliases.cs

@@ -29,7 +29,7 @@ public static class GitHubActionsBuildsAliases
     /// </example>
     [CakeMethodAlias]
     [CakeAliasCategory(BuildServerAliasConstants.BuildServerCakeAliasCategory)]
-    public static IBuildServerSystem GitHubActionsBuilds(
+    public static IBuildServer GitHubActionsBuilds(
         this ICakeContext context)
     {
         context.NotNull();
@@ -63,7 +63,7 @@ public static IBuildServerSystem GitHubActionsBuilds(
     /// </example>
     [CakeMethodAlias]
     [CakeAliasCategory(BuildServerAliasConstants.BuildServerCakeAliasCategory)]
-    public static IBuildServerSystem GitHubActionsBuilds(
+    public static IBuildServer GitHubActionsBuilds(
         this ICakeContext context,
         GitHubActionsBuildSettings settings)
     {

src/Core/Cake.Issues.BuildServer/Cake.Issues.BuildServer.Tests/BuildServerIntegrationTests.cs

@@ -15,7 +15,7 @@ public void Should_Work_With_Build_Server_Implementation()
         {
             // Given
             var log = Substitute.For<ICakeLog>();
-            var buildServer = new TestBuildServerSystem(log);
+            var buildServer = new TestBuildServer(log);
             var settings = new ReportIssuesToBuildServerSettings(@"C:\repo");
 
             var issues = new List<IIssue>
@@ -36,9 +36,9 @@ public void Should_Work_With_Build_Server_Implementation()
     }
 
     /// <summary>
-    /// Simple test implementation of a build server system.
+    /// Simple test implementation of a build server.
     /// </summary>
-    private class TestBuildServerSystem(ICakeLog log) : BaseBuildServerSystem(log)
+    private class TestBuildServer(ICakeLog log) : BaseBuildServer(log)
     {
         public List<IIssue> PostedIssues { get; } = [];
 

src/Core/Cake.Issues.BuildServer/Cake.Issues.BuildServer.Tests/BuildServerOrchestratorTests.cs

@@ -50,20 +50,20 @@ public void Should_Throw_If_Issue_Is_Null()
         }
 
         [Fact]
-        public void Should_Throw_If_Build_Server_System_Is_Null()
+        public void Should_Throw_If_Build_Server_Is_Null()
         {
             // Given
             var fixture = new OrchestratorForIssuesFixture
             {
-                BuildServerSystem = null,
+                BuildServer = null,
             };
             var issues = new List<IIssue>();
 
             // When
             var result = Record.Exception(() => fixture.RunOrchestrator(issues));
 
             // Then
-            result.IsArgumentNullException("buildServerSystem");
+            result.IsArgumentNullException("buildServer");
         }
 
         [Fact]
@@ -84,7 +84,7 @@ public void Should_Throw_If_Settings_Are_Null()
         }
 
         [Fact]
-        public void Should_Initialize_Build_Server_System()
+        public void Should_Initialize_Build_Server()
         {
             // Given
             var fixture = new OrchestratorForIssuesFixture();
@@ -94,7 +94,7 @@ public void Should_Initialize_Build_Server_System()
             _ = fixture.RunOrchestrator(issues);
 
             // Then
-            fixture.BuildServerSystem.Settings.ShouldBe(fixture.Settings);
+            fixture.BuildServer.Settings.ShouldBe(fixture.Settings);
         }
 
         [Fact]
@@ -177,19 +177,19 @@ public void Should_Throw_If_Issue_Provider_Is_Null()
         }
 
         [Fact]
-        public void Should_Throw_If_Build_Server_System_Is_Null()
+        public void Should_Throw_If_Build_Server_Is_Null()
         {
             // Given
             var fixture = new OrchestratorForIssueProvidersFixture
             {
-                BuildServerSystem = null,
+                BuildServer = null,
             };
 
             // When
             var result = Record.Exception(fixture.RunOrchestrator);
 
             // Then
-            result.IsArgumentNullException("buildServerSystem");
+            result.IsArgumentNullException("buildServer");
         }
 
         [Fact]
@@ -209,7 +209,7 @@ public void Should_Throw_If_Settings_Are_Null()
         }
 
         [Fact]
-        public void Should_Initialize_Build_Server_System()
+        public void Should_Initialize_Build_Server()
         {
             // Given
             var fixture = new OrchestratorForIssueProvidersFixture();
@@ -218,7 +218,7 @@ public void Should_Initialize_Build_Server_System()
             _ = fixture.RunOrchestrator();
 
             // Then
-            fixture.BuildServerSystem.Settings.ShouldBe(fixture.Settings);
+            fixture.BuildServer.Settings.ShouldBe(fixture.Settings);
         }
     }
 
@@ -262,7 +262,7 @@ public Task Should_Post_Issue()
             _ = fixture.RunOrchestrator();
 
             // Then
-            fixture.BuildServerSystem.PostedIssues.ShouldContain(issueToPost);
+            fixture.BuildServer.PostedIssues.ShouldContain(issueToPost);
             fixture.Log.Entries.ShouldContain(x => x.Message.StartsWith("Posting 1 issue(s):"));
             return Verify(fixture.Console.Output);
         }
@@ -290,7 +290,7 @@ public Task Should_Post_Issue_Not_Related_To_A_File()
             _ = fixture.RunOrchestrator();
 
             // Then
-            fixture.BuildServerSystem.PostedIssues.ShouldContain(issueToPost);
+            fixture.BuildServer.PostedIssues.ShouldContain(issueToPost);
             fixture.Log.Entries.ShouldContain(x => x.Message.StartsWith("Posting 1 issue(s):"));
             return Verify(fixture.Console.Output);
         }
@@ -336,7 +336,7 @@ public void Should_Return_Correct_Values()
         }
 
         [Fact]
-        public void Should_Return_Reported_Issues_If_BuildServerSystem_Could_Not_Be_Initialized()
+        public void Should_Return_Reported_Issues_If_BuildServer_Could_Not_Be_Initialized()
         {
             // Given
             var firstIssue =
@@ -357,7 +357,7 @@ public void Should_Return_Reported_Issues_If_BuildServerSystem_Could_Not_Be_Init
             var fixture =
                 new OrchestratorForIssueProvidersFixture
                 {
-                    BuildServerSystem =
+                    BuildServer =
                     {
                         ShouldFailOnInitialization = true,
                     },

src/Core/Cake.Issues.BuildServer/Cake.Issues.BuildServer.Tests/FakeBuildServerSystem.cs → src/Core/Cake.Issues.BuildServer/Cake.Issues.BuildServer.Tests/FakeBuildServer.cs

@@ -3,10 +3,10 @@
 using Cake.Core.Diagnostics;
 
 /// <summary>
-/// Implementation of a <see cref="BaseBuildServerSystem"/> for use in test cases.
+/// Implementation of a <see cref="BaseBuildServer"/> for use in test cases.
 /// </summary>
 /// <param name="log">The Cake log instance.</param>
-public class FakeBuildServerSystem(ICakeLog log) : BaseBuildServerSystem(log)
+public class FakeBuildServer(ICakeLog log) : BaseBuildServer(log)
 {
     private readonly List<IIssue> postedIssues = [];
 

src/Core/Cake.Issues.BuildServer/Cake.Issues.BuildServer.Tests/FakeBuildServerBuilder.cs

@@ -0,0 +1,40 @@
+namespace Cake.Issues.BuildServer.Tests;
+
+using Cake.Core.Diagnostics;
+
+/// <summary>
+/// Class to create instances of <see cref="FakeBuildServer"/> with a fluent API.
+/// </summary>
+public class FakeBuildServerBuilder
+{
+    private readonly ICakeLog log;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FakeBuildServerBuilder"/> class.
+    /// </summary>
+    /// <param name="log">The Cake log context.</param>
+    private FakeBuildServerBuilder(ICakeLog log)
+    {
+        log.NotNull();
+
+        this.log = log;
+    }
+
+    /// <summary>
+    /// Initiates the creation of a new <see cref="FakeBuildServer"/>.
+    /// </summary>
+    /// <param name="log">The Cake log context.</param>
+    /// <returns>Builder class for creating a new build server.</returns>
+    public static FakeBuildServerBuilder NewBuildServer(ICakeLog log)
+    {
+        log.NotNull();
+
+        return new FakeBuildServerBuilder(log);
+    }
+
+    /// <summary>
+    /// Creates a new <see cref="FakeBuildServer"/>.
+    /// </summary>
+    /// <returns>New build server.</returns>
+    public FakeBuildServer Create() => new(this.log);
+}

src/Core/Cake.Issues.BuildServer/Cake.Issues.BuildServer.Tests/OrchestratorForIssueProvidersFixture.cs

@@ -11,7 +11,7 @@ public OrchestratorForIssueProvidersFixture()
     }
 
     public OrchestratorForIssueProvidersFixture(
-        Func<FakeBuildServerSystemBuilder, IReportIssuesToBuildServerSettings, FakeBuildServerSystemBuilder> buildServerSettings)
+        Func<FakeBuildServerBuilder, IReportIssuesToBuildServerSettings, FakeBuildServerBuilder> buildServerSettings)
     {
         buildServerSettings.NotNull();
 
@@ -25,10 +25,10 @@ public OrchestratorForIssueProvidersFixture(
             new ReportIssuesToBuildServerFromIssueProviderSettings(
                 @"c:\Source\Cake.Issues");
 
-        var buildServerSystemBuilder = FakeBuildServerSystemBuilder.NewBuildServerSystem(this.Log);
-        buildServerSystemBuilder =
-            buildServerSettings(buildServerSystemBuilder, this.Settings);
-        this.BuildServerSystem = buildServerSystemBuilder.Create();
+        var buildServerBuilder = FakeBuildServerBuilder.NewBuildServer(this.Log);
+        buildServerBuilder =
+            buildServerSettings(buildServerBuilder, this.Settings);
+        this.BuildServer = buildServerBuilder.Create();
     }
 
     public FakeLog Log { get; set; }
@@ -37,7 +37,7 @@ public OrchestratorForIssueProvidersFixture(
 
     public IList<FakeIssueProvider> IssueProviders { get; set; }
 
-    public FakeBuildServerSystem BuildServerSystem { get; set; }
+    public FakeBuildServer BuildServer { get; set; }
 
     public IReportIssuesToBuildServerFromIssueProviderSettings Settings { get; set; }
 
@@ -47,7 +47,7 @@ public BuildServerIssueResult RunOrchestrator()
             new BuildServerOrchestrator(
                 this.Log,
                 this.Console,
-                this.BuildServerSystem);
+                this.BuildServer);
         return
             orchestrator.Run(
                 this.IssueProviders,

src/Core/Cake.Issues.BuildServer/Cake.Issues.BuildServer.Tests/OrchestratorForIssuesFixture.cs

@@ -11,7 +11,7 @@ public OrchestratorForIssuesFixture()
     }
 
     public OrchestratorForIssuesFixture(
-        Func<FakeBuildServerSystemBuilder, IReportIssuesToBuildServerSettings, FakeBuildServerSystemBuilder> buildServerSettings)
+        Func<FakeBuildServerBuilder, IReportIssuesToBuildServerSettings, FakeBuildServerBuilder> buildServerSettings)
     {
         buildServerSettings.NotNull();
 
@@ -23,17 +23,17 @@ public OrchestratorForIssuesFixture(
             new ReportIssuesToBuildServerSettings(
                 @"c:\Source\Cake.Issues");
 
-        var buildServerSystemBuilder = FakeBuildServerSystemBuilder.NewBuildServerSystem(this.Log);
-        buildServerSystemBuilder =
-            buildServerSettings(buildServerSystemBuilder, this.Settings);
-        this.BuildServerSystem = buildServerSystemBuilder.Create();
+        var buildServerBuilder = FakeBuildServerBuilder.NewBuildServer(this.Log);
+        buildServerBuilder =
+            buildServerSettings(buildServerBuilder, this.Settings);
+        this.BuildServer = buildServerBuilder.Create();
     }
 
     public FakeLog Log { get; set; }
 
     public TestConsole Console { get; set; }
 
-    public FakeBuildServerSystem BuildServerSystem { get; set; }
+    public FakeBuildServer BuildServer { get; set; }
 
     public IReportIssuesToBuildServerSettings Settings { get; set; }
 
@@ -43,7 +43,7 @@ public BuildServerIssueResult RunOrchestrator(IEnumerable<IIssue> issues)
             new BuildServerOrchestrator(
                 this.Log,
                 this.Console,
-                this.BuildServerSystem);
+                this.BuildServer);
         return orchestrator.Run(
             issues,
             this.Settings);