Push works

build.gradle.kts

@@ -1,12 +1,12 @@
 import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
-import workspace.WorkspaceUtils.purchaseArtifact
-import workspace.jbake.JBakeGhPagesPlugin
+import school.WorkspaceUtils.purchaseArtifact
+import school.jbake.JBakeGhPagesPlugin
 
 plugins { idea }
-apply<workspace.school.SchoolPlugin>()
-apply<workspace.forms.FormPlugin>()
+apply<school.school.SchoolPlugin>()
+apply<school.forms.FormPlugin>()
 apply<JBakeGhPagesPlugin>()
-apply<workspace.ai.AssistantPlugin>()
+apply<school.ai.AssistantPlugin>()
 
 purchaseArtifact()
 

buildSrc/src/main/kotlin/workspace/WorkspaceManager.kt → buildSrc/src/main/kotlin/school/WorkspaceManager.kt

@@ -1,4 +1,4 @@
-package workspace
+package school
 
 import arrow.core.Either
 import arrow.core.left
@@ -11,15 +11,15 @@ import org.eclipse.jgit.transport.PushResult
 import org.eclipse.jgit.transport.URIish
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
 import org.gradle.api.Project
-import workspace.git.WorkspaceError.FileNotFound
-import workspace.git.WorkspaceError.ParsingError
-import workspace.WorkspaceUtils.createDirectory
-import workspace.WorkspaceUtils.sep
-import workspace.WorkspaceUtils.yamlMapper
-import workspace.git.*
-import workspace.jbake.BakeConfiguration
-import workspace.jbake.JBakeGhPagesManager.copyFilesTo
-import workspace.jbake.SiteConfiguration
+import school.WorkspaceUtils.createDirectory
+import school.WorkspaceUtils.sep
+import school.WorkspaceUtils.yamlMapper
+import school.git.*
+import school.git.WorkspaceError.FileNotFound
+import school.git.WorkspaceError.ParsingError
+import school.jbake.BakeConfiguration
+import school.jbake.JBakeGhPagesManager.copyFilesTo
+import school.jbake.SiteConfiguration
 import java.io.File
 import java.io.IOException
 import java.nio.charset.StandardCharsets.UTF_8

buildSrc/src/main/kotlin/workspace/WorkspaceUtils.kt → buildSrc/src/main/kotlin/school/WorkspaceUtils.kt

@@ -1,4 +1,4 @@
-package workspace
+package school
 
 import arrow.integrations.jackson.module.registerArrowModule
 import com.fasterxml.jackson.databind.ObjectMapper

buildSrc/src/main/kotlin/workspace/ai/AssistantManager.kt → buildSrc/src/main/kotlin/school/ai/AssistantManager.kt

@@ -1,4 +1,4 @@
-package workspace.ai
+package school.ai
 
 import arrow.core.Either
 import arrow.core.Either.Companion.catch

buildSrc/src/main/kotlin/workspace/ai/AssistantPlugin.kt → buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt

