Push works

cccp-education · Sep 24, 2024 · bc0e0b9 · bc0e0b9
1 parent f621a4a
commit bc0e0b9
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 58 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
-import school.WorkspaceUtils.purchaseArtifact
+import school.workspace.WorkspaceUtils.purchaseArtifact
 import school.jbake.JBakeGhPagesPlugin
 
 plugins { idea }
-apply<school.school.SchoolPlugin>()
+apply<school.frontend.SchoolPlugin>()
 apply<school.forms.FormPlugin>()
 apply<JBakeGhPagesPlugin>()
 apply<school.ai.AssistantPlugin>()

diff --git a/...kotlin/workspace/PluginFunctionalTests.kt → ...st/kotlin/school/PluginFunctionalTests.kt b/...kotlin/workspace/PluginFunctionalTests.kt → ...st/kotlin/school/PluginFunctionalTests.kt
@@ -1,6 +1,6 @@
 @file:Suppress("FunctionName")
 
-package workspace
+package school
 
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.jupiter.api.io.TempDir

diff --git a/buildSrc/src/main/kotlin/school/backoffice/BackofficePlugin.kt b/buildSrc/src/main/kotlin/school/backoffice/BackofficePlugin.kt
@@ -0,0 +1,4 @@
+package school.backoffice
+
+class BackofficePlugin {
+}
diff --git a/...lin/school/school/SchoolContentManager.kt → ...in/school/content/SchoolContentManager.kt b/...lin/school/school/SchoolContentManager.kt → ...in/school/content/SchoolContentManager.kt
@@ -1,7 +1,7 @@
-package school.school
+package school.content
 
 import org.apache.poi.xwpf.usermodel.XWPFDocument
-import school.WorkspaceUtils
+import school.workspace.WorkspaceUtils
 import java.io.File
 import java.io.FileInputStream
 

