scalacenter · eloots · Oct 12, 2023 · Oct 11, 2023 · Oct 12, 2023 · Oct 12, 2023
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,8 +52,8 @@ jobs:
       - name: Package Binaries
         run: |
           mkdir -p course-management-tools-bin/bin
-          ./coursier bootstrap com.lunatech:cmta_3:${{ env.RELEASE_VERSION }} -o course-management-tools-bin/bin/cmta --standalone --bat
-          ./coursier bootstrap com.lunatech:cmtc_3:${{ env.RELEASE_VERSION }} -o course-management-tools-bin/bin/cmtc --standalone --bat
+          ./coursier bootstrap ch.epfl.scala:cmta_3:${{ env.RELEASE_VERSION }} -o course-management-tools-bin/bin/cmta --standalone --bat
+          ./coursier bootstrap ch.epfl.scala:cmtc_3:${{ env.RELEASE_VERSION }} -o course-management-tools-bin/bin/cmtc --standalone --bat
           zip -r course-management-tools.zip course-management-tools-bin
 
       - name: Upload artefacts

diff --git a/build.sbt b/build.sbt
@@ -2,10 +2,10 @@ import Build.*
 
 inThisBuild(
   List(
-    organization := "com.lunatech",
-    organizationName := "Lunatech",
-    organizationHomepage := Some(url("https://lunatech.com")),
-    homepage := Some(url("https://cmt.lunatech.com")),
+    organization := "ch.epfl.scala",
+    organizationName := "Scala Center",
+    organizationHomepage := Some(url("https://scala.epfl.ch")),
+    homepage := Some(url("https://scala.epfl.ch")),
     developers := List(Developer("eloots", "Eric Loots", "eric.loots@lunatech.com", url("https://github.com/eloots"))),
     licenses := Seq("Apache-2.0" -> url("http://www.apache.org/license/LICENSE-2.0"))))
 
@@ -32,7 +32,7 @@ lazy val cmta = project
   .dependsOn(`cmt-core`, `cmt-core` % "test->test")
   .settings(commonSettings: _*)
   .settings(nativeImageSettings: _*)
-  .settings(Compile / mainClass := Some("com.lunatech.cmt.admin.Main"))
+  .settings(Compile / mainClass := Some("coursemgmttools.admin.Main"))
   .settings(buildInfoKeys := buildKeysWithName("cmta:Course Management Tools (Admin)"))
 
 lazy val cmtc = project
@@ -43,7 +43,7 @@ lazy val cmtc = project
   .settings(commonSettings: _*)
   .settings(nativeImageSettings: _*)
   .settings(libraryDependencies ++= Dependencies.cmtcDependencies)
-  .settings(Compile / mainClass := Some("com.lunatech.cmt.client.Main"))
+  .settings(Compile / mainClass := Some("coursemgmttools.client.Main"))
   .settings(buildInfoKeys := buildKeysWithName("Course Management Tools (Client)"))
 
 lazy val `functional-tests` = project

diff --git a/cmt-core/src/main/scala/com/lunatech/cmt/client/command/Executable.scala b/cmt-core/src/main/scala/com/lunatech/cmt/client/command/Executable.scala
diff --git a/...n/scala/com/lunatech/cmt/CMTaConfig.scala → ...in/scala/coursemgmttools/CMTaConfig.scala b/...n/scala/com/lunatech/cmt/CMTaConfig.scala → ...in/scala/coursemgmttools/CMTaConfig.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *

diff --git a/...n/scala/com/lunatech/cmt/CMTcConfig.scala → ...in/scala/coursemgmttools/CMTcConfig.scala b/...n/scala/com/lunatech/cmt/CMTcConfig.scala → ...in/scala/coursemgmttools/CMTcConfig.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *

diff --git a/...a/com/lunatech/cmt/ConsoleFunctions.scala → ...la/coursemgmttools/ConsoleFunctions.scala b/...a/com/lunatech/cmt/ConsoleFunctions.scala → ...la/coursemgmttools/ConsoleFunctions.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *

diff --git a/.../main/scala/com/lunatech/cmt/Domain.scala → ...c/main/scala/coursemgmttools/Domain.scala b/.../main/scala/com/lunatech/cmt/Domain.scala → ...c/main/scala/coursemgmttools/Domain.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 import sbt.io.syntax.{File, file}
 

