-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add builder info to studentified artifact/Add version command/Change …
…base package name (#227) * Add builder info to studentified artifact * Add version command to cmta * Change base package name * Adjust package names for main methods in cmta & cmtc
- Loading branch information
Showing
78 changed files
with
444 additions
and
340 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
cmta/src/main/scala/cmt/admin/Domain.scala → ...scala/com/lunatech/cmt/admin/Domain.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package cmt.admin | ||
| package com.lunatech.cmt.admin | ||
|
|
||
| /** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
| * | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package cmt.admin | ||
| package com.lunatech.cmt.admin | ||
|
|
||
| /** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
| * | ||
|
|
@@ -14,7 +14,14 @@ package cmt.admin | |
| */ | ||
|
|
||
| import caseapp.core.app.{CommandsEntryPoint} | ||
| import cmt.admin.command.{Delinearize, DuplicateInsertBefore, Linearize, RenumberExercises, Studentify} | ||
| import com.lunatech.cmt.admin.command.{ | ||
| Delinearize, | ||
| DuplicateInsertBefore, | ||
| Linearize, | ||
| RenumberExercises, | ||
| Studentify, | ||
| Version | ||
| } | ||
|
|
||
| object Main extends CommandsEntryPoint: | ||
| override def progName = "cmta" | ||
|
|
@@ -23,4 +30,5 @@ object Main extends CommandsEntryPoint: | |
| DuplicateInsertBefore.command, | ||
| Linearize.command, | ||
| RenumberExercises.command, | ||
| Studentify.command) | ||
| Studentify.command, | ||
| Version.command) | ||
6 changes: 3 additions & 3 deletions
6
...main/scala/cmt/admin/cli/ArgParsers.scala → ...m/lunatech/cmt/admin/cli/ArgParsers.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...n/scala/cmt/admin/cli/SharedOptions.scala → ...unatech/cmt/admin/cli/SharedOptions.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
...scala/cmt/admin/command/Delinearize.scala → ...atech/cmt/admin/command/Delinearize.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 14 additions & 9 deletions
23
...admin/command/DuplicateInsertBefore.scala → ...admin/command/DuplicateInsertBefore.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 9 additions & 9 deletions
18
...n/scala/cmt/admin/command/Linearize.scala → ...unatech/cmt/admin/command/Linearize.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ain/scala/cmt/admin/command/Package.scala → .../lunatech/cmt/admin/command/Package.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 15 additions & 10 deletions
25
...cmt/admin/command/RenumberExercises.scala → ...cmt/admin/command/RenumberExercises.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
cmta/src/main/scala/com/lunatech/cmt/admin/command/Version.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package com.lunatech.cmt.admin.command | ||
|
|
||
| import caseapp.{AppName, CommandName, ExtraName, HelpMessage, Name, Recurse, RemainingArgs, ValueDescription} | ||
| import com.lunatech.cmt.CmtError | ||
| import com.lunatech.cmt.core.cli.CmtCommand | ||
| import com.lunatech.cmt.core.execution.Executable | ||
| import com.lunatech.cmt.core.validation.Validatable | ||
| import com.lunatech.cmt.printResult | ||
| import com.lunatech.cmt.version.BuildInfo | ||
| object Version: | ||
| @AppName("version") | ||
| @CommandName("version") | ||
| @HelpMessage("Print version info") | ||
| final case class Options() | ||
|
|
||
| given Validatable[Version.Options] with | ||
| extension (options: Version.Options) def validated(): Either[CmtError, Version.Options] = Right(options) | ||
| end given | ||
|
|
||
| given Executable[Version.Options] with | ||
| extension (options: Version.Options) def execute(): Either[CmtError, String] = Right(BuildInfo.toString) | ||
| end given | ||
|
|
||
| val command: CmtCommand[Version.Options] = new CmtCommand[Version.Options] { | ||
|
|
||
| def run(options: Version.Options, args: RemainingArgs): Unit = | ||
| options.validated().flatMap(_.execute()).printResult() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package cmt | ||
| package com.lunatech.cmt | ||
|
|
||
| /** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
| * | ||
|
|
@@ -13,10 +13,10 @@ package cmt | |
| * See the License for the specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| import cmt.TestHelpers.getExercisePrefixAndExercises | ||
| import cmt.admin.Domain.{MainRepository, RenumberOffset, RenumberStart, RenumberStep} | ||
| import cmt.admin.cli.SharedOptions | ||
| import cmt.admin.command.RenumberExercises | ||
| import com.lunatech.cmt.TestHelpers.getExercisePrefixAndExercises | ||
| import com.lunatech.cmt.admin.Domain.{MainRepository, RenumberOffset, RenumberStart, RenumberStep} | ||
| import com.lunatech.cmt.admin.cli.SharedOptions | ||
| import com.lunatech.cmt.admin.command.RenumberExercises | ||
| import org.scalatest.BeforeAndAfterAll | ||
| import org.scalatest.matchers.should.Matchers | ||
| import org.scalatest.wordspec.AnyWordSpec | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
cmta/src/test/scala/cmt/TestHelpers.scala → .../scala/com/lunatech/cmt/TestHelpers.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package cmt | ||
| package com.lunatech.cmt | ||
|
|
||
| /** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
| * | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package cmt.admin.cli | ||
| package com.lunatech.cmt.admin.cli | ||
|
|
||
| /** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
| * | ||
|
|
@@ -14,12 +14,12 @@ package cmt.admin.cli | |
| */ | ||
|
|
||
| import caseapp.Parser | ||
| import cmt.{ErrorMessage, FailedToValidateArgument, OptionName, RequiredOptionIsMissing} | ||
| import cmt.admin.Domain.{LinearizeBaseDirectory, MainRepository} | ||
| import cmt.admin.command.Delinearize | ||
| import cmt.support.TestDirectories | ||
| import com.lunatech.cmt.{ErrorMessage, FailedToValidateArgument, OptionName, RequiredOptionIsMissing} | ||
| import com.lunatech.cmt.admin.Domain.{LinearizeBaseDirectory, MainRepository} | ||
| import com.lunatech.cmt.admin.command.Delinearize | ||
| import com.lunatech.cmt.support.TestDirectories | ||
| import sbt.io.syntax.{File, file} | ||
| import cmt.admin.cli.ArgParsers.linearizeBaseDirectoryArgParser | ||
| import com.lunatech.cmt.admin.cli.ArgParsers.linearizeBaseDirectoryArgParser | ||
|
|
||
| final class DelinearizeArgumentsSpec extends CommandLineArgumentsSpec[Delinearize.Options] with TestDirectories { | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package cmt.admin.cli | ||
| package com.lunatech.cmt.admin.cli | ||
|
|
||
| /** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
| * | ||
|
|
@@ -14,12 +14,12 @@ package cmt.admin.cli | |
| */ | ||
|
|
||
| import caseapp.Parser | ||
| import cmt.{ErrorMessage, FailedToValidateArgument, OptionName, RequiredOptionIsMissing} | ||
| import cmt.admin.Domain.{ExerciseNumber, MainRepository} | ||
| import cmt.admin.command.DuplicateInsertBefore | ||
| import cmt.support.TestDirectories | ||
| import com.lunatech.cmt.{ErrorMessage, FailedToValidateArgument, OptionName, RequiredOptionIsMissing} | ||
| import com.lunatech.cmt.admin.Domain.{ExerciseNumber, MainRepository} | ||
| import com.lunatech.cmt.admin.command.DuplicateInsertBefore | ||
| import com.lunatech.cmt.support.TestDirectories | ||
| import sbt.io.syntax.{File, file} | ||
| import cmt.admin.cli.ArgParsers.exerciseNumberArgParser | ||
| import com.lunatech.cmt.admin.cli.ArgParsers.exerciseNumberArgParser | ||
|
|
||
| final class DuplicateInsertBeforeArgumentsSpec | ||
| extends CommandLineArgumentsSpec[DuplicateInsertBefore.Options] | ||
|
|
||
Oops, something went wrong.