diff --git a/...c/src/main/kotlin/school/school/models.kt → .../src/main/kotlin/school/content/models.kt b/...c/src/main/kotlin/school/school/models.kt → .../src/main/kotlin/school/content/models.kt
@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-package school.school
+package school.content
 
 data class Formation(
     val nom: String,

diff --git a/buildSrc/src/main/kotlin/school/courses/CoursesPlugin.kt b/buildSrc/src/main/kotlin/school/courses/CoursesPlugin.kt
@@ -5,7 +5,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.register
-import school.WorkspaceUtils.yamlMapper
+import school.workspace.WorkspaceUtils.yamlMapper
 import school.courses.Courses.JSON_FILE
 import school.courses.Courses.ROOT_NODE
 import java.io.File

diff --git a/buildSrc/src/main/kotlin/school/forms/FormManager.kt b/buildSrc/src/main/kotlin/school/forms/FormManager.kt
@@ -1,8 +1,8 @@
 package school.forms
 
 import org.gradle.api.Project
-import school.Office
-import school.WorkspaceManager.workspaceEither
+import school.workspace.Office
+import school.workspace.WorkspaceManager.workspaceEither
 import java.io.IOException
 import java.util.*
 

diff --git a/.../kotlin/school/school/SchoolOpsManager.kt → ...otlin/school/frontend/SchoolOpsManager.kt b/.../kotlin/school/school/SchoolOpsManager.kt → ...otlin/school/frontend/SchoolOpsManager.kt
@@ -1,16 +1,16 @@
-package school.school
+package school.frontend
 
 import com.github.gradle.node.NodeExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
-import school.Office
-import school.WorkspaceManager.DNS_CNAME
-import school.WorkspaceManager.bakeDestDirPath
-import school.WorkspaceManager.isCnameExists
-import school.WorkspaceManager.localConf
-import school.WorkspaceManager.pushSiteToGhPages
-import school.WorkspaceManager.workspaceEither
-import school.WorkspaceUtils.sep
+import school.workspace.Office
+import school.workspace.WorkspaceManager.DNS_CNAME
+import school.workspace.WorkspaceManager.bakeDestDirPath
+import school.workspace.WorkspaceManager.isCnameExists
+import school.workspace.WorkspaceManager.localConf
+import school.workspace.WorkspaceManager.pushSiteToGhPages
+import school.workspace.WorkspaceManager.workspaceEither
+import school.workspace.WorkspaceUtils.sep
 import java.io.File
 import java.nio.charset.StandardCharsets.UTF_8
 

diff --git a/...main/kotlin/school/school/SchoolPlugin.kt → ...in/kotlin/school/frontend/SchoolPlugin.kt b/...main/kotlin/school/school/SchoolPlugin.kt → ...in/kotlin/school/frontend/SchoolPlugin.kt
@@ -1,19 +1,21 @@
-package school.school
+package school.frontend
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.compile.JavaCompile
-import school.WorkspaceManager.TASK_PUBLISH_SITE
-import school.WorkspaceManager.initWorkspace
-import school.WorkspaceManager.initialConf
-import school.WorkspaceManager.printConf
-import school.WorkspaceUtils
-import school.WorkspaceUtils.lsWorkingDir
-import school.WorkspaceUtils.yamlMapper
-import school.school.SchoolOpsManager.fixEncodage
-import school.school.SchoolOpsManager.loadSchoolFrontend
-import school.school.SchoolOpsManager.processSchoolFrontendCnameFile
-import school.school.SchoolOpsManager.pushSchoolFrontendPages
+import school.workspace.WorkspaceManager.TASK_PUBLISH_SITE
+import school.workspace.WorkspaceManager.initWorkspace
+import school.workspace.WorkspaceManager.initialConf
+import school.workspace.WorkspaceManager.printConf
+import school.workspace.WorkspaceUtils
+import school.workspace.WorkspaceUtils.lsWorkingDir
+import school.workspace.WorkspaceUtils.yamlMapper
+import school.content.SPG
+import school.content.SchoolContentManager
+import school.frontend.SchoolOpsManager.fixEncodage
+import school.frontend.SchoolOpsManager.loadSchoolFrontend
+import school.frontend.SchoolOpsManager.processSchoolFrontendCnameFile
+import school.frontend.SchoolOpsManager.pushSchoolFrontendPages
 import java.lang.System.getenv
 import java.nio.charset.StandardCharsets.UTF_8
 

diff --git a/buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesManager.kt b/buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesManager.kt
@@ -5,9 +5,9 @@ import school.git.FileOperationResult
 import school.git.FileOperationResult.Failure
 import school.git.FileOperationResult.Success
 import school.git.RepositoryInfo.CNAME
-import school.WorkspaceManager.bakeDestDirPath
-import school.WorkspaceManager.localConf
-import school.WorkspaceUtils.sep
+import school.workspace.WorkspaceManager.bakeDestDirPath
+import school.workspace.WorkspaceManager.localConf
+import school.workspace.WorkspaceUtils.sep
 import java.io.File
 import java.nio.charset.StandardCharsets.UTF_8
 

diff --git a/buildSrc/src/main/kotlin/school/moodle/MoodlePlugin.kt b/buildSrc/src/main/kotlin/school/moodle/MoodlePlugin.kt
@@ -0,0 +1,4 @@
+package school.moodle
+
+class MoodlePlugin {
+}
diff --git a/buildSrc/src/main/kotlin/school/slides/SlidesManager.kt b/buildSrc/src/main/kotlin/school/slides/SlidesManager.kt
@@ -2,10 +2,10 @@ package school.slides
 
 import org.gradle.api.Project
 import school.git.FileOperationResult
-import school.WorkspaceManager
-import school.WorkspaceManager.initAddCommitToSite
-import school.WorkspaceManager.localConf
-import school.WorkspaceManager.pushSite
+import school.workspace.WorkspaceManager
+import school.workspace.WorkspaceManager.initAddCommitToSite
+import school.workspace.WorkspaceManager.localConf
+import school.workspace.WorkspaceManager.pushSite
 import java.io.File
 import java.util.*
 

diff --git a/buildSrc/src/main/kotlin/school/slides/SlidesPlugin.kt b/buildSrc/src/main/kotlin/school/slides/SlidesPlugin.kt
@@ -7,7 +7,7 @@ import org.gradle.api.Project
 import org.gradle.api.tasks.Exec
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.repositories
-import school.WorkspaceManager.printConf
+import school.workspace.WorkspaceManager.printConf
 import school.slides.SlidesManager.deckFile
 import school.slides.SlidesManager.slideSrcPath
 import java.io.File

diff --git a/...rc/main/kotlin/school/WorkspaceManager.kt → ...tlin/school/workspace/WorkspaceManager.kt b/...rc/main/kotlin/school/WorkspaceManager.kt → ...tlin/school/workspace/WorkspaceManager.kt
@@ -1,4 +1,4 @@
-package school
+package school.workspace
 
 import arrow.core.Either
 import arrow.core.left
@@ -11,9 +11,9 @@ import org.eclipse.jgit.transport.PushResult
 import org.eclipse.jgit.transport.URIish
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
 import org.gradle.api.Project
-import school.WorkspaceUtils.createDirectory
-import school.WorkspaceUtils.sep
-import school.WorkspaceUtils.yamlMapper
+import school.workspace.WorkspaceUtils.createDirectory
+import school.workspace.WorkspaceUtils.sep
+import school.workspace.WorkspaceUtils.yamlMapper
 import school.git.*
 import school.git.WorkspaceError.FileNotFound
 import school.git.WorkspaceError.ParsingError

diff --git a/.../src/main/kotlin/school/WorkspaceUtils.kt → ...kotlin/school/workspace/WorkspaceUtils.kt b/.../src/main/kotlin/school/WorkspaceUtils.kt → ...kotlin/school/workspace/WorkspaceUtils.kt
@@ -1,4 +1,4 @@
-package school
+package school.workspace
 
 import arrow.integrations.jackson.module.registerArrowModule
 import com.fasterxml.jackson.databind.ObjectMapper

diff --git a/buildSrc/src/main/kotlin/school/models.kt → ...rc/main/kotlin/school/workspace/models.kt b/buildSrc/src/main/kotlin/school/models.kt → ...rc/main/kotlin/school/workspace/models.kt
@@ -1,4 +1,4 @@
-package school
+package school.workspace
 
 /**
 - Ajouter une paire clé/map au bout du chemin de clé dans un list

diff --git a/.../src/test/kotlin/workspace/PluginTests.kt → ...Src/src/test/kotlin/school/PluginTests.kt b/.../src/test/kotlin/workspace/PluginTests.kt → ...Src/src/test/kotlin/school/PluginTests.kt
@@ -1,14 +1,14 @@
-package workspace
+package school
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.testfixtures.ProjectBuilder
-import school.Office
-import school.OfficeEntry
 import school.forms.FormPlugin
 import school.jbake.JBakeGhPagesPlugin
-import school.school.SchoolPlugin
-import school.school.SchoolPlugin.Companion.TASK_HELLO
+import school.frontend.SchoolPlugin
+import school.frontend.SchoolPlugin.Companion.TASK_HELLO
+import school.workspace.Office
+import school.workspace.OfficeEntry
 import java.io.ByteArrayOutputStream
 import java.io.PrintStream
 import java.lang.System.out

diff --git a/formation/build.gradle.kts b/formation/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.asciidoctor.gradle.jvm.slides.AsciidoctorJRevealJSTask
-import school.WorkspaceManager.GROUP_TASK_SITE
-import school.WorkspaceManager.TASK_BAKE_SITE
-import school.WorkspaceManager.TASK_PUBLISH_SITE
-import school.WorkspaceManager.bakeDestDirPath
-import school.WorkspaceManager.bakeSrcPath
-import school.WorkspaceManager.pushSiteToGhPages
-import school.WorkspaceUtils.sep
+import school.workspace.WorkspaceManager.GROUP_TASK_SITE
+import school.workspace.WorkspaceManager.TASK_BAKE_SITE
+import school.workspace.WorkspaceManager.TASK_PUBLISH_SITE
+import school.workspace.WorkspaceManager.bakeDestDirPath
+import school.workspace.WorkspaceManager.bakeSrcPath
+import school.workspace.WorkspaceManager.pushSiteToGhPages
+import school.workspace.WorkspaceUtils.sep
 import school.jbake.JBakeGhPagesManager.createCnameFile
 import school.jbake.JBakeGhPagesManager.sitePushDestPath
 import school.jbake.JBakeGhPagesManager.sitePushPathTo

diff --git a/school-gradle-plugin/build.gradle.kts b/school-gradle-plugin/build.gradle.kts
@@ -1,11 +1,11 @@
-import school.WorkspaceUtils.purchaseArtifact
+import school.workspace.WorkspaceUtils.purchaseArtifact
 
 plugins {
     id("com.github.node-gradle.node")
     id("com.avast.gradle.docker-compose")
 }
 
-apply<school.school.SchoolPlugin>()
+apply<school.frontend.SchoolPlugin>()
 apply<school.forms.FormPlugin>()
 
 purchaseArtifact()