diff --git a/...c/main/scala/com/lunatech/cmt/Error.scala → ...rc/main/scala/coursemgmttools/Error.scala b/...c/main/scala/com/lunatech/cmt/Error.scala → ...rc/main/scala/coursemgmttools/Error.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 sealed trait CmtError {
   def prettyPrint: String

diff --git a/...a/com/lunatech/cmt/ExerciseMetadata.scala → ...la/coursemgmttools/ExerciseMetadata.scala b/...a/com/lunatech/cmt/ExerciseMetadata.scala → ...la/coursemgmttools/ExerciseMetadata.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 import java.util.Map.Entry
 import scala.jdk.CollectionConverters.*

diff --git a/...main/scala/com/lunatech/cmt/Filters.scala → .../main/scala/coursemgmttools/Filters.scala b/...main/scala/com/lunatech/cmt/Filters.scala → .../main/scala/coursemgmttools/Filters.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *

diff --git a/...main/scala/com/lunatech/cmt/Helpers.scala → .../main/scala/coursemgmttools/Helpers.scala b/...main/scala/com/lunatech/cmt/Helpers.scala → .../main/scala/coursemgmttools/Helpers.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *
@@ -13,9 +13,9 @@ package com.lunatech.cmt
   * See the License for the specific language governing permissions and limitations under the License.
   */
 
-import com.lunatech.cmt.ProcessDSL.ProcessCmd
-import com.lunatech.cmt.core.GeneratorInfo
-import com.lunatech.cmt.core.command.Package.*
+import coursemgmttools.ProcessDSL.ProcessCmd
+import coursemgmttools.core.GeneratorInfo
+import coursemgmttools.core.command.Package.*
 import com.typesafe.config.{ConfigFactory, ConfigRenderOptions}
 import sbt.io.IO as sbtio
 import sbt.io.syntax.*

diff --git a/...n/scala/com/lunatech/cmt/ProcessDSL.scala → ...in/scala/coursemgmttools/ProcessDSL.scala b/...n/scala/com/lunatech/cmt/ProcessDSL.scala → ...in/scala/coursemgmttools/ProcessDSL.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *
@@ -13,9 +13,9 @@ package com.lunatech.cmt
   * See the License for the specific language governing permissions and limitations under the License.
   */
 
-import com.lunatech.cmt.toExecuteCommandErrorMessage
+import coursemgmttools.toExecuteCommandErrorMessage
 import sbt.io.syntax.*
-import com.lunatech.cmt.Helpers.ignoreProcessStdOutStdErr
+import coursemgmttools.Helpers.ignoreProcessStdOutStdErr
 
 import scala.sys.process.Process
 import scala.util.{Failure, Success, Try}

diff --git a/.../scala/com/lunatech/cmt/Releasables.scala → ...n/scala/coursemgmttools/Releasables.scala b/.../scala/com/lunatech/cmt/Releasables.scala → ...n/scala/coursemgmttools/Releasables.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 import sbt.io.IO as sbtio
 import sbt.io.syntax.*

diff --git a/.../scala/com/lunatech/cmt/Validations.scala → ...n/scala/coursemgmttools/Validations.scala b/.../scala/com/lunatech/cmt/Validations.scala → ...n/scala/coursemgmttools/Validations.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt
+package coursemgmttools
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *
@@ -13,7 +13,7 @@ package com.lunatech.cmt
   * See the License for the specific language governing permissions and limitations under the License.
   */
 
-//import com.lunatech.cmt.{FileValidations, IntValidations, StringValidations}
+//import coursemgmttools.{FileValidations, IntValidations, StringValidations}
 import sbt.io.syntax.File
 
 object ValidationExtensions:

diff --git a/...m/lunatech/cmt/client/Configuration.scala → ...oursemgmttools/client/Configuration.scala b/...m/lunatech/cmt/client/Configuration.scala → ...oursemgmttools/client/Configuration.scala
@@ -1,9 +1,9 @@
-package com.lunatech.cmt.client
+package coursemgmttools.client
 
-import com.lunatech.cmt.Helpers.{adaptToNixSeparatorChar, adaptToOSSeparatorChar}
-import com.lunatech.cmt.client.Configuration.*
-import com.lunatech.cmt.Domain.StudentifiedRepo
-import com.lunatech.cmt.{CmtError, FailedToWriteGlobalConfiguration, printMessage}
+import coursemgmttools.Helpers.{adaptToNixSeparatorChar, adaptToOSSeparatorChar}
+import coursemgmttools.client.Configuration.*
+import coursemgmttools.Domain.StudentifiedRepo
+import coursemgmttools.{CmtError, FailedToWriteGlobalConfiguration, printMessage}
 import com.typesafe.config.{Config, ConfigFactory}
 import dev.dirs.ProjectDirectories
 import sbt.io.IO.*
@@ -46,7 +46,7 @@ object Configuration:
 
   private val projectDirectories = ProjectDirectories.from("com", "lunatech", "cmt")
   val UserConfigDir = projectDirectories.configDir
-  val CmtGlobalConfigName = "com.lunatech.cmt.conf"
+  val CmtGlobalConfigName = "coursemgmttools.conf"
   val CoursesDirectoryToken = "COURSES_DIRECTORY"
   val CurrentCourseToken = "CURRENT_COURSE"
   val CmtHomeEnvKey = "CMT_HOME"

diff --git a/...lunatech/cmt/client/cli/CmtcCommand.scala → ...rsemgmttools/client/cli/CmtcCommand.scala b/...lunatech/cmt/client/cli/CmtcCommand.scala → ...rsemgmttools/client/cli/CmtcCommand.scala
@@ -1,11 +1,11 @@
-package com.lunatech.cmt.client.cli
+package coursemgmttools.client.cli
 
 import caseapp.core.help.Help
 import caseapp.core.parser.Parser
 import cats.syntax.either.*
-import com.lunatech.cmt.client.Configuration
-import com.lunatech.cmt.core.cli.CmtCommand
-import com.lunatech.cmt.printErrorAndExit
+import coursemgmttools.client.Configuration
+import coursemgmttools.core.cli.CmtCommand
+import coursemgmttools.printErrorAndExit
 
 abstract class CmtcCommand[T](using parser: Parser[T], help: Help[T]) extends CmtCommand[T] {
 

diff --git a/cmt-core/src/main/scala/coursemgmttools/client/command/Executable.scala b/cmt-core/src/main/scala/coursemgmttools/client/command/Executable.scala
@@ -0,0 +1,7 @@
+package coursemgmttools.client.command
+
+import coursemgmttools.CmtError
+import coursemgmttools.client.Configuration
+
+trait Executable[T]:
+  extension (t: T) def execute(configuration: Configuration): Either[CmtError, String]
diff --git a/...com/lunatech/cmt/core/GeneratorInfo.scala → .../coursemgmttools/core/GeneratorInfo.scala b/...com/lunatech/cmt/core/GeneratorInfo.scala → .../coursemgmttools/core/GeneratorInfo.scala
@@ -1,3 +1,3 @@
-package com.lunatech.cmt.core
+package coursemgmttools.core
 
 final case class GeneratorInfo(generatorName: String, generatorVersion: String)
diff --git a/...om/lunatech/cmt/core/cli/ArgParsers.scala → ...coursemgmttools/core/cli/ArgParsers.scala b/...om/lunatech/cmt/core/cli/ArgParsers.scala → ...coursemgmttools/core/cli/ArgParsers.scala
@@ -1,13 +1,13 @@
-package com.lunatech.cmt.core.cli
+package coursemgmttools.core.cli
 
 import caseapp.core.Error
 import caseapp.core.Error.Other
 import caseapp.core.argparser.{ArgParser, SimpleArgParser}
 import cats.syntax.apply.*
 import cats.syntax.either.*
-import com.lunatech.cmt.Domain.{InstallationSource, StudentifiedRepo}
-import com.lunatech.cmt.Domain.InstallationSource.{GithubProject, LocalDirectory, ZipFile}
-import com.lunatech.cmt.core.validation.FileValidations.*
+import coursemgmttools.Domain.{InstallationSource, StudentifiedRepo}
+import coursemgmttools.Domain.InstallationSource.{GithubProject, LocalDirectory, ZipFile}
+import coursemgmttools.core.validation.FileValidations.*
 import sbt.io.syntax.{File, file}
 
 object ArgParsers:

diff --git a/...om/lunatech/cmt/core/cli/CmtCommand.scala → ...coursemgmttools/core/cli/CmtCommand.scala b/...om/lunatech/cmt/core/cli/CmtCommand.scala → ...coursemgmttools/core/cli/CmtCommand.scala
@@ -1,10 +1,10 @@
-package com.lunatech.cmt.core.cli
+package coursemgmttools.core.cli
 
 import caseapp.{Command, RemainingArgs}
 import caseapp.core.Error
 import caseapp.core.help.Help
 import caseapp.core.parser.Parser
-import com.lunatech.cmt.{
+import coursemgmttools.{
   CmtError,
   MissingTrailingArguments,
   NoTrailingArguments,

diff --git a/...m/lunatech/cmt/core/command/Package.scala → ...oursemgmttools/core/command/Package.scala b/...m/lunatech/cmt/core/command/Package.scala → ...oursemgmttools/core/command/Package.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.core.command
+package coursemgmttools.core.command
 
 import sbt.io.syntax.File
 import sbt.io.IO as sbtio

diff --git a/...atech/cmt/core/execution/Executable.scala → ...mgmttools/core/execution/Executable.scala b/...atech/cmt/core/execution/Executable.scala → ...mgmttools/core/execution/Executable.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.core.execution
+package coursemgmttools.core.execution
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *
@@ -13,7 +13,7 @@ package com.lunatech.cmt.core.execution
   * See the License for the specific language governing permissions and limitations under the License.
   */
 
-import com.lunatech.cmt.CmtError
+import coursemgmttools.CmtError
 
 trait Executable[T]:
   extension (t: T) def execute(): Either[CmtError, String]
diff --git a/...cmt/core/validation/FileValidations.scala → ...ols/core/validation/FileValidations.scala b/...cmt/core/validation/FileValidations.scala → ...ols/core/validation/FileValidations.scala
@@ -1,9 +1,9 @@
-package com.lunatech.cmt.core.validation
+package coursemgmttools.core.validation
 
 import caseapp.core.Error
 import cats.data.{NonEmptyList, ValidatedNel}
 import cats.syntax.either.*
-import com.lunatech.cmt.Helpers
+import coursemgmttools.Helpers
 import sbt.io.syntax.File
 
 object FileValidations:

diff --git a/...ech/cmt/core/validation/Validatable.scala → ...mttools/core/validation/Validatable.scala b/...ech/cmt/core/validation/Validatable.scala → ...mttools/core/validation/Validatable.scala
@@ -1,6 +1,6 @@
-package com.lunatech.cmt.core.validation
+package coursemgmttools.core.validation
 
-import com.lunatech.cmt.CmtError
+import coursemgmttools.CmtError
 
 trait Validatable[T]:
   extension (t: T) def validated(): Either[CmtError, T]
diff --git a/...natech/cmt/client/ConfigurationSpec.scala → ...emgmttools/client/ConfigurationSpec.scala b/...natech/cmt/client/ConfigurationSpec.scala → ...emgmttools/client/ConfigurationSpec.scala
@@ -1,8 +1,8 @@
-package com.lunatech.cmt.client
+package coursemgmttools.client
 
-import com.lunatech.cmt.Domain.StudentifiedRepo
-import com.lunatech.cmt.client.Configuration.CmtHome
-import com.lunatech.cmt.support.EitherSupport
+import coursemgmttools.Domain.StudentifiedRepo
+import coursemgmttools.client.Configuration.CmtHome
+import coursemgmttools.support.EitherSupport
 import dev.dirs.ProjectDirectories
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.matchers.should.Matchers
@@ -27,7 +27,7 @@ final class ConfigurationSpec extends AnyWordSpecLike with Matchers with BeforeA
       // other specs _may_ have run before this one and already created the config file
       // so that's why we ensure that the cmt config file is removed before we execute
       // otherwise, if the file exists, it will likely not contain default values and the assertion below will fail
-      sbtio.delete(configDir / "com.lunatech.cmt.conf")
+      sbtio.delete(configDir / "coursemgmttools.conf")
 
       val receivedConfiguration = assertRight(Configuration.load())
 

diff --git a/...tech/cmt/client/command/InstallSpec.scala → ...gmttools/client/command/InstallSpec.scala b/...tech/cmt/client/command/InstallSpec.scala → ...gmttools/client/command/InstallSpec.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.client.command
+package coursemgmttools.client.command
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike

diff --git a/...unatech/cmt/core/cli/CmtCommandSpec.scala → ...semgmttools/core/cli/CmtCommandSpec.scala b/...unatech/cmt/core/cli/CmtCommandSpec.scala → ...semgmttools/core/cli/CmtCommandSpec.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.core.cli
+package coursemgmttools.core.cli
 
 //import caseapp.core.{Indexed, RemainingArgs}
 import org.scalatest.wordspec.AnyWordSpecLike

diff --git a/...mt/support/CommandLineParseTestBase.scala → ...ls/support/CommandLineParseTestBase.scala b/...mt/support/CommandLineParseTestBase.scala → ...ls/support/CommandLineParseTestBase.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.support
+package coursemgmttools.support
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *
@@ -24,7 +24,7 @@ import org.scalatest.wordspec.AnyWordSpecLike
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import sbt.io.IO
 import sbt.io.syntax.*
-import com.lunatech.cmt.{CmtError, toCmtError}
+import coursemgmttools.{CmtError, toCmtError}
 
 import scala.language.postfixOps
 

diff --git a/.../lunatech/cmt/support/EitherSupport.scala → ...ursemgmttools/support/EitherSupport.scala b/.../lunatech/cmt/support/EitherSupport.scala → ...ursemgmttools/support/EitherSupport.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.support
+package coursemgmttools.support
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *

diff --git a/.../cmt/support/ExtractUniquePathsSpec.scala → ...ools/support/ExtractUniquePathsSpec.scala b/.../cmt/support/ExtractUniquePathsSpec.scala → ...ools/support/ExtractUniquePathsSpec.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.support
+package coursemgmttools.support
 
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.matchers.should.Matchers
@@ -14,7 +14,7 @@ trait ExtractUniquePathsFixture {
 
 final class ExtractUniquePathsSpec extends AnyWordSpec with Matchers with ExtractUniquePathsFixture {
 
-  import com.lunatech.cmt.Helpers.extractUniquePaths
+  import coursemgmttools.Helpers.extractUniquePaths
 
   "extractUniquePaths" when {
     "given a series of paths that don't share any common prefix" should {

diff --git a/...unatech/cmt/support/TestDirectories.scala → ...semgmttools/support/TestDirectories.scala b/...unatech/cmt/support/TestDirectories.scala → ...semgmttools/support/TestDirectories.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.support
+package coursemgmttools.support
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *
@@ -13,9 +13,9 @@ package com.lunatech.cmt.support
   * See the License for the specific language governing permissions and limitations under the License.
   */
 
-import com.lunatech.cmt.Helpers
+import coursemgmttools.Helpers
 import sbt.io.syntax.{File, file}
-import com.lunatech.cmt.Helpers.adaptToOSSeparatorChar
+import coursemgmttools.Helpers.adaptToOSSeparatorChar
 
 trait TestDirectories {
 

diff --git a/...scala/com/lunatech/cmt/admin/Domain.scala → .../scala/coursemgmttools/admin/Domain.scala b/...scala/com/lunatech/cmt/admin/Domain.scala → .../scala/coursemgmttools/admin/Domain.scala
@@ -1,4 +1,4 @@
-package com.lunatech.cmt.admin
+package coursemgmttools.admin
 
 /** Copyright 2022 - Eric Loots - eric.loots@gmail.com / Trevor Burton-McCreadie - trevor@thinkmorestupidless.com
   *
@@ -13,12 +13,12 @@ package com.lunatech.cmt.admin
   * See the License for the specific language governing permissions and limitations under the License.
   */
 
-import com.lunatech.cmt.CmtError
+import coursemgmttools.CmtError
 import sbt.io.syntax.File
-import com.lunatech.cmt.*
+import coursemgmttools.*
 import cats.syntax.either.*
 
-import com.lunatech.cmt.Domain.InstallationSource
+import coursemgmttools.Domain.InstallationSource
 
 object Domain: