Merge pull request #135 from JohnLCaron/core-uber

Build core-uber.jar.

Author: JohnLCaron

clibs/src/test/kotlin/com/sunya/netchdf/NetchdfClibExtra.kt

@@ -46,9 +46,7 @@ class NetchdfClibExtra {
         compareCdlWithClib(testData + "netchdf/npp/VCBHO_npp_d20030125_t084955_e085121_b00015_c20071213022754_den_OPS_SEG.h5")
     }
 
-    // this one we could probably fix
     @Test
-    // @Disabled
     fun unsolved2() {
         val filename = testData + "netchdf/tomas/S3A_OL_CCDB_CHAR_AllFiles.20101019121929_1.nc4"
         // showMyHeader(filename)
@@ -80,7 +78,7 @@ class NetchdfClibExtra {
         compareCdlWithClib(filename)
     }
 
-    // @ParameterizedTest
+    @ParameterizedTest
     @MethodSource("params")
     fun readNetchdfData(filename: String) {
         readNetchdfData(filename, null)

core/build.gradle.kts

@@ -29,3 +29,18 @@ kotlin {
     jvmToolchain(21)
 }
 
+tasks.register<Jar>("uberJar") {
+    archiveClassifier = "uber"
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+    //manifest {
+    //    attributes("Main-Class" to "com.sunya.netchdf.ncdump")
+    //}
+
+    from(sourceSets.main.get().output)
+    dependsOn(configurations.runtimeClasspath)
+    from({
+        configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it) }
+    })
+}
+

core/src/main/kotlin/com/sunya/netchdf/NetchdfFile.kt

@@ -21,4 +21,4 @@ fun openNetchdfFile(filename : String, strict : Boolean = false) : Netchdf? {
             else  -> null // throw RuntimeException(" unsupported NetcdfFileFormat $format")
         }
     }
-}
+}

core/src/test/kotlin/com/sunya/netchdf/NetchdfExtra.kt

@@ -1,17 +1,13 @@
 package com.sunya.netchdf
 
-import com.sunya.cdm.api.*
 import com.sunya.cdm.util.Stats
 import com.sunya.testdata.NetchdfExtraFiles
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 import com.sunya.testdata.testData
-import com.sunya.testdata.testFilesIn
 import org.junit.jupiter.api.AfterAll
-import java.util.*
 import java.util.stream.Stream
 
 // Compare header using cdl(!strict) with Netchdf and NetcdfClibFile

gradle/libs.versions.toml

@@ -3,6 +3,7 @@ netchdf = "0.2.0"
 
 # main dependency versions
 kotlin = "2.1.10"
+kotlinx-cli = "0.3.6"
 kotlinx-coroutines = "1.8.1"
 oshai-version = "7.0.0"
 
@@ -20,6 +21,7 @@ kotest = "5.9.1"
 
 # Kotlinx libraries
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli", version.ref = "kotlinx-cli" }
 
 # Logging
 oshai-logging = { module = "io.github.oshai:kotlin-logging", version.ref = "oshai-version" }

testdata/build.gradle.kts

@@ -3,9 +3,12 @@ plugins {
 }
 
 dependencies {
+    api(project(":core"))
+
     implementation(libs.oshai.logging)
     implementation(kotlin("test"))
     implementation(libs.bundles.jvmtest)
+    implementation(libs.kotlinx.cli)
 
     // runTest() for running suspend functions in tests
     implementation(libs.kotlinx.coroutines.test)

testdata/src/main/kotlin/com/sunya/netchdf/cli/ncdump.kt

@@ -0,0 +1,27 @@
+package com.sunya.netchdf.cli
+
+import com.sunya.netchdf.openNetchdfFile
+import kotlinx.cli.*
+
+object ncdump {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        val parser = ArgParser("ncdump")
+        val filename by parser.option(
+            ArgType.String,
+            shortName = "in",
+            description = "Directory containing input election record"
+        ).required()
+
+        parser.parse(args)
+
+        openNetchdfFile(filename).use { myfile ->
+            if (myfile == null) {
+                println("*** not a netchdf file = $filename")
+                return
+            }
+            println("${myfile.type()} $filename ")
+            println(myfile.cdl())
+        }
+    }
+}