add sourceset for cli config

config/cli/build.gradle

@@ -0,0 +1,25 @@
+
+
+// Copyright 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+apply plugin: 'groovy'
+
+
+group 'org.terasology'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'org.codehaus.groovy:groovy-all:2.5.4'
+    compile 'org.apache.ivy:ivy:2.4.0'
+}
+
+sourceSets {
+    main {
+        groovy {
+            srcDir 'groovy'
+        }
+    }
+}

config/groovy/org/terasology/cli/BaseCommand.groovy → config/cli/groovy/org/terasology/cli/BaseCommand.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 
 import picocli.CommandLine.Command
 

config/groovy/org/terasology/cli/Get.groovy → config/cli/groovy/org/terasology/cli/Get.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 import picocli.CommandLine.ParentCommand
 import picocli.CommandLine.Command
 // Actually in use, annotation below may show syntax error due to Groovy's annotation by the same name. Works fine

config/groovy/org/terasology/cli/GitOptions.groovy → config/cli/groovy/org/terasology/cli/GitOptions.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 import picocli.CommandLine.Option
 
 /**

config/groovy/org/terasology/cli/GooeyCLI.groovy → config/cli/groovy/org/terasology/cli/GooeyCLI.groovy

@@ -22,12 +22,12 @@ import picocli.CommandLine.HelpCommand
 
 // If using local groovy files the subcommands section may highlight as bad syntax in IntelliJ - that's OK
 @Command(name = "gw",
-        synopsisSubcommandLabel = "COMMAND", // Default is [COMMAND] indicating optional, but sub command here is required
-        subcommands = [
-                HelpCommand.class, // Adds standard help options (help as a subcommand, -h, and --help)
-                Module.class,
-                Init.class], // Note that these Groovy classes *must* start with a capital letter for some reason
-        description = "Utility system for interacting with a Terasology developer workspace")
+//    synopsisSubcommandLabel = "COMMAND", // Default is [COMMAND] indicating optional, but sub command here is required
+    subcommands = [
+        HelpCommand.class, // Adds standard help options (help as a subcommand, -h, and --help)
+        Module.class,
+        Init.class], // Note that these Groovy classes *must* start with a capital letter for some reason
+    description = "Utility system for interacting with a Terasology developer workspace")
 class GooeyCLI extends BaseCommand {
     static void main(String[] args) {
         AnsiConsole.systemInstall() // enable colors on Windows - TODO: Test on not-so-Windows systems, should those not run this?

config/groovy/org/terasology/cli/Init.groovy → config/cli/groovy/org/terasology/cli/Init.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 import picocli.CommandLine.Command
 import picocli.CommandLine.Help.Ansi
 // Is in use, IDE may think the Groovy-supplied is in use below and mark this unused

config/groovy/org/terasology/cli/ItemCommand.groovy → config/cli/groovy/org/terasology/cli/ItemCommand.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 /**
  * Simple command type class that indicates the command deals with "items" - nested Git roots representing application elements
  */

config/groovy/org/terasology/cli/ManagedItem.groovy → config/cli/groovy/org/terasology/cli/ManagedItem.groovy

@@ -1,9 +1,9 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 @GrabResolver(name = 'jcenter', root = 'http://jcenter.bintray.com/')
 @Grab(group = 'org.ajoberstar', module = 'grgit', version = '1.9.3')
-import org.ajoberstar.grgit.Grgit
+
 
 /**
  * Utility class for dealing with items managed in a developer workspace.

config/groovy/org/terasology/cli/ManagedModule.groovy → config/cli/groovy/org/terasology/cli/ManagedModule.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 class ManagedModule extends ManagedItem {
     ManagedModule() {
         super()

config/groovy/org/terasology/cli/Module.groovy → config/cli/groovy/org/terasology/cli/Module.groovy

@@ -1,13 +1,13 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 
 import picocli.CommandLine.Command
 import picocli.CommandLine.HelpCommand
 
 // If using local groovy files the subcommands section may highlight as bad syntax in IntelliJ - that's OK
 @Command(name = "module",
-        synopsisSubcommandLabel = "COMMAND", // Default is [COMMAND] indicating optional, but sub command here is required
+//        synopsisSubcommandLabel = "COMMAND", // Default is [COMMAND] indicating optional, but sub command here is required
         subcommands = [
                 HelpCommand.class, // Adds standard help options (help as a subcommand, -h, and --help)
                 Recurse.class,

config/groovy/org/terasology/cli/PropHelper.groovy → config/cli/groovy/org/terasology/cli/PropHelper.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 /**
  * Convenience class for pulling properties out of a 'gradle.properties' if present, for various overrides
  * // TODO: YAML variant that can be added for more complex use cases?

config/groovy/org/terasology/cli/Recurse.groovy → config/cli/groovy/org/terasology/cli/Recurse.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 import picocli.CommandLine.ParentCommand
 import picocli.CommandLine.Command
 import picocli.CommandLine.Mixin

config/groovy/org/terasology/cli/Update.groovy → config/cli/groovy/org/terasology/cli/Update.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.cli;
+package org.terasology.cli
 import picocli.CommandLine.ParentCommand
 import picocli.CommandLine.Command
 import picocli.CommandLine.Mixin

gw

@@ -80,7 +80,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar:$APP_HOME/gradle/wrapper/groovy-wrapper.jar:$APP_HOME/config/groovy/
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar:$APP_HOME/gradle/wrapper/groovy-wrapper.jar:$APP_HOME/config/cli/groovy
 
 
 # Determine the Java command to use to start the JVM.
@@ -180,6 +180,6 @@ save () {
 APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GroovyWrapperMain config/groovy/org/terasology/cli/GooeyCLI.groovy "$APP_ARGS"
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GroovyWrapperMain config/cli/groovy/org/terasology/cli/GooeyCLI.groovy "$APP_ARGS"
 
 exec "$JAVACMD" "$@"

gw.bat

@@ -107,12 +107,11 @@ SET CMD_LINE_ARGS=%CMD_LINE_ARGS:~1%
 
 :execute
 @rem Setup the command line
-
-set CLASSPATH=%APP_HOME%gradle\wrapper\gradle-wrapper.jar;%APP_HOME%gradle\wrapper\groovy-wrapper.jar;%APP_HOME%config\groovy\;
+set CLASSPATH=%APP_HOME%gradle\wrapper\gradle-wrapper.jar;%APP_HOME%gradle\wrapper\groovy-wrapper.jar;%APP_HOME%config\cli\groovy\;
 
 
 @rem Execute Groovy via the Gradle Wrapper
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -cp "%CLASSPATH%" org.gradle.wrapper.GroovyWrapperMain config/groovy/org/terasology/cli/GooeyCLI.groovy %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -cp "%CLASSPATH%" org.gradle.wrapper.GroovyWrapperMain config/cli/groovy/org/terasology/cli/GooeyCLI.groovy %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -2,7 +2,7 @@ import groovy.io.FileType
 
 rootProject.name = 'Terasology'
 
-include 'engine', 'engine-tests', 'facades', 'metas', 'libs', 'modules'
+include 'engine', 'engine-tests', 'facades', 'metas', 'libs', 'modules', ':config:cli'
 
 // Handy little snippet found online that'll "fake" having nested settings.gradle files under /modules, /libs, etc
 rootDir.eachDir { possibleSubprojectDir ->