♻️ Reorganise code for optimal code sharing, add phpmon-cli

- Moved over common functionality to package
- Added phpmon-cli target (for fast switching via the terminal)

phpmon-common/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

phpmon-common/.swiftpm/xcode/xcshareddata/xcschemes/PMCommon.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PMCommon"
+               BuildableName = "PMCommon"
+               BlueprintName = "PMCommon"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "PMCommon"
+            BuildableName = "PMCommon"
+            BlueprintName = "PMCommon"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

phpmon-common/Package.swift

@@ -0,0 +1,15 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "PMCommon",
+    products: [
+        .library(name: "PMCommon", targets: ["PMCommon"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "PMCommon", dependencies: []),
+    ]
+)

phpmon-common/Sources/PMCommon/Command.swift

@@ -0,0 +1,40 @@
+//
+//  Command.swift
+//  PMCommon
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+public class Command {
+    
+    /**
+     Immediately executes a command.
+     
+     - Parameter path: The path of the command or program to invoke.
+     - Parameter arguments: A list of arguments that are passed on.
+     - Parameter trimNewlines: Removes empty new line output.
+     */
+    public static func execute(path: String, arguments: [String], trimNewlines: Bool = false) -> String {
+        let task = Process()
+        task.launchPath = path
+        task.arguments = arguments
+        
+        let pipe = Pipe()
+        task.standardOutput = pipe
+        task.launch()
+        
+        let data = pipe.fileHandleForReading.readDataToEndOfFile()
+        let output: String = String.init(data: data, encoding: String.Encoding.utf8)!
+        
+        if (trimNewlines) {
+            return output.components(separatedBy: .newlines)
+                .filter({ !$0.isEmpty })
+                .joined(separator: "\n")
+        }
+        
+        return output
+    }
+    
+}

phpmon-common/Sources/PMCommon/Paths.swift

@@ -0,0 +1,74 @@
+//
+//  Paths.swift
+//  PMCommon
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+public enum HomebrewDir: String {
+    case opt = "/opt/homebrew"
+    case usr = "/usr/local"
+}
+
+public class Paths {
+    
+    public static let shared = Paths()
+    var baseDir : HomebrewDir
+    
+    init() {
+        let optBrewFound = Shell.fileExists("\(HomebrewDir.opt.rawValue)/bin/brew")
+        let usrBrewFound = Shell.fileExists("\(HomebrewDir.usr.rawValue)/bin/brew")
+        
+        if (optBrewFound) {
+            // This is usually the case with Homebrew installed on Apple Silicon
+            baseDir = .opt
+        } else if (usrBrewFound) {
+            // This is usually the case with Homebrew installed on Intel (or Rosetta 2)
+            baseDir = .usr
+        } else {
+            // Falling back to default "legacy" Homebrew location (for Intel)
+            print("Seems like we couldn't determine the Homebrew directory.")
+            print("This usually means we're in trouble... (no Homebrew?)")
+            baseDir = .usr
+        }
+    }
+    
+    // - MARK: Binaries
+    
+    public static var valet: String {
+        return "/Users/\(whoami)/.composer/vendor/bin/valet"
+    }
+    
+    public static var brew: String {
+        return "\(binPath)/brew"
+    }
+    
+    public static var php: String {
+        return "\(binPath)/php"
+    }
+    
+    public static var phpConfig: String {
+        return "\(binPath)/php-config"
+    }
+    
+    // - MARK: Paths
+    
+    public static var whoami: String {
+        return String(Shell.pipe("whoami").split(separator: "\n")[0])
+    }
+    
+    public static var binPath: String {
+        return "\(shared.baseDir.rawValue)/bin"
+    }
+    
+    public static var optPath: String {
+        return "\(shared.baseDir.rawValue)/opt"
+    }
+    
+    public static var etcPath: String {
+        return "\(shared.baseDir.rawValue)/etc"
+    }
+    
+}

phpmon-common/Sources/PMCommon/Shell.swift

