Compare commits

..

2 Commits

Author SHA1 Message Date
Gleb Koval 1fd3fa8907
Linting
Test Workflow / Lint and test library (pull_request) Successful in 9m10s Details
Publish Workflow / Publish library (pull_request) Successful in 9m36s Details
2023-12-20 15:12:56 +00:00
Gleb Koval 9164ff2443
Test release 2023-12-20 13:29:58 +00:00
6 changed files with 85 additions and 37 deletions

View File

@ -10,4 +10,7 @@ max_line_length = 120
tab_width = 4 tab_width = 4
[{*.yaml,*.yml}] [{*.yaml,*.yml}]
indent_size = 2 indent_size = 2
[{*.kt,*.kts}]
ij_kotlin_packages_to_use_import_on_demand = org.junit.jupiter.api

View File

@ -1,8 +1,11 @@
name: Publish Workflow name: Publish Workflow
on: on:
pull_request:
branches:
- main
push: push:
tags: branches:
- v* - main
jobs: jobs:
publish: publish:
name: Publish library name: Publish library

View File

@ -6,7 +6,7 @@ plugins {
} }
group = "net.koval.teamcity-build-step-extension-test-task" group = "net.koval.teamcity-build-step-extension-test-task"
version = System.getenv("FILESYSTEM_VERSION") version = "0.0.0"
repositories { repositories {
mavenCentral() mavenCentral()

View File

@ -8,7 +8,10 @@ import java.nio.file.Path
class FSCreator { class FSCreator {
// Create entry, leaving existing folders' contents, but overwriting existing files. // Create entry, leaving existing folders' contents, but overwriting existing files.
@Throws(FileSystemException::class) @Throws(FileSystemException::class)
fun create(entryToCreate: FSEntry, destination: String) { fun create(
entryToCreate: FSEntry,
destination: String,
) {
val queue = ArrayDeque<Pair<FSEntry, Path>>() val queue = ArrayDeque<Pair<FSEntry, Path>>()
queue.add(entryToCreate to Path.of(destination)) queue.add(entryToCreate to Path.of(destination))
@ -20,7 +23,8 @@ class FSCreator {
is FSFile -> Files.createFile(path) is FSFile -> Files.createFile(path)
is FSFolder -> Files.createDirectory(path) is FSFolder -> Files.createDirectory(path)
} }
} catch (_: FileAlreadyExistsException) {} // Allow files/folders to already exist. } catch (_: FileAlreadyExistsException) {
} // Allow files/folders to already exist.
when (entry) { when (entry) {
is FSFile -> Files.write(path, entry.content.toByteArray()) is FSFile -> Files.write(path, entry.content.toByteArray())
is FSFolder -> queue.addAll(entry.entries.map { it to path }) is FSFolder -> queue.addAll(entry.entries.map { it to path })

View File

@ -4,6 +4,6 @@ package filesystem
// (as we expect), and it also makes the class abstract as required. // (as we expect), and it also makes the class abstract as required.
sealed class FSEntry(val name: String) sealed class FSEntry(val name: String)
class FSFile(name: String, val content: String): FSEntry(name) class FSFile(name: String, val content: String) : FSEntry(name)
class FSFolder(name: String, val entries: List<FSEntry>): FSEntry(name) class FSFolder(name: String, val entries: List<FSEntry>) : FSEntry(name)

View File

@ -29,19 +29,36 @@ class FSCreatorTest {
fun `create entries`() { fun `create entries`() {
val readme = FSFile("README", "Hello World!") val readme = FSFile("README", "Hello World!")
val gomod = FSFile("go.mod", "module example.com/hello-world\n\ngo1.21.5") val gomod = FSFile("go.mod", "module example.com/hello-world\n\ngo1.21.5")
val maingo = FSFile("main.go", "package main\n\nimport \"example.com/hello-world/utils\"\n\n" + val maingo =
"func main() {\n\tprintln(\"Hello World!\")\n}") FSFile(
val helloworldgo = FSFile("hello-world.go", "package utils\n\nfunc PrintHelloWorld() {\n" + "main.go",
"\tprintln(\"Hello World!\")\n}") "package main\n\nimport \"example.com/hello-world/utils\"\n\n" +
"func main() {\n\tprintln(\"Hello World!\")\n}",
)
val helloworldgo =
FSFile(
"hello-world.go",
"package utils\n\nfunc PrintHelloWorld() {\n" +
"\tprintln(\"Hello World!\")\n}",
)
assertDoesNotThrow("should create entries") { assertDoesNotThrow("should create entries") {
creator.create(FSFolder("folder", listOf( creator.create(
readme, FSFolder(
gomod, "folder",
maingo, listOf(
FSFolder("utils", listOf( readme,
helloworldgo gomod,
)) maingo,
)), "_tmp") FSFolder(
"utils",
listOf(
helloworldgo,
),
),
),
),
"_tmp",
)
} }
// If objects don't exist, these functions will throw anyway, so don't explicitly check for existence. // If objects don't exist, these functions will throw anyway, so don't explicitly check for existence.
// Similarly, don't explicitly check if an object is a directory. // Similarly, don't explicitly check if an object is a directory.
@ -54,25 +71,46 @@ class FSCreatorTest {
@Test @Test
fun `create existing entries`() { fun `create existing entries`() {
assertDoesNotThrow("creation one") { assertDoesNotThrow("creation one") {
creator.create(FSFolder("folder", listOf( creator.create(
FSFolder("sub-folder", listOf( FSFolder(
FSFile("hi", "hi") "folder",
)), listOf(
FSFolder("another-folder", listOf()), FSFolder(
FSFile("1.txt", "One!"), "sub-folder",
FSFile("2.txt", "Two!") listOf(
)), "_tmp") FSFile("hi", "hi"),
),
),
FSFolder("another-folder", listOf()),
FSFile("1.txt", "One!"),
FSFile("2.txt", "Two!"),
),
),
"_tmp",
)
} }
assertDoesNotThrow("creation two") { assertDoesNotThrow("creation two") {
creator.create(FSFolder("folder", listOf( creator.create(
FSFolder("another-folder", listOf( FSFolder(
FSFolder("secrets", listOf( "folder",
FSFile("secret", "P4ssW0rd") listOf(
)) FSFolder(
)), "another-folder",
FSFile("1.txt", "One is a good number"), listOf(
FSFile("3.txt", "Three!") FSFolder(
)), "_tmp") "secrets",
listOf(
FSFile("secret", "P4ssW0rd"),
),
),
),
),
FSFile("1.txt", "One is a good number"),
FSFile("3.txt", "Three!"),
),
),
"_tmp",
)
} }
assertEquals("hi", Files.readString(Path.of("_tmp/folder/sub-folder/hi"))) assertEquals("hi", Files.readString(Path.of("_tmp/folder/sub-folder/hi")))
assertEquals("P4ssW0rd", Files.readString(Path.of("_tmp/folder/another-folder/secrets/secret"))) assertEquals("P4ssW0rd", Files.readString(Path.of("_tmp/folder/another-folder/secrets/secret")))