Merge pull request #25 from dirtyhenry/fake

Add catch-up flag

Author: dirtyhenry

.swift-version

@@ -1 +1 @@
-5.5
+5.9

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.9
 
 import PackageDescription
 

Sources/Pomodoro/Hook.swift

@@ -16,9 +16,9 @@ extension Hook {
     private var scriptURL: URL {
         switch self {
         case .didStart:
-            return Environment.dotDirectory.appendingPathComponent(Hook.didStartScript)
+            Environment.dotDirectory.appendingPathComponent(Hook.didStartScript)
         case .didFinish:
-            return Environment.dotDirectory.appendingPathComponent(Hook.didFinishScript)
+            Environment.dotDirectory.appendingPathComponent(Hook.didFinishScript)
         }
     }
 
@@ -43,7 +43,7 @@ extension Hook {
         formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
 
         canBeExecuted { executable, path in
-            if executable, let path = path {
+            if executable, let path {
                 let task = Process.launchedProcess(launchPath: path, arguments: [
                     formatter.string(from: description.startDate),
                     formatter.string(from: description.endDate),

Sources/Pomodoro/TimerViewCLI.swift

@@ -28,20 +28,22 @@ public class TimerViewCLI {
     /// Starts the timer for the specified duration.
     ///
     /// - Parameter pomodoro: the description of the Pomodoro.
-    public func start(pomodoro: PomodoroDescription) {
-        let timerViewModel = TimerViewModel(timeInterval: pomodoro.duration)
-        self.timerViewModel = timerViewModel
+    public func start(pomodoro: PomodoroDescription, shouldExitRightAway: Bool = false) {
+        if !shouldExitRightAway {
+            let timerViewModel = TimerViewModel(timeInterval: pomodoro.duration)
+            self.timerViewModel = timerViewModel
 
-        Hook.didStart.execute(description: pomodoro, completionHandler: hookCompletionHandler)
+            Hook.didStart.execute(description: pomodoro, completionHandler: hookCompletionHandler)
 
-        output.write(string: "🍅 from \(pomodoro.formattedStartDate) to \(pomodoro.formattedEndDate)\n")
-        sleepTime = pomodoro.duration / TimeInterval(outputLength)
-        while !timerViewModel.outputs.progress.isFinished {
-            outputLine(for: timerViewModel.outputs.progress.fractionCompleted)
-            Thread.sleep(forTimeInterval: sleepTime)
+            output.write(string: "🍅 from \(pomodoro.formattedStartDate) to \(pomodoro.formattedEndDate)\n")
+            sleepTime = pomodoro.duration / TimeInterval(outputLength)
+            while !timerViewModel.outputs.progress.isFinished {
+                outputLine(for: timerViewModel.outputs.progress.fractionCompleted)
+                Thread.sleep(forTimeInterval: sleepTime)
+            }
+            outputLine(for: 1.0)
+            output.write(string: "\nPomodoro ended\n")
         }
-        outputLine(for: 1.0)
-        output.write(string: "\nPomodoro ended\n")
 
         Hook.didFinish.execute(description: pomodoro, completionHandler: hookCompletionHandler)
         LogWriter().writeLog(pomodoroDescription: pomodoro)

Sources/PomodoroCLI/RootCommand.swift

@@ -11,6 +11,9 @@ struct PomodoroCLI: ParsableCommand {
     @Option(name: .shortAndLong, help: "The intent of the pomodoro (example: email zero)")
     var message: String?
 
+    @Flag(name: .shortAndLong, help: "Exit right away (escape-hatch to run hooks only)")
+    var catchUp: Bool = false
+
     func run() throws {
         guard let durationAsTimeInterval = TimeIntervalFormatter().timeInterval(from: duration) else {
             CLIUtils.write(message: "Invalid duration: \(duration)")
@@ -19,14 +22,14 @@ struct PomodoroCLI: ParsableCommand {
 
         let pomodoroMessage: String
 
-        if let message = message {
+        if let message {
             pomodoroMessage = message
         } else {
             CLIUtils.write(message: "💁‍♀️ What is the intent of this pomodoro?", foreground: .green)
             pomodoroMessage = readLine() ?? ""
         }
 
         let pomodoro = PomodoroDescription(duration: durationAsTimeInterval, message: pomodoroMessage)
-        TimerViewCLI(output: FileHandle.standardOutput).start(pomodoro: pomodoro)
+        TimerViewCLI(output: FileHandle.standardOutput).start(pomodoro: pomodoro, shouldExitRightAway: catchUp)
     }
 }