@@ -0,0 +1,179 @@
+//
+//  Shell.swift
+//  PMCommon
+//
+//  Copyright © 2021 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+public class Shell {
+    
+    // MARK: - Invoke static functions
+    
+    public static func run(
+        _ command: String,
+        requiresPath: Bool = false
+    ) {
+        Shell.user.run(command, requiresPath: requiresPath)
+    }
+    
+    public static func pipe(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> String {
+        return Shell.user.pipe(command, requiresPath: requiresPath)
+    }
+    
+    // MARK: - Singleton
+    
+    /**
+     We now require macOS 11, so no need to detect which terminal to use.
+     */
+    public var shell: String = "/bin/sh"
+    
+    /**
+     Singleton to access a user shell (with --login)
+     */
+    public static let user = Shell()
+    
+    /**
+     Runs a shell command without using the output.
+     Uses the default shell.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     */
+    private func run(
+        _ command: String,
+        requiresPath: Bool = false
+    ) {
+        // Equivalent of piping to /dev/null; don't do anything with the string
+        _ = Shell.pipe(command, requiresPath: requiresPath)
+    }
+    
+    /**
+     Runs a shell command and returns the output.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     */
+    private func pipe(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> String {
+        let shellOutput = self.executeSynchronously(command, requiresPath: requiresPath)
+        let hasError = (
+            shellOutput.standardOutput == ""
+            && shellOutput.errorOutput.lengthOfBytes(using: .utf8) > 0
+        )
+        return !hasError ? shellOutput.standardOutput : shellOutput.errorOutput
+    }
+    
+    /**
+     Runs the command and returns a `ShellOutput` object, which contains info about the process.
+     
+     - Parameter command: The command to run
+     - Parameter requiresPath: By default, the PATH is not resolved but some binaries might require this
+     - Parameter waitUntilExit: Waits for the command to complete before returning the `ShellOutput`
+     */
+    public func executeSynchronously(
+        _ command: String,
+        requiresPath: Bool = false
+    ) -> ShellOutput {
+        
+        let outputPipe = Pipe()
+        let errorPipe = Pipe()
+        
+        let task = self.createTask(for: command, requiresPath: requiresPath)
+        task.standardOutput = outputPipe
+        task.standardError = errorPipe
+        task.launch()
+        task.waitUntilExit()
+    
+        return ShellOutput(
+            standardOutput: String(
+                data: outputPipe.fileHandleForReading.readDataToEndOfFile(),
+                encoding: .utf8
+            )!,
+            errorOutput: String(
+                data: errorPipe.fileHandleForReading.readDataToEndOfFile(),
+                encoding: .utf8
+            )!,
+            task: task
+        )
+    }
+    
+    /**
+     Checks if a file exists at the provided path.
+     Uses `/bin/echo` instead of the `builtin` (which does not support `-n`).
+     */
+    public static func fileExists(_ path: String) -> Bool {
+        return Shell.pipe("if [ -f \(path) ]; then /bin/echo -n \"0\"; fi") == "0"
+    }
+    
+    /**
+     Creates a new process with the correct PATH and shell.
+     */
+    public func createTask(for command: String, requiresPath: Bool) -> Process {
+        let tailoredCommand = requiresPath
+        ? "export PATH=\(Paths.binPath):$PATH && \(command)"
+        : command
+        
+        let task = Process()
+        task.launchPath = self.shell
+        task.arguments = ["--login", "-c", tailoredCommand]
+        
+        return task
+    }
+    
+    public static func captureOutput(
+        _ task: Process,
+        didReceiveStdOutData: @escaping (String) -> Void,
+        didReceiveStdErrData: @escaping (String) -> Void
+    ) {
+        let outputPipe = Pipe()
+        let errorPipe = Pipe()
+        
+        task.standardOutput = outputPipe
+        task.standardError = errorPipe
+        
+        [(outputPipe, didReceiveStdOutData), (errorPipe, didReceiveStdErrData)].forEach {
+            (pipe: Pipe, callback: @escaping (String) -> Void) in
+            pipe.fileHandleForReading.waitForDataInBackgroundAndNotify()
+            NotificationCenter.default.addObserver(
+                forName: NSNotification.Name.NSFileHandleDataAvailable,
+                object: pipe.fileHandleForReading,
+                queue: nil
+            ) { notification in
+                if let outputString = String(data: pipe.fileHandleForReading.availableData, encoding: String.Encoding.utf8) {
+                    callback(outputString)
+                }
+                pipe.fileHandleForReading.waitForDataInBackgroundAndNotify()
+            }
+        }
+    }
+    
+    public static func haltCapturingOutput(_ task: Process) {
+        if let pipe = task.standardOutput as? Pipe {
+            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
+        }
+        if let pipe = task.standardError as? Pipe {
+            NotificationCenter.default.removeObserver(pipe.fileHandleForReading)
+        }
+    }
+}
+
+public class ShellOutput {
+    public let standardOutput: String
+    public let errorOutput: String
+    public let task: Process
+    
+    init(standardOutput: String,
+         errorOutput: String,
+         task: Process) {
+        self.standardOutput = standardOutput
+        self.errorOutput = errorOutput
+        self.task = task
+    }
+}