refactor packages
parent
f5bf7865d5
commit
77f2cf7c10
@ -1,4 +1,4 @@
|
|||||||
package io.provs
|
package io.provs.core
|
||||||
|
|
||||||
|
|
||||||
open class Secret(private val value: String) {
|
open class Secret(private val value: String) {
|
@ -1,15 +1,15 @@
|
|||||||
package io.provs.docker.platforms
|
package io.provs.core.docker.platforms
|
||||||
|
|
||||||
import io.provs.ProvResult
|
import io.provs.core.ProvResult
|
||||||
import io.provs.docker.containerRuns
|
import io.provs.core.docker.containerRuns
|
||||||
import io.provs.docker.dockerImageExists
|
import io.provs.core.docker.dockerImageExists
|
||||||
import io.provs.docker.exitAndRmContainer
|
import io.provs.core.docker.exitAndRmContainer
|
||||||
import io.provs.docker.images.DockerImage
|
import io.provs.core.docker.dockerimages.DockerImage
|
||||||
import io.provs.escapeSingleQuote
|
import io.provs.core.escapeSingleQuote
|
||||||
import io.provs.fileSeparator
|
import io.provs.core.fileSeparator
|
||||||
import io.provs.hostUserHome
|
import io.provs.core.hostUserHome
|
||||||
import io.provs.platforms.UbuntuProv
|
import io.provs.core.platforms.UbuntuProv
|
||||||
import io.provs.processors.ContainerStartMode
|
import io.provs.core.processors.ContainerStartMode
|
||||||
|
|
||||||
|
|
||||||
fun UbuntuProv.provideContainerPlatform(
|
fun UbuntuProv.provideContainerPlatform(
|
@ -1,4 +1,4 @@
|
|||||||
package io.provs.entry
|
package io.provs.core.entry
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calls a static method of a class.
|
* Calls a static method of a class.
|
@ -1,17 +1,17 @@
|
|||||||
package io.provs.platforms
|
package io.provs.core.platforms
|
||||||
|
|
||||||
import io.provs.ProgressType
|
import io.provs.core.ProgressType
|
||||||
import io.provs.Prov
|
import io.provs.core.Prov
|
||||||
import io.provs.ProvResult
|
import io.provs.core.ProvResult
|
||||||
import io.provs.escapeAndEncloseByDoubleQuoteForShell
|
import io.provs.core.escapeAndEncloseByDoubleQuoteForShell
|
||||||
import io.provs.processors.LocalProcessor
|
import io.provs.core.processors.LocalProcessor
|
||||||
import io.provs.processors.Processor
|
import io.provs.core.processors.Processor
|
||||||
|
|
||||||
const val SHELL = "/bin/bash"
|
const val SHELL = "/bin/bash"
|
||||||
|
|
||||||
|
|
||||||
class UbuntuProv internal constructor(processor : Processor = LocalProcessor(), name: String? = null, progressType: ProgressType)
|
class UbuntuProv internal constructor(processor : Processor = LocalProcessor(), name: String? = null, progressType: ProgressType)
|
||||||
: Prov (processor, name, progressType) {
|
: Prov(processor, name, progressType) {
|
||||||
|
|
||||||
override fun cmd(cmd: String, dir: String?, sudo: Boolean) : ProvResult = def {
|
override fun cmd(cmd: String, dir: String?, sudo: Boolean) : ProvResult = def {
|
||||||
xec(SHELL, "-c", commandWithDirAndSudo(cmd, dir, sudo))
|
xec(SHELL, "-c", commandWithDirAndSudo(cmd, dir, sudo))
|
@ -1,14 +1,14 @@
|
|||||||
package io.provs.platforms
|
package io.provs.core.platforms
|
||||||
|
|
||||||
import io.provs.ProgressType
|
import io.provs.core.ProgressType
|
||||||
import io.provs.Prov
|
import io.provs.core.Prov
|
||||||
import io.provs.ProvResult
|
import io.provs.core.ProvResult
|
||||||
import io.provs.processors.LocalProcessor
|
import io.provs.core.processors.LocalProcessor
|
||||||
import io.provs.processors.Processor
|
import io.provs.core.processors.Processor
|
||||||
|
|
||||||
|
|
||||||
class WinProv internal constructor(processor : Processor = LocalProcessor(), name: String? = null, progressType: ProgressType)
|
class WinProv internal constructor(processor : Processor = LocalProcessor(), name: String? = null, progressType: ProgressType)
|
||||||
: Prov (processor, name, progressType) {
|
: Prov(processor, name, progressType) {
|
||||||
|
|
||||||
private val SHELL = "cmd.exe"
|
private val SHELL = "cmd.exe"
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package io.provs.processors
|
package io.provs.core.processors
|
||||||
|
|
||||||
|
|
||||||
@Suppress("unused") // used externally
|
@Suppress("unused") // used externally
|
@ -1,10 +1,12 @@
|
|||||||
package io.provs.processors
|
package io.provs.core.processors
|
||||||
|
|
||||||
|
|
||||||
interface Processor {
|
interface Processor {
|
||||||
fun x(vararg args: String): ProcessResult
|
fun x(vararg args: String): ProcessResult
|
||||||
fun xNoLog(vararg args: String): ProcessResult
|
fun xNoLog(vararg args: String): ProcessResult
|
||||||
fun close() {}
|
fun close() {
|
||||||
|
// no action needed for most processors; if action is needed when closing, this method must be overwritten in the subclass
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,6 @@
|
|||||||
|
package io.provs.core.tags
|
||||||
|
|
||||||
|
@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION)
|
||||||
|
@Retention(AnnotationRetention.SOURCE)
|
||||||
|
@Suppress("unused") // element is offered to be used externally
|
||||||
|
annotation class Api
|
@ -1,6 +1,6 @@
|
|||||||
package io.provs
|
package io.provs.core
|
||||||
|
|
||||||
import io.provs.docker.provideContainer
|
import io.provs.core.docker.provideContainer
|
||||||
import io.provs.test.tags.ContainerTest
|
import io.provs.test.tags.ContainerTest
|
||||||
import io.provs.test.tags.NonCi
|
import io.provs.test.tags.NonCi
|
||||||
import io.provs.test.testLocal
|
import io.provs.test.testLocal
|
@ -1,4 +1,4 @@
|
|||||||
package io.provs
|
package io.provs.core
|
||||||
|
|
||||||
import io.provs.test.defaultTestContainer
|
import io.provs.test.defaultTestContainer
|
||||||
import io.provs.test.tags.ContainerTest
|
import io.provs.test.tags.ContainerTest
|
@ -1,9 +1,9 @@
|
|||||||
package io.provs.docker.platforms
|
package io.provs.core.docker.platforms
|
||||||
|
|
||||||
import io.provs.ProvResult
|
import io.provs.core.ProvResult
|
||||||
import io.provs.docker.containerRuns
|
import io.provs.core.docker.containerRuns
|
||||||
import io.provs.docker.exitAndRmContainer
|
import io.provs.core.docker.exitAndRmContainer
|
||||||
import io.provs.docker.runContainer
|
import io.provs.core.docker.runContainer
|
||||||
import io.provs.test.tags.NonCi
|
import io.provs.test.tags.NonCi
|
||||||
import io.provs.test.testLocal
|
import io.provs.test.testLocal
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
import org.junit.jupiter.api.Assertions.assertEquals
|
@ -1,6 +1,6 @@
|
|||||||
package io.provs.platformTest
|
package io.provs.core.platformTest
|
||||||
|
|
||||||
import io.provs.Prov
|
import io.provs.core.Prov
|
||||||
import io.provs.test.tags.NonCi
|
import io.provs.test.tags.NonCi
|
||||||
import io.provs.test.testLocal
|
import io.provs.test.testLocal
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
@ -1,6 +1,6 @@
|
|||||||
package io.provs.platformTest
|
package io.provs.core.platformTest
|
||||||
|
|
||||||
import io.provs.Prov
|
import io.provs.core.Prov
|
||||||
import io.provs.test.testLocal
|
import io.provs.test.testLocal
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
import org.junit.jupiter.api.Assertions.assertEquals
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
@ -1,5 +1,6 @@
|
|||||||
package io.provs
|
package io.provs.core.processors
|
||||||
|
|
||||||
|
import io.provs.core.newline
|
||||||
import io.provs.test.defaultTestContainer
|
import io.provs.test.defaultTestContainer
|
||||||
import io.provs.test.tags.ContainerTest
|
import io.provs.test.tags.ContainerTest
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
import org.junit.jupiter.api.Assertions.assertEquals
|
@ -1,6 +1,6 @@
|
|||||||
package io.provs.processors
|
package io.provs.core.processors
|
||||||
|
|
||||||
import io.provs.platforms.SHELL
|
import io.provs.core.platforms.SHELL
|
||||||
import io.provs.test.DEFAULT_START_MODE_TEST_CONTAINER
|
import io.provs.test.DEFAULT_START_MODE_TEST_CONTAINER
|
||||||
import io.provs.test.tags.ContainerTest
|
import io.provs.test.tags.ContainerTest
|
||||||
import io.provs.test.testDockerWithSudo
|
import io.provs.test.testDockerWithSudo
|
Loading…
Reference in New Issue