Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Sources/Runner/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ private func runCommand(_ command: DangerCommand, logger: Logger) throws {
}

private func checkForUpdate(logger: Logger) {
// FIXME: Add another env variable to opt out this check
// https://github.com/danger/swift/pull/505#discussion_r799356563
guard ProcessInfo.processInfo.environment["DEBUG"] == nil else { return }
let versionChecker = VersionChecker(logger: logger)
let versionChecker = VersionChecker(logger: logger, env: ProcessInfo.processInfo.environment)
versionChecker.checkForUpdate(current: DangerVersion)
}

Expand Down
6 changes: 5 additions & 1 deletion Sources/RunnerLib/VersionChecker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@ import Version
public struct VersionChecker {
private let shellExecutor: ShellExecuting
private let logger: Logger
private let env: [String: String]

public init(
shellExecutor: ShellExecuting = ShellExecutor(),
logger: Logger
logger: Logger,
env: [String: String]
) {
self.shellExecutor = shellExecutor
self.logger = logger
self.env = env
}
}

public extension VersionChecker {
func checkForUpdate(current currentVersionString: String) {
guard env["DANGER_SWIFT_NO_UPDATE_CHECK"] == nil, env["DEBUG"] == nil else { return }
guard let latestVersionString = fetchLatestVersion() else { return }
guard let latestVersion = Version(latestVersionString) else {
logger.debug("Invalid latestVersionString: (\(latestVersionString)")
Expand Down
38 changes: 36 additions & 2 deletions Tests/RunnerLibTests/VersionCheckerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,45 @@ final class VersionCheckerTests: XCTestCase {
isVerbose: false,
isSilent: false,
printer: spyPrinter
)
),
env: [:]
)
versionChecker.checkForUpdate(current: "1.0.0")
XCTAssertTrue(spyPrinter.printedMessages.contains { $0.contains("A new release of danger-swift is available") })
}

func testItIgnoresTheCheckIfNoUpdateEnvVariableIsSet() throws {
executor.result = mockResult(tagName: "1.0.1")

let versionChecker = VersionChecker(
shellExecutor: executor,
logger: Logger(
isVerbose: false,
isSilent: false,
printer: spyPrinter
),
env: ["DANGER_SWIFT_NO_UPDATE_CHECK": "*"]
)
versionChecker.checkForUpdate(current: "1.0.0")
XCTAssertFalse(spyPrinter.printedMessages.contains { $0.contains("A new release of danger-swift is available") })
}

func testItIgnoresTheCheckIfDebugEnvVariableIsSet() throws {
executor.result = mockResult(tagName: "1.0.1")

let versionChecker = VersionChecker(
shellExecutor: executor,
logger: Logger(
isVerbose: false,
isSilent: false,
printer: spyPrinter
),
env: ["DEBUG": "*"]
)
versionChecker.checkForUpdate(current: "1.0.0")
XCTAssertFalse(spyPrinter.printedMessages.contains { $0.contains("A new release of danger-swift is available") })
}

func testItNotShowNotificationIfRunningIsLatest() throws {
executor.result = mockResult(tagName: "1.0.0")

Expand All @@ -42,7 +75,8 @@ final class VersionCheckerTests: XCTestCase {
isVerbose: false,
isSilent: false,
printer: spyPrinter
)
),
env: [:]
)
versionChecker.checkForUpdate(current: "1.0.0")
XCTAssertFalse(spyPrinter.printedMessages.contains { $0.contains("A new release of danger-swift is available") })
Expand Down
2 changes: 2 additions & 0 deletions Tests/RunnerLibTests/XCTestManifests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__VersionCheckerTests = [
("testItIgnoresTheCheckIfDebugEnvVariableIsSet", testItIgnoresTheCheckIfDebugEnvVariableIsSet),
("testItIgnoresTheCheckIfNoUpdateEnvVariableIsSet", testItIgnoresTheCheckIfNoUpdateEnvVariableIsSet),
("testItNotShowNotificationIfRunningIsLatest", testItNotShowNotificationIfRunningIsLatest),
("testItShowsNotificationIfNewVersionIsAvailable", testItShowsNotificationIfNewVersionIsAvailable),
]
Expand Down