commit e4c66567ea8ca7dba75da094fb6617790146480c Author: Oliver Rümpelein Date: Sat Apr 4 13:37:27 2020 +0200 First functional draft diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..84c048a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/build/ diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..4375518 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,75 @@ +plugins { + id("org.jetbrains.kotlin.multiplatform") +} +repositories { + mavenCentral() +} +group = "com.example" +version = "0.0.1" + +apply(plugin = "maven-publish") + +kotlin { + jvm() + js { + // FIXME: JS-Tests + browser { + testTask { + enabled = false + } + } + nodejs { + testTask { + enabled = false + } + } + } + // For ARM, should be changed to iosArm32 or iosArm64 + // For Linux, should be changed to e.g. linuxX64 + // For MacOS, should be changed to e.g. macosX64 + // For Windows, should be changed to e.g. mingwX64 + linuxX64("linuxX64") + linuxArm64("linuxAArch") + sourceSets { + commonMain { + dependencies { + implementation(kotlin("stdlib-common")) + } + } + commonTest { + dependencies { + implementation(kotlin("test-common")) + implementation(kotlin("test-annotations-common")) + } + } + getByName("jvmMain") { + dependencies { + implementation(kotlin("stdlib-jdk8")) + } + } + getByName("jvmTest") { + dependencies { + implementation(kotlin("test")) + implementation(kotlin("test-junit")) + } + } + getByName("jsMain") { + dependencies { + implementation(kotlin("stdlib-js")) + } + } + getByName("jsTest") { + dependencies { + implementation(kotlin("test-js")) + } + } + getByName("linuxX64Main") { + } + getByName("linuxX64Test") { + } + getByName("linuxAArchMain") { + } + getByName("linuxAArchTest") { + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..29e08e8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..490fda8 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..6623300 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +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.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..2ca4bbb --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,7 @@ +pluginManagement { + plugins { + id("org.jetbrains.kotlin.multiplatform") version "1.3.61" + } +} + +rootProject.name = "rcdbquery" diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/Sample.kt b/src/commonMain/kotlin/de/pheerai/rcdbquery/Sample.kt new file mode 100644 index 0000000..5a9e03c --- /dev/null +++ b/src/commonMain/kotlin/de/pheerai/rcdbquery/Sample.kt @@ -0,0 +1,11 @@ +package de.pheerai.rcdbquery + +expect class Sample() { + fun checkMe(): Int +} + +expect object Platform { + val name: String +} + +fun hello(): String = "Hello from ${Platform.name}" diff --git a/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/Vendor.kt b/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/Vendor.kt new file mode 100644 index 0000000..2f8d669 --- /dev/null +++ b/src/commonMain/kotlin/de/pheerai/rcdbquery/dataMappings/Vendor.kt @@ -0,0 +1,35 @@ +package de.pheerai.rcdbquery.dataMappings + +enum class Vendor(val prettyName: String, val fullName: String, val queryId: Int) { + INTAMIN("Intamin","Intamin Amusement Rides", 6837), + VEKOMA("Vekoma", 6836), + MACK("Mack Rides", "Mack Rides GmbH & Co KG", 6856), + GERSTLAUER("Gerstlauer", "Gerstlauer Amusement Rides GmbH", 6948), + ZIERER("Zierer", 6861), + MAURER("Maurer", "Maurer Rides GmbH", 6905), + B_AND_M("B&M", "Bolliger & Mabillard", 6831), + SBF_VISA("SBF Visa", "SBF Visa Group", 7028), + ZAMPERLA("Zamperla", 6892), + GCI("GCI", "Great Coasters International", 6860), + RMC("RMC", "Rocky Mountain Construction", 10583) + ; + + constructor(name: String, queryId: Int) : this(name, name, queryId) + + val queryParam + get() = "${queryParamName}=${this.queryId}" + + companion object { + const val queryParamName = "mk" + + fun createQueryParam(vararg vendors: Vendor) = vendors.joinToString("&") { it.queryParam } + fun createQueryParam(name: String): String = createQueryParam(*searchByName(name).toTypedArray()) + fun getByName(name: String): Vendor? = values().firstOrNull { it.prettyName == name } + fun searchByName(name: String): List { + val searchName = name.toLowerCase() + return values().filter { + it.prettyName.toLowerCase().contains(searchName) + }.toList() + } + } +} diff --git a/src/commonTest/kotlin/de/pheerai/rcdbquery/SampleTests.kt b/src/commonTest/kotlin/de/pheerai/rcdbquery/SampleTests.kt new file mode 100644 index 0000000..e5a46cd --- /dev/null +++ b/src/commonTest/kotlin/de/pheerai/rcdbquery/SampleTests.kt @@ -0,0 +1,11 @@ +package de.pheerai.rcdbquery + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTests { + @Test + fun testMe() { + assertTrue(Sample().checkMe() > 0) + } +} diff --git a/src/commonTest/kotlin/de/pheerai/rcdbquery/dataMappings/VendorTest.kt b/src/commonTest/kotlin/de/pheerai/rcdbquery/dataMappings/VendorTest.kt new file mode 100644 index 0000000..ad5bdaf --- /dev/null +++ b/src/commonTest/kotlin/de/pheerai/rcdbquery/dataMappings/VendorTest.kt @@ -0,0 +1,52 @@ +package de.pheerai.rcdbquery.dataMappings + +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertNull + +class VendorTest { + @Test + fun testQueryParam() { + assertEquals( + "mk=6837", + Vendor.INTAMIN.queryParam + ) + } + + @Test + fun testQueryParamsGeneration() { + assertEquals( + "mk=6837&mk=6836", + Vendor.createQueryParam(Vendor.INTAMIN, Vendor.VEKOMA), + "Generation by Enum lookup failed." + ) + assertEquals( + "mk=6836&mk=6856&mk=6905", + Vendor.createQueryParam("Ma"), + "Generation by name search failed." + ) + } + + @Test + fun testGetByName() { + assertEquals( + Vendor.INTAMIN, + Vendor.getByName("Intamin") + ) + assertNull( + Vendor.getByName("asdf anjfejasdnf njnas") + ) + } + + @Test + fun testSearchByName() { + assertEquals( + listOf(Vendor.VEKOMA, Vendor.MACK, Vendor.MAURER), + Vendor.searchByName("ma") + ) + assertEquals( + listOf(), + Vendor.searchByName("asdf anjfejasdnf njnas") + ) + } +} diff --git a/src/jsMain/kotlin/de/pheerai/rcdbquery/SampleJs.kt b/src/jsMain/kotlin/de/pheerai/rcdbquery/SampleJs.kt new file mode 100644 index 0000000..b006d79 --- /dev/null +++ b/src/jsMain/kotlin/de/pheerai/rcdbquery/SampleJs.kt @@ -0,0 +1,9 @@ +package de.pheerai.rcdbquery + +actual class Sample { + actual fun checkMe() = 12 +} + +actual object Platform { + actual val name: String = "JS" +} diff --git a/src/jsTest/kotlin/de/pheerai/rcdbquery/SampleTestsJS.kt b/src/jsTest/kotlin/de/pheerai/rcdbquery/SampleTestsJS.kt new file mode 100644 index 0000000..80ed5e2 --- /dev/null +++ b/src/jsTest/kotlin/de/pheerai/rcdbquery/SampleTestsJS.kt @@ -0,0 +1,11 @@ +package de.pheerai.rcdbquery + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTestsJS { + @Test + fun testHello() { + assertTrue("JS" in hello()) + } +} diff --git a/src/jvmMain/kotlin/de/pheerai/rcdbquery/SampleJvm.kt b/src/jvmMain/kotlin/de/pheerai/rcdbquery/SampleJvm.kt new file mode 100644 index 0000000..9f17caf --- /dev/null +++ b/src/jvmMain/kotlin/de/pheerai/rcdbquery/SampleJvm.kt @@ -0,0 +1,9 @@ +package de.pheerai.rcdbquery + +actual class Sample { + actual fun checkMe() = 42 +} + +actual object Platform { + actual val name: String = "JVM" +} diff --git a/src/jvmTest/kotlin/de/pheerai/rcdbquery/SampleTestsJVM.kt b/src/jvmTest/kotlin/de/pheerai/rcdbquery/SampleTestsJVM.kt new file mode 100644 index 0000000..6b38f64 --- /dev/null +++ b/src/jvmTest/kotlin/de/pheerai/rcdbquery/SampleTestsJVM.kt @@ -0,0 +1,11 @@ +package de.pheerai.rcdbquery + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTestsJVM { + @Test + fun testHello() { + assertTrue("JVM" in hello()) + } +} diff --git a/src/linuxAArchMain/kotlin/de/pheerai/rcdbquery/SampleLinux.kt b/src/linuxAArchMain/kotlin/de/pheerai/rcdbquery/SampleLinux.kt new file mode 100644 index 0000000..a89985d --- /dev/null +++ b/src/linuxAArchMain/kotlin/de/pheerai/rcdbquery/SampleLinux.kt @@ -0,0 +1,9 @@ +package de.pheerai.rcdbquery + +actual class Sample { + actual fun checkMe() = 7 +} + +actual object Platform { + actual val name: String = "Native" +} diff --git a/src/linuxAArchTest/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt b/src/linuxAArchTest/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt new file mode 100644 index 0000000..b71ef62 --- /dev/null +++ b/src/linuxAArchTest/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt @@ -0,0 +1,11 @@ +package de.pheerai.rcdbquery + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTestsNative { + @Test + fun testHello() { + assertTrue("Native" in hello()) + } +} diff --git a/src/linuxX64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt b/src/linuxX64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt new file mode 100644 index 0000000..a89985d --- /dev/null +++ b/src/linuxX64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt @@ -0,0 +1,9 @@ +package de.pheerai.rcdbquery + +actual class Sample { + actual fun checkMe() = 7 +} + +actual object Platform { + actual val name: String = "Native" +} diff --git a/src/linuxX64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt b/src/linuxX64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt new file mode 100644 index 0000000..b71ef62 --- /dev/null +++ b/src/linuxX64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt @@ -0,0 +1,11 @@ +package de.pheerai.rcdbquery + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTestsNative { + @Test + fun testHello() { + assertTrue("Native" in hello()) + } +}