Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ OPTIONS:
--verbose Show verbose output
--working-dir The path to the directory containing the git repository. Defaults to the current directory
-s, --stack The name of the stack to cleanup
--yes Confirm the cleanup operation without prompting
```

#### `stack branch new` <!-- omit from toc -->
Expand Down
47 changes: 44 additions & 3 deletions src/Stack.Tests/Commands/Stack/CleanupStackCommandHandlerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public async Task WhenStackNameIsProvided_ItIsNotAskedFor()
inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(true);

// Act
await handler.Handle(new CleanupStackCommandInputs("Stack1"));
await handler.Handle(new CleanupStackCommandInputs("Stack1", false));

// Assert
inputProvider.DidNotReceive().Select(Questions.SelectStack, Arg.Any<string[]>());
Expand Down Expand Up @@ -232,7 +232,7 @@ public async Task WhenStackNameIsProvided_ButStackDoesNotExist_Throws()

// Act and assert
var invalidStackName = Some.Name();
await handler.Invoking(async h => await h.Handle(new CleanupStackCommandInputs(invalidStackName)))
await handler.Invoking(async h => await h.Handle(new CleanupStackCommandInputs(invalidStackName, false)))
.Should()
.ThrowAsync<InvalidOperationException>()
.WithMessage($"Stack '{invalidStackName}' not found.");
Expand Down Expand Up @@ -267,9 +267,50 @@ public async Task WhenOnlyASingleStackExists_StackIsSelectedAutomatically()
inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(true);

// Act
await handler.Handle(new CleanupStackCommandInputs(null));
await handler.Handle(new CleanupStackCommandInputs(null, false));

// Assert
inputProvider.DidNotReceive().Select(Questions.SelectStack, Arg.Any<string[]>());
}

[Fact]
public async Task WhenConfirmIsProvided_DoesNotAskForConfirmation_DeletesBranches()
{
// Arrange
var sourceBranch = Some.BranchName();
var branchToCleanup = Some.BranchName();
var branchToKeep = Some.BranchName();
using var repo = new TestGitRepositoryBuilder()
.WithBranch(sourceBranch, true)
.WithBranch(branchToCleanup, true)
.WithBranch(branchToKeep, true)
.Build();

repo.DeleteRemoteTrackingBranch(branchToCleanup);

var stackConfig = Substitute.For<IStackConfig>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = Substitute.For<ILogger>();
var gitClient = new GitClient(logger, repo.GitClientSettings);
var gitHubClient = Substitute.For<IGitHubClient>();
var handler = new CleanupStackCommandHandler(inputProvider, logger, gitClient, gitHubClient, stackConfig);

var stacks = new List<Config.Stack>(
[
new("Stack1", repo.RemoteUri, sourceBranch, [branchToCleanup, branchToKeep]),
new("Stack2", repo.RemoteUri, sourceBranch, [])
]);

var remoteUri = Some.HttpsUri().ToString();
stackConfig.Load().Returns(stacks);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");

// Act
await handler.Handle(new CleanupStackCommandInputs(null, true));

// Assert
inputProvider.DidNotReceive().Confirm(Questions.ConfirmDeleteBranches);
repo.GetBranches().Should().NotContain(b => b.FriendlyName == branchToCleanup);
}
}
13 changes: 8 additions & 5 deletions src/Stack/Commands/Stack/CleanupStackCommand.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

using System.ComponentModel;
using Spectre.Console.Cli;
using Stack.Config;
Expand All @@ -13,6 +12,10 @@ public class CleanupStackCommandSettings : CommandSettingsBase
[Description("The name of the stack to cleanup.")]
[CommandOption("-s|--stack")]
public string? Stack { get; init; }

[Description("Confirm the cleanup operation without prompting.")]
[CommandOption("--yes")]
public bool Confirm { get; init; }
}

public class CleanupStackCommand : Command<CleanupStackCommandSettings>
Expand All @@ -26,13 +29,13 @@ protected override async Task Execute(CleanupStackCommandSettings settings)
new GitHubClient(StdErrLogger, settings.GetGitHubClientSettings()),
new StackConfig());

await handler.Handle(new CleanupStackCommandInputs(settings.Stack));
await handler.Handle(new CleanupStackCommandInputs(settings.Stack, settings.Confirm));
}
}

public record CleanupStackCommandInputs(string? Stack)
public record CleanupStackCommandInputs(string? Stack, bool Confirm)
{
public static CleanupStackCommandInputs Empty => new((string?)null);
public static CleanupStackCommandInputs Empty => new(null, false);
}

public class CleanupStackCommandHandler(
Expand Down Expand Up @@ -70,7 +73,7 @@ public override async Task Handle(CleanupStackCommandInputs inputs)

StackHelpers.OutputBranchesNeedingCleanup(logger, branchesToCleanUp);

if (inputProvider.Confirm(Questions.ConfirmDeleteBranches))
if (inputs.Confirm || inputProvider.Confirm(Questions.ConfirmDeleteBranches))
{
StackHelpers.CleanupBranches(gitClient, logger, branchesToCleanUp);
logger.Information($"Stack {stack.Name.Stack()} cleaned up");
Expand Down