Fix tests

sake92 · Nov 30, 2023 · 9885c52 · 9885c52
1 parent daeda57
commit 9885c52
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -3,3 +3,6 @@ version = "3.6.1"
 project.git = true
 
 runner.dialect = scala213
+
+maxColumn = 120
+
diff --git a/.../simple/renderables/src/MultiRendEx.scala → ...e/renderables/src/files/MultiRendEx.scala b/.../simple/renderables/src/MultiRendEx.scala → ...e/renderables/src/files/MultiRendEx.scala
@@ -1,4 +1,4 @@
-package ex2
+package files.ex2
 
 import java.nio.file.Paths
 import scala.jdk.CollectionConverters._
@@ -18,7 +18,7 @@ object MultiRendEx extends MultiRenderable {
 class MultiRendExTemplate(num: Int) extends Renderable {
 
   override def relPath =
-    Paths.get(s"multi_rend_ex_${num}.txt")
+    Paths.get(s"files/multi_rend_ex_${num}.txt")
 
   override def render =
     s"MultiRendEx content content ${num}"

diff --git a/...t/src/simple/renderables/src/RendEx.scala → ...simple/renderables/src/files/RendEx.scala b/...t/src/simple/renderables/src/RendEx.scala → ...simple/renderables/src/files/RendEx.scala
@@ -6,7 +6,7 @@ import ba.sake.hepek.core.Renderable
 object RendEx extends Renderable {
 
   override def relPath =
-    Paths.get("rend_ex.txt")
+    Paths.get("files/rend_ex.txt")
 
   override def render =
     "RendEx content"

diff --git a/plugin/src/ba/sake/millhepek/MillHepekModule.scala b/plugin/src/ba/sake/millhepek/MillHepekModule.scala
@@ -22,29 +22,23 @@ trait MillHepekModule extends JavaModule {
   }
 
   def hepek = T {
-
-    // generate hepek files
     // scala ~requires all classes/objects to have a package
     // so we arbitrarily choose the "files" toplevel package..
+
+    // generate hepek files
     val hepekGenerateFolder = hepekGenerate().path
-    val hepekGenerateFilesFolder = os
-      .list(hepekGenerateFolder)
-      .find(f =>
-        os.isDir(f) && f
-          .relativeTo(hepekGenerateFolder)
-          .startsWith(os.RelPath("files"))
-      )
-      .toSeq
+    val hepekGenerateFilesFolder =
+      os.list(hepekGenerateFolder)
+        .find(f => os.isDir(f) && f.relativeTo(hepekGenerateFolder).startsWith(os.RelPath("files")))
+        .toSeq
 
     // collect resources/public folders
     val publicFolders = resources()
-      .filter(r => os.exists(r.path))
-      .flatMap(r =>
+      .filter(r => os.isDir(r.path) && os.exists(r.path))
+      .flatMap { r =>
         os.list(r.path)
-          .filter(f =>
-            os.isDir(f) && f.relativeTo(r.path).startsWith(os.RelPath("public"))
-          )
-      )
+          .filter(f => os.isDir(f) && f.relativeTo(r.path).startsWith(os.RelPath("public")))
+      }
 
     val destFolder = millSourcePath / "hepek_output"
     val allFolders = publicFolders ++ hepekGenerateFilesFolder