@@ -1,16 +1,16 @@
-package workspace.ai
+package school.ai
 
 import arrow.core.Either.Left
 import arrow.core.Either.Right
 import dev.langchain4j.model.openai.OpenAiChatModel
 import kotlinx.coroutines.runBlocking
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import workspace.ai.AssistantManager.apiKey
-import workspace.ai.AssistantManager.createOllamaChatModel
-import workspace.ai.AssistantManager.createOllamaStreamingChatModel
-import workspace.ai.AssistantManager.generateStreamingResponse
-import workspace.ai.AssistantManager.userMessage
+import school.ai.AssistantManager.apiKey
+import school.ai.AssistantManager.createOllamaChatModel
+import school.ai.AssistantManager.createOllamaStreamingChatModel
+import school.ai.AssistantManager.generateStreamingResponse
+import school.ai.AssistantManager.userMessage
 
 class AssistantPlugin : Plugin<Project> {
 

buildSrc/src/main/kotlin/school/ai/models.kt

@@ -0,0 +1,2 @@
+package school.ai
+

buildSrc/src/main/kotlin/workspace/courses/Courses.kt → buildSrc/src/main/kotlin/school/courses/Courses.kt

@@ -1,4 +1,4 @@
-package workspace.courses
+package school.courses
 
 object Courses {
  const val JSON_FILE = "patron-formation.json"

buildSrc/src/main/kotlin/workspace/courses/CoursesManager.kt → buildSrc/src/main/kotlin/school/courses/CoursesManager.kt

@@ -1,4 +1,4 @@
-package workspace.courses
+package school.courses
 
 object CoursesManager {
 

buildSrc/src/main/kotlin/workspace/courses/CoursesPlugin.kt → buildSrc/src/main/kotlin/school/courses/CoursesPlugin.kt

@@ -1,13 +1,13 @@
-package workspace.courses
+package school.courses
 
 import com.fasterxml.jackson.module.kotlin.readValue
 import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.register
-import workspace.WorkspaceUtils.yamlMapper
-import workspace.courses.Courses.JSON_FILE
-import workspace.courses.Courses.ROOT_NODE
+import school.WorkspaceUtils.yamlMapper
+import school.courses.Courses.JSON_FILE
+import school.courses.Courses.ROOT_NODE
 import java.io.File
 
 class CoursesPlugin : Plugin<Project> {

buildSrc/src/main/kotlin/workspace/courses/models.kt → buildSrc/src/main/kotlin/school/courses/models.kt

@@ -1,4 +1,4 @@
-package workspace.courses
+package school.courses
 
 data class DirectoryStructure(
  val files: List<String> = emptyList(), val directories: Map<String, DirectoryStructure> = emptyMap()

buildSrc/src/main/kotlin/school/database/DatabaseManager.kt

@@ -0,0 +1,3 @@
+package school.database
+
+object DatabaseManager

buildSrc/src/main/kotlin/workspace/database/DatabasePlugin.kt → buildSrc/src/main/kotlin/school/database/DatabasePlugin.kt

@@ -1,4 +1,4 @@
-package workspace.database
+package school.database
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

buildSrc/src/main/kotlin/school/database/models.kt

@@ -0,0 +1,2 @@
+package school.database
+

buildSrc/src/main/kotlin/workspace/forms/FormManager.kt → buildSrc/src/main/kotlin/school/forms/FormManager.kt

@@ -1,8 +1,8 @@
-package workspace.forms
+package school.forms
 
 import org.gradle.api.Project
-import workspace.Office
-import workspace.WorkspaceManager.workspaceEither
+import school.Office
+import school.WorkspaceManager.workspaceEither
 import java.io.IOException
 import java.util.*
 

buildSrc/src/main/kotlin/workspace/forms/FormPlugin.kt → buildSrc/src/main/kotlin/school/forms/FormPlugin.kt

@@ -1,8 +1,8 @@
-package workspace.forms
+package school.forms
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import workspace.forms.FormManager.formAccessToken
+import school.forms.FormManager.formAccessToken
 
 const val CRED="/Workspace/Bibliotheque/projects/forms_generator/private/training-institut-2598582b592a.json"
 

buildSrc/src/main/kotlin/workspace/forms/GoogleFormsManager.kt → buildSrc/src/main/kotlin/school/forms/GoogleFormsManager.kt

@@ -1,3 +1,3 @@
-package workspace.forms
+package school.forms
 
 object GoogleFormsManager

buildSrc/src/main/kotlin/workspace/forms/models.kt → buildSrc/src/main/kotlin/school/forms/models.kt

@@ -1,4 +1,4 @@
-package workspace.forms
+package school.forms
 
 data class Personna(val nom: String, val prenom: String, val age: Int)
 

buildSrc/src/main/kotlin/workspace/git/datas.kt → buildSrc/src/main/kotlin/school/git/datas.kt

@@ -1,4 +1,4 @@
-package workspace.git
+package school.git
 
 import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.transport.PushResult

buildSrc/src/main/kotlin/workspace/git/models.kt → buildSrc/src/main/kotlin/school/git/models.kt

@@ -1,4 +1,4 @@
-package workspace.git
+package school.git
 
 object RepositoryInfo {
  const val ORIGIN = "origin"

buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesManager.kt → buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesManager.kt

@@ -1,13 +1,13 @@
-package workspace.jbake
+package school.jbake
 
 import org.gradle.api.Project
-import workspace.git.FileOperationResult
-import workspace.git.FileOperationResult.Failure
-import workspace.git.FileOperationResult.Success
-import workspace.git.RepositoryInfo.CNAME
-import workspace.WorkspaceManager.bakeDestDirPath
-import workspace.WorkspaceManager.localConf
-import workspace.WorkspaceUtils.sep
+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 java.io.File
 import java.nio.charset.StandardCharsets.UTF_8
 

buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesPlugin.kt → buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesPlugin.kt

@@ -1,4 +1,4 @@
-package workspace.jbake
+package school.jbake
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

buildSrc/src/main/kotlin/workspace/jbake/models.kt → buildSrc/src/main/kotlin/school/jbake/models.kt

@@ -1,6 +1,6 @@
-package workspace.jbake
+package school.jbake
 
-import workspace.git.GitPushConfiguration
+import school.git.GitPushConfiguration
 
 //object SiteInfo{}
 

buildSrc/src/main/kotlin/workspace/models.kt → buildSrc/src/main/kotlin/school/models.kt

@@ -1,4 +1,4 @@
-package workspace
+package school
 
 /**
 - Ajouter une paire clé/map au bout du chemin de clé dans un list

buildSrc/src/main/kotlin/school/projects/ProjectManager.kt

@@ -0,0 +1,3 @@
+package school.projects
+
+object ProjectManager

buildSrc/src/main/kotlin/workspace/projects/ProjectPlugin.kt → buildSrc/src/main/kotlin/school/projects/ProjectPlugin.kt

@@ -1,4 +1,4 @@
-package workspace.projects
+package school.projects
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

buildSrc/src/main/kotlin/school/projects/models.kt

@@ -0,0 +1,2 @@
+package school.projects
+

buildSrc/src/main/kotlin/workspace/school/SchoolContentManager.kt → buildSrc/src/main/kotlin/school/school/SchoolContentManager.kt

@@ -1,7 +1,7 @@
-package workspace.school
+package school.school
 
 import org.apache.poi.xwpf.usermodel.XWPFDocument
-import workspace.WorkspaceUtils
+import school.WorkspaceUtils
 import java.io.File
 import java.io.FileInputStream
 
@@ -10,7 +10,7 @@ object SchoolContentManager {
  val DOSSIER_PROFESSIONNELLE_PATH by lazy { "${WorkspaceUtils.sep}projects${WorkspaceUtils.sep}school${WorkspaceUtils.sep}rsrc${WorkspaceUtils.sep}docs${WorkspaceUtils.sep}dossier_professionnel_titre.docx" }
  fun printDossierProfessionnelle(projectDir: File) = projectDir.absolutePath
  .plus(DOSSIER_PROFESSIONNELLE_PATH)
- .apply(::printDocxStructure)
+ .apply(SchoolContentManager::printDocxStructure)
  .run(::println)
 
  @Suppress("MemberVisibilityCanBePrivate")

buildSrc/src/main/kotlin/workspace/school/SchoolOpsManager.kt → buildSrc/src/main/kotlin/school/school/SchoolOpsManager.kt

@@ -1,15 +1,16 @@
-package workspace.school
+package school.school
 
 import com.github.gradle.node.NodeExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
-import workspace.Office
-import workspace.WorkspaceManager.bakeDestDirPath
-import workspace.WorkspaceManager.isCnameExists
-import workspace.WorkspaceManager.localConf
-import workspace.WorkspaceManager.pushSiteToGhPages
-import workspace.WorkspaceManager.workspaceEither
-import workspace.WorkspaceUtils
+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 java.io.File
 import java.nio.charset.StandardCharsets.UTF_8
 
@@ -46,7 +47,7 @@ object SchoolOpsManager {
 
  fun NodeExtension.schoolFrontendDir(
  workspace: Office
- ): Unit = workspace.let(::schoolFrontendPath)
+ ): Unit = workspace.let(SchoolOpsManager::schoolFrontendPath)
  .let(::File)
  .let(nodeProjectDir::set)
 
@@ -69,10 +70,10 @@ object SchoolOpsManager {
  .let { project.nodeDirSchoolFrontend(it) }
 
  fun Project.schoolFrontendBakeDestDirPath(): () -> String =
- { "${buildDir.absolutePath}${WorkspaceUtils.sep}$bakeDestDirPath" }
+ { "${buildDir.absolutePath}$sep$bakeDestDirPath" }
 
  fun Project.schoolFrontendPathTo(): () -> String =
- { "${buildDir.absolutePath}${WorkspaceUtils.sep}${localConf.pushPage.to}" }
+ { "${buildDir.absolutePath}$sep${localConf.pushPage.to}" }
 
  fun Project.isSchoolFrontendCnameExists(
  workspace: Office
@@ -104,7 +105,7 @@ object SchoolOpsManager {
  ?.get("cname") as String?
  return when {
  cname.isNullOrBlank() -> null
- else -> "$path${WorkspaceUtils.sep}$from${WorkspaceUtils.sep}${workspace.WorkspaceManager.DNS_CNAME}"
+ else -> "$path$sep$from$sep$DNS_CNAME"
  }
  }
 

buildSrc/src/main/kotlin/workspace/school/SchoolPlugin.kt → buildSrc/src/main/kotlin/school/school/SchoolPlugin.kt

@@ -1,19 +1,19 @@
-package workspace.school
+package school.school
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.compile.JavaCompile
-import workspace.WorkspaceManager.TASK_PUBLISH_SITE
-import workspace.WorkspaceManager.initWorkspace
-import workspace.WorkspaceManager.initialConf
-import workspace.WorkspaceManager.printConf
-import workspace.WorkspaceUtils
-import workspace.WorkspaceUtils.lsWorkingDir
-import workspace.WorkspaceUtils.yamlMapper
-import workspace.school.SchoolOpsManager.fixEncodage
-import workspace.school.SchoolOpsManager.loadSchoolFrontend
-import workspace.school.SchoolOpsManager.processSchoolFrontendCnameFile
-import workspace.school.SchoolOpsManager.pushSchoolFrontendPages
+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 java.lang.System.getenv
 import java.nio.charset.StandardCharsets.UTF_8
 

buildSrc/src/main/kotlin/workspace/school/models.kt → buildSrc/src/main/kotlin/school/school/models.kt

@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-package workspace.school
+package school.school
 
 data class Formation(
  val nom: String,

buildSrc/src/main/kotlin/workspace/slides/SlidesManager.kt → buildSrc/src/main/kotlin/school/slides/SlidesManager.kt

@@ -1,11 +1,11 @@
-package workspace.slides
+package school.slides
 
 import org.gradle.api.Project
-import workspace.git.FileOperationResult
-import workspace.WorkspaceManager
-import workspace.WorkspaceManager.initAddCommitToSite
-import workspace.WorkspaceManager.localConf
-import workspace.WorkspaceManager.pushSite
+import school.git.FileOperationResult
+import school.WorkspaceManager
+import school.WorkspaceManager.initAddCommitToSite
+import school.WorkspaceManager.localConf
+import school.WorkspaceManager.pushSite
 import java.io.File
 import java.util.*
 

buildSrc/src/main/kotlin/workspace/slides/SlidesPlugin.kt → buildSrc/src/main/kotlin/school/slides/SlidesPlugin.kt

@@ -1,4 +1,4 @@
-package workspace.slides
+package school.slides
 
 import org.asciidoctor.gradle.jvm.AsciidoctorTask
 import org.gradle.api.DefaultTask
@@ -7,9 +7,9 @@ import org.gradle.api.Project
 import org.gradle.api.tasks.Exec
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.repositories
-import workspace.WorkspaceManager.printConf
-import workspace.slides.SlidesManager.deckFile
-import workspace.slides.SlidesManager.slideSrcPath
+import school.WorkspaceManager.printConf
+import school.slides.SlidesManager.deckFile
+import school.slides.SlidesManager.slideSrcPath
 import java.io.File
 
 class SlidesPlugin : Plugin<Project> {