Merge pull request #5 from f-meloni/fix_execute_step
Fix executeStep method
This commit is contained in:
commit
2d534697b0
|
@ -1,7 +1,7 @@
|
||||||
import Logger
|
import Logger
|
||||||
|
|
||||||
final class CommitExecutor: ScriptLauncherExecutor<CommitParameters> {
|
final class CommitExecutor: ScriptLauncherExecutor<CommitParameters> {
|
||||||
func executeStep(version: String, logger: Logger) {
|
override func executeStep(version: String, logger: Logger) {
|
||||||
let message = parameters.message ?? "Version \(version)"
|
let message = parameters.message ?? "Version \(version)"
|
||||||
var scriptString = "git commit -m \"\(message)\""
|
var scriptString = "git commit -m \"\(message)\""
|
||||||
|
|
||||||
|
|
|
@ -6,4 +6,8 @@ class DefaultExecutor<T: StepParameters>: StepExecutor {
|
||||||
required init(dictionary: [String: Any]?) {
|
required init(dictionary: [String: Any]?) {
|
||||||
parameters = T(dictionary: dictionary)
|
parameters = T(dictionary: dictionary)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func executeStep(version _: String, logger _: Logger) {
|
||||||
|
fatalError("Not implemented")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import Logger
|
import Logger
|
||||||
|
|
||||||
final class GitAddExecutor: ScriptLauncherExecutor<GitAddParameters> {
|
final class GitAddExecutor: ScriptLauncherExecutor<GitAddParameters> {
|
||||||
func executeStep(version _: String, logger: Logger) {
|
override func executeStep(version _: String, logger: Logger) {
|
||||||
launchScript(content: "git add " + parameters.paths.joined(separator: " "), errorMessage: "Git Add step failed with error", logger: logger)
|
launchScript(content: "git add " + parameters.paths.joined(separator: " "), errorMessage: "Git Add step failed with error", logger: logger)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ import Logger
|
||||||
final class HideDevDependenciesExecutor: DefaultExecutor<ModifyDevDependenciesParameters> {
|
final class HideDevDependenciesExecutor: DefaultExecutor<ModifyDevDependenciesParameters> {
|
||||||
var devDependenciesModifier: DevDependenciesModifing = DevDependenciesModifier()
|
var devDependenciesModifier: DevDependenciesModifing = DevDependenciesModifier()
|
||||||
|
|
||||||
func executeStep(version _: String, logger: Logger) {
|
override func executeStep(version _: String, logger: Logger) {
|
||||||
do {
|
do {
|
||||||
try devDependenciesModifier.hideDependencies(packagePath: parameters.packagePath)
|
try devDependenciesModifier.hideDependencies(packagePath: parameters.packagePath)
|
||||||
} catch {
|
} catch {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import Logger
|
import Logger
|
||||||
|
|
||||||
final class PushExecutor: ScriptLauncherExecutor<PushParameters> {
|
final class PushExecutor: ScriptLauncherExecutor<PushParameters> {
|
||||||
func executeStep(version _: String, logger: Logger) {
|
override func executeStep(version _: String, logger: Logger) {
|
||||||
var scriptString = "git push \(parameters.remote) \(parameters.branch) --tags"
|
var scriptString = "git push \(parameters.remote) \(parameters.branch) --tags"
|
||||||
|
|
||||||
if parameters.noVerify {
|
if parameters.noVerify {
|
||||||
|
|
|
@ -2,7 +2,7 @@ import Foundation
|
||||||
import Logger
|
import Logger
|
||||||
|
|
||||||
final class ScriptExecutor: ScriptLauncherExecutor<ScriptParameters> {
|
final class ScriptExecutor: ScriptLauncherExecutor<ScriptParameters> {
|
||||||
func executeStep(version _: String, logger: Logger) {
|
override func executeStep(version _: String, logger: Logger) {
|
||||||
guard let content = parameters.content,
|
guard let content = parameters.content,
|
||||||
!content.isEmpty else {
|
!content.isEmpty else {
|
||||||
logger.logError("Invalid script content")
|
logger.logError("Invalid script content")
|
||||||
|
|
|
@ -6,7 +6,3 @@ public protocol StepExecutor {
|
||||||
|
|
||||||
init(dictionary: [String: Any]?)
|
init(dictionary: [String: Any]?)
|
||||||
}
|
}
|
||||||
|
|
||||||
extension StepExecutor {
|
|
||||||
func executeStep(version _: String, logger _: Logger) {}
|
|
||||||
}
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ final class SwiftScriptExecutor: DefaultExecutor<SwiftScriptParameters> {
|
||||||
lazy var fileManager: FileManager = .default
|
lazy var fileManager: FileManager = .default
|
||||||
lazy var processLauncher: ProcessLaunching = ProcessLauncher()
|
lazy var processLauncher: ProcessLaunching = ProcessLauncher()
|
||||||
|
|
||||||
func executeStep(version: String, logger: Logger) {
|
override func executeStep(version: String, logger: Logger) {
|
||||||
guard let scriptPath = parameters.scriptPath else {
|
guard let scriptPath = parameters.scriptPath else {
|
||||||
logger.logError("Invalid script path for the Swift script step")
|
logger.logError("Invalid script path for the Swift script step")
|
||||||
return
|
return
|
||||||
|
|
|
@ -2,7 +2,7 @@ import Foundation
|
||||||
import Logger
|
import Logger
|
||||||
|
|
||||||
final class TagExecutor: ScriptLauncherExecutor<TagParameters> {
|
final class TagExecutor: ScriptLauncherExecutor<TagParameters> {
|
||||||
func executeStep(version: String, logger: Logger) {
|
override func executeStep(version: String, logger: Logger) {
|
||||||
launchScript(content: "git tag \(version)", errorMessage: "Tag step failed with error", logger: logger)
|
launchScript(content: "git tag \(version)", errorMessage: "Tag step failed with error", logger: logger)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ import Logger
|
||||||
final class UnhideDevDependenciesExecutor: DefaultExecutor<ModifyDevDependenciesParameters> {
|
final class UnhideDevDependenciesExecutor: DefaultExecutor<ModifyDevDependenciesParameters> {
|
||||||
var devDependenciesModifier: DevDependenciesModifing = DevDependenciesModifier()
|
var devDependenciesModifier: DevDependenciesModifing = DevDependenciesModifier()
|
||||||
|
|
||||||
func executeStep(version _: String, logger: Logger) {
|
override func executeStep(version _: String, logger: Logger) {
|
||||||
do {
|
do {
|
||||||
try devDependenciesModifier.unhideDependencies(packagePath: parameters.packagePath)
|
try devDependenciesModifier.unhideDependencies(packagePath: parameters.packagePath)
|
||||||
} catch {
|
} catch {
|
||||||
|
|
Loading…
Reference in New Issue