Release of version 0.1.3-beta

.gitignore

@@ -97,4 +97,4 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
-
+.DS_Store

Brewer.xcodeproj/project.pbxproj

@@ -12,6 +12,8 @@
 		9E6C730C2C3D796D0056ADDC /* DownloadButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */; };
 		9E6C730E2C3DB16F0056ADDC /* UninstallButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */; };
 		9E6C73112C3DB5940056ADDC /* CaskDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C73102C3DB5940056ADDC /* CaskDetailView.swift */; };
+		9E6C73182C3E853E0056ADDC /* UpdateButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C73172C3E853E0056ADDC /* UpdateButton.swift */; };
+		9E7ADB5A2C3EE41F00F2B8CA /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 9E7ADB592C3EE41F00F2B8CA /* LaunchAtLogin */; };
 		9E8CE5362C3C545600A39146 /* BrewerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8CE5352C3C545600A39146 /* BrewerApp.swift */; };
 		9E8CE5382C3C545600A39146 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8CE5372C3C545600A39146 /* ContentView.swift */; };
 		9E8CE53A2C3C545700A39146 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9E8CE5392C3C545700A39146 /* Assets.xcassets */; };
@@ -45,6 +47,7 @@
 		9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadButton.swift; sourceTree = "<group>"; };
 		9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UninstallButton.swift; sourceTree = "<group>"; };
 		9E6C73102C3DB5940056ADDC /* CaskDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaskDetailView.swift; sourceTree = "<group>"; };
+		9E6C73172C3E853E0056ADDC /* UpdateButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateButton.swift; sourceTree = "<group>"; };
 		9E8CE5322C3C545600A39146 /* Brewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Brewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9E8CE5352C3C545600A39146 /* BrewerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrewerApp.swift; sourceTree = "<group>"; };
 		9E8CE5372C3C545600A39146 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -64,6 +67,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9E7ADB5A2C3EE41F00F2B8CA /* LaunchAtLogin in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -88,6 +92,7 @@
 			isa = PBXGroup;
 			children = (
 				9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */,
+				9E6C73172C3E853E0056ADDC /* UpdateButton.swift */,
 				9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */,
 			);
 			path = Components;
@@ -187,6 +192,9 @@
 			dependencies = (
 			);
 			name = Brewer;
+			packageProductDependencies = (
+				9E7ADB592C3EE41F00F2B8CA /* LaunchAtLogin */,
+			);
 			productName = Brewer;
 			productReference = 9E8CE5322C3C545600A39146 /* Brewer.app */;
 			productType = "com.apple.product-type.application";
@@ -259,6 +267,9 @@
 				Base,
 			);
 			mainGroup = 9E8CE5292C3C545600A39146;
+			packageReferences = (
+				9E98BE4E2C3EE353006ED274 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */,
+			);
 			productRefGroup = 9E8CE5332C3C545600A39146 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -304,6 +315,7 @@
 				9E6C73072C3D5E570056ADDC /* SearchView.swift in Sources */,
 				9E6C730C2C3D796D0056ADDC /* DownloadButton.swift in Sources */,
 				9E8CE5382C3C545600A39146 /* ContentView.swift in Sources */,
+				9E6C73182C3E853E0056ADDC /* UpdateButton.swift in Sources */,
 				9E6C730E2C3DB16F0056ADDC /* UninstallButton.swift in Sources */,
 				9E8CE5622C3C5A6A00A39146 /* Homebrew.swift in Sources */,
 				9E6C73092C3D5E950056ADDC /* InstalledView.swift in Sources */,
@@ -469,21 +481,24 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Brewer/Brewer.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = "0.1.3-beta";
 				DEVELOPMENT_ASSET_PATHS = "\"Brewer/Preview Content\"";
 				DEVELOPMENT_TEAM = 96S93Z7LTG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = Brewer;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = "0.1.3-beta";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.cems.Brewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -497,21 +512,24 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Brewer/Brewer.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = "0.1.3-beta";
 				DEVELOPMENT_ASSET_PATHS = "\"Brewer/Preview Content\"";
 				DEVELOPMENT_TEAM = 96S93Z7LTG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = Brewer;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = "0.1.3-beta";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.cems.Brewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -631,6 +649,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		9E98BE4E2C3EE353006ED274 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/sindresorhus/LaunchAtLogin-Modern";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		9E7ADB592C3EE41F00F2B8CA /* LaunchAtLogin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9E98BE4E2C3EE353006ED274 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */;
