Refactor

Author: ErikSchierboom

generators.new/CanonicalData.cs

@@ -21,23 +21,7 @@ internal static class CanonicalData
 {
     private static readonly JsonSerializerOptions SerializerOptions = new() { PropertyNameCaseInsensitive = true };
 
-    static CanonicalData()
-    {
-        CloneProbSpecsRepo();
-        UpdateProbSpecsRepo();
-    }
-
-    private static void CloneProbSpecsRepo()
-    {
-        if (!Directory.Exists(Paths.ProbSpecsDir))
-            Repository.Clone("https://github.com/exercism/problem-specifications.git", Paths.ProbSpecsDir);
-    }
-
-    private static void UpdateProbSpecsRepo()
-    {
-        using var repo = new Repository(Paths.ProbSpecsDir);
-        Commands.Pull(repo, new Signature("Exercism", "[email protected]", DateTimeOffset.Now), new PullOptions());
-    }
+    static CanonicalData() => ProbSpecs.Sync();
 
     internal static TestCase[] Parse(Exercise exercise) =>
         Parse(JsonNode.Parse(File.ReadAllText(Paths.CanonicalDataFile(exercise)))!.AsObject(), ImmutableQueue<string>.Empty)
@@ -69,4 +53,26 @@ private static TestCase ToTestCase(JsonObject testCaseJson, IEnumerable<string>
 
         return null;
     }
-}
+    
+    private static class ProbSpecs
+    {
+        internal static void Sync()
+        {
+            Clone();
+            Pull();
+        }
+
+        private static void Clone()
+        {
+            if (!Directory.Exists(Paths.ProbSpecsDir))
+                Repository.Clone("https://github.com/exercism/problem-specifications.git", Paths.ProbSpecsDir);
+        }
+
+        private static void Pull()
+        {
+            using var repo = new Repository(Paths.ProbSpecsDir);
+            Commands.Pull(repo, new Signature("Exercism", "[email protected]", DateTimeOffset.Now), new PullOptions());
+        }
+    }
+}
+

generators.new/ExerciseFinder.cs renamed to generators.new/Exercises.cs

@@ -4,7 +4,7 @@ namespace Generators;
 
 internal record Exercise(string Slug, string Name);
 
-internal static class ExerciseFinder
+internal static class Exercises
 {
     internal static Exercise[] TemplatedExercises(string? slug) =>
         slug is null ? TemplatedExercises() : [TemplatedExercise(slug)];

generators.new/CodeFormatter.cs renamed to generators.new/Formatting.cs

@@ -4,7 +4,7 @@
 
 namespace Generators;
 
-internal static class CodeFormatter
+internal static class Formatting
 {
     private static readonly AdhocWorkspace AdhocWorkspace = new();
 

generators.new/Program.cs

@@ -14,7 +14,7 @@ static void Main(string[] args) =>
         Parser.Default.ParseArguments<Options>(args)
             .WithParsed(options =>
             {
-                foreach (var exercise in ExerciseFinder.TemplatedExercises(options.Exercise))
-                    TestGenerator.GenerateTestsFromTemplate(exercise);
+                foreach (var exercise in Exercises.TemplatedExercises(options.Exercise))
+                    TestGenerator.GenerateTests(exercise);
             });
 }

generators.new/TemplateRenderer.cs renamed to generators.new/Templates.cs

@@ -10,11 +10,11 @@
 
 namespace Generators;
 
-internal static class TemplateRenderer
+internal static class Templates
 {
     private static readonly IHandlebars HandlebarsContext = Handlebars.Create();
 
-    static TemplateRenderer()
+    static Templates()
     {
         HandlebarsHelpers.Register(HandlebarsContext);
         HandlebarsContext.RegisterHelper("method_name", (writer, context, parameters) =>

generators.new/TestsToml.cs renamed to generators.new/TestCaseConfiguration.cs

@@ -3,7 +3,7 @@
 
 namespace Generators;
 
-internal static class TestsToml
+internal static class TestCaseConfiguration
 {
     internal static HashSet<string> ExcludedTestCaseIds(Exercise exercise) =>
         Toml.ToModel(File.ReadAllText(Paths.TestsTomlFile(exercise)))

generators.new/TestGenerator.cs

@@ -2,18 +2,18 @@ namespace Generators;
 
 internal static class TestGenerator
 {
-    internal static void GenerateTestsFromTemplate(Exercise exercise)
+    internal static void GenerateTests(Exercise exercise)
     {
         Console.WriteLine($"{exercise.Slug}: generating tests...");
 
-        var excludedTestCaseIds = TestsToml.ExcludedTestCaseIds(exercise);
+        var excludedTestCaseIds = TestCaseConfiguration.ExcludedTestCaseIds(exercise);
         var testCases = CanonicalData.Parse(exercise)
             .Where(testCase => !excludedTestCaseIds.Contains(testCase.Uuid))
             .ToArray();
 
         var transformedTestCases = TestCaseTransformer.Transform(exercise, testCases);
 
-        var renderedTests = TemplateRenderer.RenderTests(exercise, transformedTestCases);
-        File.WriteAllText(Paths.TestsFile(exercise), CodeFormatter.FormatCode(renderedTests));
+        var renderedTests = Templates.RenderTests(exercise, transformedTestCases);
+        File.WriteAllText(Paths.TestsFile(exercise), Formatting.FormatCode(renderedTests));
     }
 }