[deploy] disable zipping of assets by default. Addresses #93.

excubo-ag · Sep 4, 2024 · 88ce3f3 · 88ce3f3
1 parent 0536164
commit 88ce3f3
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 198 deletions.
diff --git a/Tests_WebCompiler/AutoPipelineNoGzipTests.cs b/Tests_WebCompiler/AutoPipelineNoGzipTests.cs
@@ -25,7 +25,6 @@ public void CreatePipeline()
             input = "../../../TestCases/Scss/test.scss";
             output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
             expected_output = "../../../TestCases/MinCss/test.min.css";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/AutoPipelineRealCompileOnlyTests.cs b/Tests_WebCompiler/AutoPipelineRealCompileOnlyTests.cs
@@ -21,7 +21,6 @@ public void CreatePipeline()
             input = "../../../TestCases/Scss/site.scss";
             output_files = new List<string> { "../../../TestCases/Scss/site.css" };
             expected_output = "../../../TestCases/Css/site.css";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/AutoPipelineRealJustZipTests.cs b/Tests_WebCompiler/AutoPipelineRealJustZipTests.cs
@@ -25,7 +25,6 @@ public void CreatePipeline()
             input = "../../../TestCases/MinCss/site.min.css";
             output_files = new List<string> { "../../../TestCases/MinCss/site.min.css.gz" };
             expected_output = "../../../TestCases/GzCss/site.min.css.gz";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/AutoPipelineRealNoGzipTests.cs b/Tests_WebCompiler/AutoPipelineRealNoGzipTests.cs
@@ -20,7 +20,6 @@ public void CreatePipeline()
             input = "../../../TestCases/Scss/site.scss";
             output_files = new List<string> { "../../../TestCases/Scss/site.css", "../../../TestCases/Scss/site.min.css" };
             expected_output = "../../../TestCases/MinCss/site.min.css";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/AutoPipelineRealTests.cs b/Tests_WebCompiler/AutoPipelineRealTests.cs
@@ -25,7 +25,6 @@ public void CreatePipeline()
             input = "../../../TestCases/Scss/site.scss";
             output_files = new List<string> { "../../../TestCases/Scss/site.css", "../../../TestCases/Scss/site.min.css", "../../../TestCases/Scss/site.min.css.gz" };
             expected_output = "../../../TestCases/GzCss/site.min.css.gz";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/AutoPipelineScssTests.cs b/Tests_WebCompiler/AutoPipelineScssTests.cs
@@ -25,7 +25,6 @@ public void CreatePipeline()
             input = "../../../TestCases/Scss/test.scss";
             output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css", "../../../TestCases/Scss/test.min.css.gz" };
             expected_output = "../../../TestCases/GzCss/test.min.css.gz";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/CompileMinifyTests.cs b/Tests_WebCompiler/CompileMinifyTests.cs
@@ -19,7 +19,6 @@ public void CreatePipeline()
             input = "../../../TestCases/Scss/test.scss";
             output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
             expected_output = "../../../TestCases/MinCss/test.min.css";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/CompileMinifyZipMoveCleanupTests.cs b/Tests_WebCompiler/CompileMinifyZipMoveCleanupTests.cs
@@ -16,12 +16,10 @@ public void CreatePipeline()
                 .Then(new CssAutoprefixer(new CssAutoprefixSettings()))
                 .Then(new CssMinifier(new CssMinifySettings { TermSemicolons = false }))
                 .Then(new Zipper())
-                .Then(new Place("../../../TestCases/", "../../../TestCases/Scss/"))
                 .Then(new Cleaner());
             input = "../../../TestCases/Scss/test.scss";
-            output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/test.min.css.gz" };
+            output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css.gz" };
             expected_output = "../../../TestCases/GzCss/test.min.css.gz";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/MinifyTests.cs b/Tests_WebCompiler/MinifyTests.cs
@@ -18,7 +18,6 @@ public void CreatePipeline()
             input = "../../../TestCases/Css/test.css";
             output_files = new List<string> { "../../../TestCases/Css/test.min.css" };
             expected_output = "../../../TestCases/MinCss/test.min.css";
-            DeleteOutputFiles();
         }
         [Test]
         public void CallTest() => Test();

diff --git a/Tests_WebCompiler/TestsBase.cs b/Tests_WebCompiler/TestsBase.cs
@@ -13,10 +13,31 @@ public class TestsBase
     {
         protected Func<string, CompilationStep> pipeline;
         protected string input;
+        protected List<string> input_files;
         protected List<string> output_files;
         protected List<string> unexpected_files;
+        protected List<string> temporary_files;
         protected string expected_output;
         [TearDown]
+        protected void DeleteTestCreatedFiles()
+        {
+            DeleteTemporaryFiles();
+            DeleteOutputFiles();
+            var generated_files = output_files?.Concat(temporary_files ?? Enumerable.Empty<string>()).ToList() ?? new List<string>();
+            var dirs = generated_files.Select(Path.GetDirectoryName).Select(Path.GetFullPath).ToList();
+            var input_dirs = (input_files ?? Enumerable.Empty<string>()).Append(input).Select(Path.GetDirectoryName).Where(d => d != null).Select(Path.GetFullPath).ToList();
+            foreach (var dir in dirs.OrderByDescending(d => d.Count(c => c == '\\' || c == '/')))
+            {
+                if (input_dirs.Any(dir.StartsWith))
+                {
+                    continue;
+                }
+                if (Directory.Exists(dir))
+                {
+                    Directory.Delete(dir); 
+                }
+            }
+        }
         protected void DeleteOutputFiles()
         {
             if (output_files == null)
@@ -31,6 +52,20 @@ protected void DeleteOutputFiles()
                 }
             }
         }
+        protected void DeleteTemporaryFiles()
+        {
+            if (temporary_files == null)
+            {
+                return;
+            }
+            foreach (var tmp_file in temporary_files)
+            {
+                if (File.Exists(tmp_file))
+                {
+                    File.Delete(tmp_file);
+                }
+            }
+        }
         protected void Test()
         {
             var timestamp = ProcessFile();