🚀 Version 5.7.2

phpmon/Common/Core/Logger.swift

@@ -12,47 +12,76 @@ class Log {
 
     static var shared = Log()
 
+    var logFilePath = "~/.config/phpmon/last_session.log"
+    var logExists = false
+
     enum Verbosity: Int {
         case error = 1,
              warning = 2,
              info = 3,
-             performance = 4
+             performance = 4,
+             cli = 5
 
         public func isApplicable() -> Bool {
             return Log.shared.verbosity.rawValue >= self.rawValue
         }
     }
 
-    var verbosity: Verbosity = .warning
+    public func prepareLogFile() {
+        if !isRunningTests && Verbosity.cli.isApplicable() {
+            _ = system("mkdir -p ~/.config/phpmon 2> /dev/null")
+            _ = system("rm ~/.config/phpmon/last_session.log 2> /dev/null")
+            _ = system("touch ~/.config/phpmon/last_session.log 2> /dev/null")
+            self.logExists = FileSystem.fileExists(self.logFilePath)
+        }
+    }
+
+    var verbosity: Verbosity = .warning {
+        didSet {
+            self.prepareLogFile()
+        }
+    }
 
     static func err(_ item: Any) {
         if Verbosity.error.isApplicable() {
-            print("[E] \(item)")
+            Log.shared.log("[E] \(item)")
         }
     }
 
     static func warn(_ item: Any) {
         if Verbosity.warning.isApplicable() {
-            print("[W] \(item)")
+            Log.shared.log("[W] \(item)")
         }
     }
 
     static func info(_ item: Any) {
         if Verbosity.info.isApplicable() {
-            print("\(item)")
+            Log.shared.log("\(item)")
         }
     }
 
     static func perf(_ item: Any) {
         if Verbosity.performance.isApplicable() {
-            print("[P] \(item)")
+            Log.shared.log("[P] \(item)")
         }
     }
 
     static func separator(as verbosity: Verbosity = .info) {
         if verbosity.isApplicable() {
-            print("==================================")
+            Log.shared.log("==================================")
         }
     }
 
+    private func log(_ text: String) {
+        print(text)
+
+        if logExists && Verbosity.cli.isApplicable() {
+            let logFile = URL(string: self.logFilePath.replacingTildeWithHomeDirectory)!
+            if let fileHandle = try? FileHandle(forWritingTo: logFile) {
+                fileHandle.seekToEndOfFile()
+                fileHandle.write(text.appending("\n").data(using: .utf8).unsafelyUnwrapped)
+                fileHandle.closeFile()
+            }
+        }
+    }
 }

phpmon/Common/Helpers/VersionExtractor.swift

@@ -40,5 +40,4 @@ class VersionExtractor {
             return nil
         }
     }
-
 }

phpmon/Common/Shell/RealShell.swift

@@ -68,6 +68,7 @@ class RealShell: ShellProtocol {
         let task = Process()
         task.launchPath = self.launchPath
         task.arguments = ["--noprofile", "-norc", "--login", "-c", completeCommand]
+
         return task
     }
 
@@ -113,6 +114,35 @@ class RealShell: ShellProtocol {
             encoding: .utf8
         )!
 
+        if Log.shared.verbosity == .cli {
+            var args = task.arguments
+            let last: String = "\"" + (args?.popLast() ?? "") + "\""
+            let concat = [self.launchPath] + task.arguments! + [last]
+            let command = concat.joined(separator: " ")
+            var log = """
+
+            <~~~~~~~~~~~~~~~~~~~~~~~
+            $ \(command)
+
+            [OUT]:
+            \(stdOut)
+            """
+
+            if !stdErr.isEmpty {
+                log.append("""
+                [ERR]:
+                \(stdErr)
+                """)
+            }
+
+            log.append("""
+            ~~~~~~~~~~~~~~~~~~~~~~~~>
+
+            """)
+
+            Log.info(log)
+        }
+
         return .out(stdOut, stdErr)
     }
 

phpmon/Domain/App/AppDelegate.swift

@@ -56,10 +56,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
      When the application initializes, create all singletons.
      */
     override init() {
-        logger.verbosity = .info
-
         #if DEBUG
         logger.verbosity = .performance
+
         if let profile = CommandLine.arguments.first(where: { $0.matches(pattern: "--configuration:*") }) {
             Self.initializeTestingProfile(profile.replacingOccurrences(of: "--configuration:", with: ""))
         }
@@ -70,6 +69,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
             Log.info("Extra verbose mode has been activated.")
         }
 
+        if CommandLine.arguments.contains("--cli") {
+            logger.verbosity = .cli
+            Log.info("Extra CLI mode has been activated via --cli flag.")
+        }
+
+        if FileSystem.fileExists("~/.config/phpmon/verbose") {
+            logger.verbosity = .cli
+            Log.info("Extra CLI mode is on (`~/.config/phpmon/verbose` exists).")
+        }
+
         Log.separator(as: .info)
         Log.info("PHP MONITOR by Nico Verbruggen")
         Log.info("Version \(App.version)")

phpmon/Domain/App/Startup.swift

@@ -242,7 +242,7 @@ class Startup {
                     .components(separatedBy: "Laravel Valet")[1]
                     .trimmingCharacters(in: .whitespaces)
                 // Extract the version number
-                Valet.shared.version = try! VersionNumber.parse(VersionExtractor.from(output)!)
+                Valet.shared.version = try! VersionNumber.parse(VersionExtractor.from(versionString)!)
                 // Get the actual version
                 return Valet.shared.version == nil
             },