From d49e74fab1be86b115842daee0b0b950eb0ee4c2 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 13 Dec 2022 23:47:33 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9B=20Move=20FakeValetInteractor=20to?= =?UTF-8?q?=20separate=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 10 ++++++ .../Valet/Domains/FakeValetInteractor.swift | 35 +++++++++++++++++++ .../Valet/Domains/ValetInteractor.swift | 26 -------------- 3 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 phpmon/Domain/Integrations/Valet/Domains/FakeValetInteractor.swift diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index c195d59..2359759 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -529,6 +529,10 @@ C4B97B79275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */; }; C4B97B7B275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */; }; C4B97B7C275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */; }; + C4BF56AB2949381100379603 /* FakeValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BF56AA2949381100379603 /* FakeValetInteractor.swift */; }; + C4BF56AC2949381100379603 /* FakeValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BF56AA2949381100379603 /* FakeValetInteractor.swift */; }; + C4BF56AD2949381100379603 /* FakeValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BF56AA2949381100379603 /* FakeValetInteractor.swift */; }; + C4BF56AE2949381100379603 /* FakeValetInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BF56AA2949381100379603 /* FakeValetInteractor.swift */; }; C4BF90C127C57C220054E78C /* MainMenu+FixMyValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */; }; C4C0E8DF27F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8DE27F88AEB002D32A9 /* FakeSiteScanner.swift */; }; C4C0E8E027F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0E8DE27F88AEB002D32A9 /* FakeSiteScanner.swift */; }; @@ -848,6 +852,7 @@ C4B97B74275CF08C003F3378 /* AppDelegate+MenuOutlets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+MenuOutlets.swift"; sourceTree = ""; }; C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "App+ActivationPolicy.swift"; sourceTree = ""; }; C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "App+GlobalHotkey.swift"; sourceTree = ""; }; + C4BF56AA2949381100379603 /* FakeValetInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeValetInteractor.swift; sourceTree = ""; }; C4C0E8DE27F88AEB002D32A9 /* FakeSiteScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeSiteScanner.swift; sourceTree = ""; }; C4C0E8E127F88B13002D32A9 /* ValetSiteScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetSiteScanner.swift; sourceTree = ""; }; C4C0E8E627F88B41002D32A9 /* ProxyScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyScanner.swift; sourceTree = ""; }; @@ -1029,6 +1034,7 @@ children = ( C42F26722805B4B400938AC7 /* ValetListable.swift */, C40175B72903108900763A68 /* ValetInteractor.swift */, + C4BF56AA2949381100379603 /* FakeValetInteractor.swift */, ); path = Domains; sourceTree = ""; @@ -2078,6 +2084,7 @@ C4D9ADC8277611A0007277F4 /* InternalSwitcher.swift in Sources */, C4FACE83288F1F9700FC478F /* OnboardingWindowController.swift in Sources */, C4080FFA27BD956700BF2C6B /* BetterAlertVC.swift in Sources */, + C4BF56AB2949381100379603 /* FakeValetInteractor.swift in Sources */, C4B5635E276AB09000F12CCB /* VersionExtractor.swift in Sources */, 54D9E0B627E4F51E003B9AD9 /* HotKey.swift in Sources */, C4D936C927E3EB6100BD69FE /* PhpHelper.swift in Sources */, @@ -2158,6 +2165,7 @@ C471E85928F9BB650021E251 /* DomainListPhpCell.swift in Sources */, C471E85A28F9BB650021E251 /* DomainListTypeCell.swift in Sources */, C471E85B28F9BB650021E251 /* DomainListKindCell.swift in Sources */, + C4BF56AD2949381100379603 /* FakeValetInteractor.swift in Sources */, C471E85C28F9BB650021E251 /* DomainListWindowController.swift in Sources */, C471E85D28F9BB650021E251 /* DomainListVC.swift in Sources */, C471E85E28F9BB650021E251 /* DomainListVC+ContextMenu.swift in Sources */, @@ -2321,6 +2329,7 @@ C471E8BF28F9BB8F0021E251 /* DomainListWindowController.swift in Sources */, C471E8C028F9BB8F0021E251 /* DomainListVC.swift in Sources */, C471E8C128F9BB8F0021E251 /* DomainListVC+ContextMenu.swift in Sources */, + C4BF56AE2949381100379603 /* FakeValetInteractor.swift in Sources */, C471E8C228F9BB8F0021E251 /* DomainListVC+Actions.swift in Sources */, C4D36618291160A1006BD146 /* WIP.swift in Sources */, C471E8C328F9BB8F0021E251 /* SelectionVC.swift in Sources */, @@ -2562,6 +2571,7 @@ C4D9ADC9277611A0007277F4 /* InternalSwitcher.swift in Sources */, C449B4F227EE7FC400C47E8A /* DomainListPhpCell.swift in Sources */, C42CFB1A27DFE8BD00862737 /* NginxConfigurationTest.swift in Sources */, + C4BF56AC2949381100379603 /* FakeValetInteractor.swift in Sources */, C471E79428F9B23B0021E251 /* FileSystemProtocol.swift in Sources */, C4F30B0B278E203C00755FCE /* MainMenu+Startup.swift in Sources */, C485707C28BF459500539B36 /* NoWarningsView.swift in Sources */, diff --git a/phpmon/Domain/Integrations/Valet/Domains/FakeValetInteractor.swift b/phpmon/Domain/Integrations/Valet/Domains/FakeValetInteractor.swift new file mode 100644 index 0000000..d661fe1 --- /dev/null +++ b/phpmon/Domain/Integrations/Valet/Domains/FakeValetInteractor.swift @@ -0,0 +1,35 @@ +// +// FakeValetInteractor.swift +// PHP Monitor +// +// Created by Nico Verbruggen on 13/12/2022. +// Copyright © 2022 Nico Verbruggen. All rights reserved. +// + +import Foundation + +class FakeValetInteractor: ValetInteractor { + var delayTime: TimeInterval = 1.0 + + override func toggleSecure(proxy: ValetProxy) async throws { + await delay(seconds: delayTime) + proxy.secured = !proxy.secured + } + + override func toggleSecure(site: ValetSite) async throws { + await delay(seconds: delayTime) + site.secured = !site.secured + } + + override func unlink(site: ValetSite) async throws { + await delay(seconds: delayTime) + if let scanner = ValetScanners.siteScanner as? FakeSiteScanner { + scanner.fakes.removeAll { $0 === site } + } + } + + override func remove(proxy: ValetProxy) async throws { + await delay(seconds: delayTime) + #warning("A fake proxy scanner needs to be added") + } +} diff --git a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift b/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift index 98c7132..31d9ac2 100644 --- a/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift +++ b/phpmon/Domain/Integrations/Valet/Domains/ValetInteractor.swift @@ -81,29 +81,3 @@ class ValetInteractor { await Shell.quiet("valet unproxy '\(proxy.domain)'") } } - -class FakeValetInteractor: ValetInteractor { - var delayTime: TimeInterval = 1.0 - - override func toggleSecure(proxy: ValetProxy) async throws { - await delay(seconds: delayTime) - proxy.secured = !proxy.secured - } - - override func toggleSecure(site: ValetSite) async throws { - await delay(seconds: delayTime) - site.secured = !site.secured - } - - override func unlink(site: ValetSite) async throws { - await delay(seconds: delayTime) - if let scanner = ValetScanners.siteScanner as? FakeSiteScanner { - scanner.fakes.removeAll { $0 === site } - } - } - - override func remove(proxy: ValetProxy) async throws { - await delay(seconds: delayTime) - #warning("A fake proxy scanner needs to be added") - } -}