From edda9a2773c39f7c4169bf16a39a50d436228767 Mon Sep 17 00:00:00 2001 From: "D. Moonfire" Date: Mon, 16 Jan 2023 13:45:59 -0600 Subject: [PATCH] refactor(temporal)!: cleaned up organization --- .envrc | 3 +- examples/CopyFiles/CopyFilesTest.cs | 35 ++++++++++++++----- .../NitrideCalendarBuilderExtensions.cs | 2 +- .../NitrideFeedsBuilderExtensions.cs | 2 +- .../MfGames.Nitride.Temporal.csproj | 19 +++++----- .../SetInstantFromComponent.cs | 1 + .../NitrideTemporalBuilderExtensions.cs | 2 +- .../NitrideTemporalConfiguration.cs | 2 +- .../CreateDateIndexesValidator.cs | 2 +- .../FilterOutExpiredInstantValidator.cs | 2 +- .../FilterOutFutureInstantValidator.cs | 2 +- .../SetInstantFromComponentValidator.cs | 2 +- .../SetInstantFromPathValidator.cs | 2 +- .../CreateDateIndexesTests.cs | 4 +-- 14 files changed, 50 insertions(+), 30 deletions(-) rename src/MfGames.Nitride.Temporal/{ => Setup}/NitrideTemporalBuilderExtensions.cs (98%) rename src/MfGames.Nitride.Temporal/{ => Setup}/NitrideTemporalConfiguration.cs (97%) rename src/MfGames.Nitride.Temporal/{ => Validators}/CreateDateIndexesValidator.cs (88%) rename src/MfGames.Nitride.Temporal/{ => Validators}/FilterOutExpiredInstantValidator.cs (84%) rename src/MfGames.Nitride.Temporal/{ => Validators}/FilterOutFutureInstantValidator.cs (83%) rename src/MfGames.Nitride.Temporal/{ => Validators}/SetInstantFromComponentValidator.cs (85%) rename src/MfGames.Nitride.Temporal/{ => Validators}/SetInstantFromPathValidator.cs (82%) diff --git a/.envrc b/.envrc index 5816063..508bcf6 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,3 @@ -export PATH=$PWD/scripts:$PATH use flake || use nix +export PATH=$PWD/scripts:$PATH +export DOTNET_ROOT=$(dirname $(dirname $(which dotnet))) diff --git a/examples/CopyFiles/CopyFilesTest.cs b/examples/CopyFiles/CopyFilesTest.cs index 41596a8..7ca6ea6 100644 --- a/examples/CopyFiles/CopyFilesTest.cs +++ b/examples/CopyFiles/CopyFilesTest.cs @@ -1,4 +1,6 @@ +using System; using System.IO; +using System.Text; using System.Threading.Tasks; using CliWrap; @@ -41,14 +43,31 @@ public class CopyFilesTest : NitrideTestBase } // Execute the generator. This will throw if there is an exception. - await Cli.Wrap("dotnet") - .WithArguments( - x => x.Add("run") - .Add("--project") - .Add(projectFile.FullName) - .Add("--") - .Add("build")) - .ExecuteAsync(); + StringBuilder output = new(); + + try + { + await Cli + .Wrap("dotnet") + .WithWorkingDirectory(projectFile.DirectoryName!) + .WithArguments( + argumentsBuilder => argumentsBuilder + .Add("run") + .Add("--no-build") + .Add("--") + .Add("build")) + .WithStandardOutputPipe(PipeTarget.ToStringBuilder(output)) + .WithStandardErrorPipe(PipeTarget.ToStringBuilder(output)) + .ExecuteAsync(); + } + catch (Exception exception) + { + this.Logger.Fatal( + exception, + "There was an exception running the command:\n\n{Log:l}", + output); + throw; + } // Make sure we have our output. FileInfo aFile = outputDir.GetFile("a.txt"); diff --git a/src/MfGames.Nitride.Calendar/NitrideCalendarBuilderExtensions.cs b/src/MfGames.Nitride.Calendar/NitrideCalendarBuilderExtensions.cs index 7965ab2..52946b7 100644 --- a/src/MfGames.Nitride.Calendar/NitrideCalendarBuilderExtensions.cs +++ b/src/MfGames.Nitride.Calendar/NitrideCalendarBuilderExtensions.cs @@ -1,6 +1,6 @@ using Autofac; -using MfGames.Nitride.Temporal; +using MfGames.Nitride.Temporal.Setup; namespace MfGames.Nitride.Calendar; diff --git a/src/MfGames.Nitride.Feeds/NitrideFeedsBuilderExtensions.cs b/src/MfGames.Nitride.Feeds/NitrideFeedsBuilderExtensions.cs index 6493833..6bf4120 100644 --- a/src/MfGames.Nitride.Feeds/NitrideFeedsBuilderExtensions.cs +++ b/src/MfGames.Nitride.Feeds/NitrideFeedsBuilderExtensions.cs @@ -1,6 +1,6 @@ using Autofac; -using MfGames.Nitride.Temporal; +using MfGames.Nitride.Temporal.Setup; namespace MfGames.Nitride.Feeds; diff --git a/src/MfGames.Nitride.Temporal/MfGames.Nitride.Temporal.csproj b/src/MfGames.Nitride.Temporal/MfGames.Nitride.Temporal.csproj index d7f0861..c51c119 100644 --- a/src/MfGames.Nitride.Temporal/MfGames.Nitride.Temporal.csproj +++ b/src/MfGames.Nitride.Temporal/MfGames.Nitride.Temporal.csproj @@ -3,7 +3,6 @@ net6.0 enable - Nitride.Temporal @@ -11,18 +10,18 @@ - - - - - - - - + + + + + + + + - + diff --git a/src/MfGames.Nitride.Temporal/SetInstantFromComponent.cs b/src/MfGames.Nitride.Temporal/SetInstantFromComponent.cs index 9e31a98..eba9ad8 100644 --- a/src/MfGames.Nitride.Temporal/SetInstantFromComponent.cs +++ b/src/MfGames.Nitride.Temporal/SetInstantFromComponent.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using FluentValidation; using MfGames.Gallium; +using MfGames.Nitride.Temporal.Validators; using NodaTime; diff --git a/src/MfGames.Nitride.Temporal/NitrideTemporalBuilderExtensions.cs b/src/MfGames.Nitride.Temporal/Setup/NitrideTemporalBuilderExtensions.cs similarity index 98% rename from src/MfGames.Nitride.Temporal/NitrideTemporalBuilderExtensions.cs rename to src/MfGames.Nitride.Temporal/Setup/NitrideTemporalBuilderExtensions.cs index edb5b85..15dae22 100644 --- a/src/MfGames.Nitride.Temporal/NitrideTemporalBuilderExtensions.cs +++ b/src/MfGames.Nitride.Temporal/Setup/NitrideTemporalBuilderExtensions.cs @@ -7,7 +7,7 @@ using MfGames.Nitride.Temporal.Cli; using Serilog; -namespace MfGames.Nitride.Temporal; +namespace MfGames.Nitride.Temporal.Setup; public static class NitrideTemporalBuilderExtensions { diff --git a/src/MfGames.Nitride.Temporal/NitrideTemporalConfiguration.cs b/src/MfGames.Nitride.Temporal/Setup/NitrideTemporalConfiguration.cs similarity index 97% rename from src/MfGames.Nitride.Temporal/NitrideTemporalConfiguration.cs rename to src/MfGames.Nitride.Temporal/Setup/NitrideTemporalConfiguration.cs index 0323046..36ee590 100644 --- a/src/MfGames.Nitride.Temporal/NitrideTemporalConfiguration.cs +++ b/src/MfGames.Nitride.Temporal/Setup/NitrideTemporalConfiguration.cs @@ -4,7 +4,7 @@ using MfGames.Nitride.Generators; using NodaTime; -namespace MfGames.Nitride.Temporal; +namespace MfGames.Nitride.Temporal.Setup; /// /// Configures the temporal settings for use with `UseTemporal`. diff --git a/src/MfGames.Nitride.Temporal/CreateDateIndexesValidator.cs b/src/MfGames.Nitride.Temporal/Validators/CreateDateIndexesValidator.cs similarity index 88% rename from src/MfGames.Nitride.Temporal/CreateDateIndexesValidator.cs rename to src/MfGames.Nitride.Temporal/Validators/CreateDateIndexesValidator.cs index b1058f9..dc71ae2 100644 --- a/src/MfGames.Nitride.Temporal/CreateDateIndexesValidator.cs +++ b/src/MfGames.Nitride.Temporal/Validators/CreateDateIndexesValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace MfGames.Nitride.Temporal; +namespace MfGames.Nitride.Temporal.Validators; public class CreateDateIndexesValidator : AbstractValidator { diff --git a/src/MfGames.Nitride.Temporal/FilterOutExpiredInstantValidator.cs b/src/MfGames.Nitride.Temporal/Validators/FilterOutExpiredInstantValidator.cs similarity index 84% rename from src/MfGames.Nitride.Temporal/FilterOutExpiredInstantValidator.cs rename to src/MfGames.Nitride.Temporal/Validators/FilterOutExpiredInstantValidator.cs index db2cb31..3b873ba 100644 --- a/src/MfGames.Nitride.Temporal/FilterOutExpiredInstantValidator.cs +++ b/src/MfGames.Nitride.Temporal/Validators/FilterOutExpiredInstantValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace MfGames.Nitride.Temporal; +namespace MfGames.Nitride.Temporal.Validators; public class FilterOutExpiredInstantValidator : AbstractValidator diff --git a/src/MfGames.Nitride.Temporal/FilterOutFutureInstantValidator.cs b/src/MfGames.Nitride.Temporal/Validators/FilterOutFutureInstantValidator.cs similarity index 83% rename from src/MfGames.Nitride.Temporal/FilterOutFutureInstantValidator.cs rename to src/MfGames.Nitride.Temporal/Validators/FilterOutFutureInstantValidator.cs index e412c87..cf8da02 100644 --- a/src/MfGames.Nitride.Temporal/FilterOutFutureInstantValidator.cs +++ b/src/MfGames.Nitride.Temporal/Validators/FilterOutFutureInstantValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace MfGames.Nitride.Temporal; +namespace MfGames.Nitride.Temporal.Validators; public class FilterOutFutureInstantValidator : AbstractValidator diff --git a/src/MfGames.Nitride.Temporal/SetInstantFromComponentValidator.cs b/src/MfGames.Nitride.Temporal/Validators/SetInstantFromComponentValidator.cs similarity index 85% rename from src/MfGames.Nitride.Temporal/SetInstantFromComponentValidator.cs rename to src/MfGames.Nitride.Temporal/Validators/SetInstantFromComponentValidator.cs index afd40e0..6f5875c 100644 --- a/src/MfGames.Nitride.Temporal/SetInstantFromComponentValidator.cs +++ b/src/MfGames.Nitride.Temporal/Validators/SetInstantFromComponentValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace MfGames.Nitride.Temporal; +namespace MfGames.Nitride.Temporal.Validators; public class SetInstantFromComponentValidator : AbstractValidator> diff --git a/src/MfGames.Nitride.Temporal/SetInstantFromPathValidator.cs b/src/MfGames.Nitride.Temporal/Validators/SetInstantFromPathValidator.cs similarity index 82% rename from src/MfGames.Nitride.Temporal/SetInstantFromPathValidator.cs rename to src/MfGames.Nitride.Temporal/Validators/SetInstantFromPathValidator.cs index 450fada..8f20fd1 100644 --- a/src/MfGames.Nitride.Temporal/SetInstantFromPathValidator.cs +++ b/src/MfGames.Nitride.Temporal/Validators/SetInstantFromPathValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace MfGames.Nitride.Temporal; +namespace MfGames.Nitride.Temporal.Validators; public class SetInstantFromPathValidator : AbstractValidator { diff --git a/tests/MfGames.Nitride.Temporal.Tests/CreateDateIndexesTests.cs b/tests/MfGames.Nitride.Temporal.Tests/CreateDateIndexesTests.cs index b68b1be..333a03a 100644 --- a/tests/MfGames.Nitride.Temporal.Tests/CreateDateIndexesTests.cs +++ b/tests/MfGames.Nitride.Temporal.Tests/CreateDateIndexesTests.cs @@ -300,11 +300,11 @@ public class CreateDateIndexesTests : TemporalTestBase x.Get(), x.GetOptional() ?.Entries.Select(a => a.Get()) - .OrderBy(x => x) + .OrderBy(b => b) .ToList(), x.GetOptional() ?.Indexes.Select(a => a.Get()) - .OrderBy(x => x) + .OrderBy(b => b) .ToList())) .OrderBy(x => x.Item1) .ToList();