+			productName = LaunchAtLogin;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 9E8CE52A2C3C545600A39146 /* Project object */;
 }

Brewer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,15 @@
+{
+  "originHash" : "aae61040c30e63b9cf0f5455365680cfeabef0aac829c0941d4d6f6180010fc9",
+  "pins" : [
+    {
+      "identity" : "launchatlogin-modern",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/sindresorhus/LaunchAtLogin-Modern",
+      "state" : {
+        "branch" : "main",
+        "revision" : "a04ec1c363be3627734f6dad757d82f5d4fa8fcc"
+      }
+    }
+  ],
+  "version" : 3
+}

Brewer/BrewerApp.swift

@@ -5,6 +5,7 @@
 //  Created by Cédric MAS on 08/07/2024.
 //
 
+import LaunchAtLogin
 import SwiftUI
 
 @main
@@ -17,6 +18,7 @@ struct BrewerApp: App {
 			if let number = Int(
 				res.trimmingCharacters(in: .whitespacesAndNewlines)), number > 0
 			{
+				print(number)
 				isUpToDate = false
 			}
 		} catch {
@@ -25,11 +27,25 @@ struct BrewerApp: App {
 	}
 
 	var body: some Scene {
-		WindowGroup {
-			EmptyView()
-		}
 		MenuBarExtra {
-			ContentView().padding()
+			VStack(spacing: 0) {
+				ContentView()
+				Form {
+					HStack {
+						LaunchAtLogin.Toggle()
+						Button {
+							NSApplication.shared.terminate(self)
+						} label: {
+							Label("Quit", systemImage: "x")
+								.symbolRenderingMode(.palette)
+								.symbolVariant(.circle)
+								.symbolVariant(.fill)
+								.foregroundStyle(.white, .red)
+						}
+						.frame(maxWidth: .infinity, alignment: .trailing)
+					}
+				}
+			}.padding()
 		} label: {
 			if isUpToDate {
 				Label("Brewer", systemImage: "sparkle.magnifyingglass")
@@ -40,6 +56,9 @@ struct BrewerApp: App {
 			}
 		}
 		.menuBarExtraStyle(.window)
+		WindowGroup {
+			EmptyView()
+		}
 	}
 
 }

Brewer/Components/UpdateButton.swift

@@ -0,0 +1,61 @@
+//
+//  UpdateButton.swift
+//  Brewer
+//
+//  Created by Cédric MAS on 10/07/2024.
+//
+
+import SwiftUI
+
+struct UpdateButton: View {
+	let name: String
+	@State private var brew = Homebrew()
+	@State private var newInfo = Homebrew()
+
+	private var updated: String? {
+		if let cask = newInfo.data?.casks.first(where: { $0.fullToken == name }
+		), !cask.outdated {
+			return cask.version
+		}
+		if let formulae = newInfo.data?.formulae.first(where: {
+			$0.fullName == name
+		}), !formulae.outdated {
+			return formulae.versions.stable
+		}
+
+		return nil
+	}
+
+	var body: some View {
+		if let newVersion = updated {
+			Text("Updated: \(newVersion)")
+		} else if brew.isLoading {
+			ProgressView()
+				.controlSize(.small)
+		} else if brew.errorMessage != nil {
+			Image(systemName: "x")
+				.symbolRenderingMode(.palette)
+				.symbolVariant(.circle)
+				.symbolVariant(.fill)
+				.foregroundStyle(.white, .red)
+		} else {
+			Button {
+				Task {
+					await brew.update(name)
+					newInfo.getInfo(on: name)
+				}
+			} label: {
+				Label(
+					"Update",
+					systemImage:
+						"arrow.counterclockwise"
+				)
+				.symbolRenderingMode(.palette)
+				.symbolVariant(.circle)
+				.symbolVariant(.fill)
+				.foregroundStyle(
+					.white, .orange)
+			}
+		}
+	}
+}

Brewer/ContentView.swift

@@ -16,16 +16,19 @@ struct ContentView: View {
 	@State private var segmentedSelection: SegementedSelection = .search
 	var body: some View {
 		NavigationStack {
-			Picker("", selection: $segmentedSelection) {
-				ForEach(SegementedSelection.allCases, id: \.self) { sel in
-					Text(sel.rawValue).tag(sel)
+			VStack {
+				Picker("", selection: $segmentedSelection) {
+					ForEach(SegementedSelection.allCases, id: \.self) { sel in
+						Text(sel.rawValue).tag(sel)
+					}
+				}.pickerStyle(.segmented)
+					.padding(.leading, -8)
+				switch segmentedSelection {
+				case .search:
+					SearchView()
+				case .installed:
+					InstalledView()
 				}
-			}.pickerStyle(.segmented)
-			switch segmentedSelection {
-			case .search:
-				SearchView()
-			case .installed:
-				InstalledView()
 			}
 		}
 	}

Brewer/InstalledView.swift

@@ -26,18 +26,7 @@ struct InstalledView: View {
 										Text(cask.name.first ?? cask.fullToken)
 										Spacer()
 										if cask.outdated {
-											Button {
-
-											} label: {
-												Label(
-													"Update",
-													systemImage:
-														"arrow.counterclockwise.circle.fill"
-												)
-												.symbolRenderingMode(.palette)
-												.foregroundStyle(
-													.white, .orange)
-											}
+											UpdateButton(name: cask.fullToken)
 										} else {
 											Text(cask.version)
 										}
@@ -65,17 +54,7 @@ struct InstalledView: View {
 									Text(formulae.fullName)
 									Spacer()
 									if formulae.outdated {
-										Button {
-
-										} label: {
-											Label(
-												"Update",
-												systemImage:
-													"arrow.counterclockwise.circle.fill"
-											)
-											.symbolRenderingMode(.palette)
-											.foregroundStyle(.white, .orange)
-										}
+										UpdateButton(name: formulae.fullName)
 									} else {
 										Text(formulae.versions.stable)
 									}
@@ -97,8 +76,8 @@ struct InstalledView: View {
 				}
 				.listStyle(.inset(alternatesRowBackgrounds: true))
 				let areOutdated =
-					data.casks.map(\.outdated).count
-					+ data.formulae.map(\.outdated).count
+					data.casks.filter(\.outdated).count
+					+ data.formulae.filter(\.outdated).count
 				let _ = UserDefaults.standard.set(
 					!(areOutdated > 0), forKey: "isUpToDate")
 				if areOutdated > 0 {

Brewer/Model/Homebrew.swift

@@ -41,7 +41,7 @@ struct Cask: Codable {
 	let url: String
 	let version: String
 	let installed: String?
-	let outdated: Bool
+	var outdated: Bool
 
 	enum CodingKeys: String, CodingKey {
 		case token, tap, name, desc, homepage, url, version, installed, outdated
@@ -191,7 +191,7 @@ class Homebrew {
 		return switch await task.result {
 		case .success(let success):
 			success
-		case .failure(let fail):
+		case .failure:
 			false
 		}
 	}
@@ -201,11 +201,9 @@ class Homebrew {
 		self.data = nil
 		let task = Task { [weak self] in
 			do {
-				let res =
-					try shell(
-						"/opt/homebrew/bin/brew uninstall \(fullToken); echo $?"
-					)
-					.trimmingCharacters(in: .whitespacesAndNewlines)
+				try shell(
+					"/opt/homebrew/bin/brew uninstall \(fullToken)"
+				)
 			} catch {
 				self?.errorMessage = error.localizedDescription
 			}
@@ -216,9 +214,35 @@ class Homebrew {
 		return switch await task.result {
 		case .success(let success):
 			success
-		case .failure(let failure):
+		case .failure:
 			false
 		}
+	}
 
+	func update(_ name: String) async -> Bool {
+		self.isLoading = true
+		self.errorMessage = nil
+		self.data = nil
+		let task = Task { [weak self] in
+			do {
+				let res = try shell(
+					"/opt/homebrew/bin/brew upgrade \(name); echo $?"
+				)
+				.trimmingCharacters(in: .whitespacesAndNewlines)
+				self?.isLoading = false
+				return res == "0"
+			} catch {
+				self?.errorMessage = error.localizedDescription
+			}
+			self?.isLoading = false
+			return false
+		}
+
+		return switch await task.result {
+		case .success(let success):
+			success
+		case .failure:
+			false
+		}
 	}
 }

Brewer/SearchView.swift

@@ -13,8 +13,6 @@ struct SearchView: View {
 	var body: some View {
 		VStack {
 			TextField("Search", text: $query)
-				.padding()
-				.padding(.bottom, 0)
 				.onSubmit {
 					brew.getInfo(on: query)
 				}