move external dependencies out from core

master
Josha von Gizycki 2 weeks ago
parent cae2842648
commit 0bca92aef4

@ -3,7 +3,6 @@ package alfred.web.core.build
import org.slf4j.Logger import org.slf4j.Logger
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.io.File import java.io.File
import java.nio.file.Path
import java.time.ZonedDateTime import java.time.ZonedDateTime
import kotlin.collections.joinToString import kotlin.collections.joinToString
import kotlin.io.appendText import kotlin.io.appendText

@ -5,6 +5,7 @@ import alfred.web.core.Handles
import alfred.web.core.build.BuildContext import alfred.web.core.build.BuildContext
import alfred.web.core.build.BuildId import alfred.web.core.build.BuildId
import alfred.web.core.build.Workspace import alfred.web.core.build.Workspace
import alfred.web.system.Processes
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

@ -4,6 +4,7 @@ import alfred.web.core.Handle
import alfred.web.core.Handles import alfred.web.core.Handles
import alfred.web.core.build.BuildContext import alfred.web.core.build.BuildContext
import alfred.web.core.build.Workspace import alfred.web.core.build.Workspace
import alfred.web.system.Processes
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import java.io.File import java.io.File

@ -8,8 +8,8 @@ import alfred.web.core.build.Workspace
import alfred.web.core.build.Workspaces import alfred.web.core.build.Workspaces
import alfred.web.core.event.BuildFinished import alfred.web.core.event.BuildFinished
import alfred.web.core.process.Git import alfred.web.core.process.Git
import alfred.web.core.process.Processes
import alfred.web.core.process.Script import alfred.web.core.process.Script
import alfred.web.system.Processes
import org.slf4j.Logger import org.slf4j.Logger
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import org.springframework.context.ApplicationEventPublisher import org.springframework.context.ApplicationEventPublisher

@ -1,8 +1,13 @@
package alfred.web.core.process package alfred.web.system
import alfred.web.core.build.BuildConfig import alfred.web.core.build.BuildConfig
import alfred.web.core.build.LogFile import alfred.web.core.build.LogFile
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import kotlin.collections.filter
import kotlin.collections.forEach
import kotlin.collections.set
import kotlin.let
import kotlin.text.contains
@Service @Service
class ProcessEnvironment { class ProcessEnvironment {

@ -1,7 +1,6 @@
package alfred.web.core.process package alfred.web.system
import alfred.web.core.build.BuildConfig import alfred.web.core.build.BuildConfig
import alfred.web.core.build.BuildContext
import alfred.web.core.build.LogFile import alfred.web.core.build.LogFile
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import kotlin.apply import kotlin.apply
@ -20,9 +19,6 @@ class Processes(
environment().putAll(env.forBuild(config, logFile, rev)) environment().putAll(env.forBuild(config, logFile, rev))
} }
fun builder(ctx: BuildContext) =
builder(ctx.config, ctx.logFile, ctx.rev)
fun startThread(block: () -> Unit) { fun startThread(block: () -> Unit) {
Thread { Thread {
block() block()

@ -6,9 +6,9 @@ import alfred.web.core.build.Workspaces
import alfred.web.core.event.BuildFinished import alfred.web.core.event.BuildFinished
import alfred.web.core.eventPublisher import alfred.web.core.eventPublisher
import alfred.web.core.process.Git import alfred.web.core.process.Git
import alfred.web.core.process.ProcessEnvironment
import alfred.web.core.process.Processes import alfred.web.core.process.Processes
import alfred.web.core.process.Script import alfred.web.core.process.Script
import alfred.web.system.ProcessEnvironment
import io.mockk.every import io.mockk.every
import io.mockk.justRun import io.mockk.justRun
import io.mockk.mockk import io.mockk.mockk

@ -1,7 +1,8 @@
package alfred.web.core.process package alfred.web.system
import alfred.web.core.build.BuildConfig import alfred.web.core.build.BuildConfig
import alfred.web.core.build.LogFile import alfred.web.core.build.LogFile
import alfred.web.system.ProcessEnvironment
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import java.nio.file.Files import java.nio.file.Files
import kotlin.test.assertEquals import kotlin.test.assertEquals
Loading…
Cancel
Save