rename / add the ability to run 'sudo -K'

README.md

@@ -1,5 +1,10 @@
-#  dotBeatBar_old
+#  dotBeatBar
 
-Storyboard munubar item that display's Swatch's internet time in the menu bar:
+Menubar item that display's Swatch's internet time in the menu bar:
 
 ![Screenshot](screenshot.png)
+
+## Other features
+
+- Remove ssh keys from `ssh-agent` (`ssh-add -D`.
+- Remove `sudo` cached credentials (`sudo -K`).

dotBeatBar.xcodeproj/project.pbxproj

@@ -12,8 +12,8 @@
 		9987EE2622EBF09900C95AC0 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9987EE2522EBF09900C95AC0 /* ViewController.swift */; };
 		9987EE2822EBF09A00C95AC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9987EE2722EBF09A00C95AC0 /* Assets.xcassets */; };
 		9987EE2B22EBF09A00C95AC0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9987EE2922EBF09A00C95AC0 /* Main.storyboard */; };
-		9987EE3722EBF09A00C95AC0 /* dotBeatBar_oldTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9987EE3622EBF09A00C95AC0 /* dotBeatBar_oldTests.swift */; };
+		9987EE3722EBF09A00C95AC0 /* dotBeatBarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9987EE3622EBF09A00C95AC0 /* dotBeatBarTests.swift */; };
-		9987EE4222EBF09A00C95AC0 /* dotBeatBar_oldUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9987EE4122EBF09A00C95AC0 /* dotBeatBar_oldUITests.swift */; };
+		9987EE4222EBF09A00C95AC0 /* dotBeatBarUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9987EE4122EBF09A00C95AC0 /* dotBeatBarUITests.swift */; };
 		9987EE5422EC010E00C95AC0 /* screenshot.png in Resources */ = {isa = PBXBuildFile; fileRef = 9987EE5322EC010E00C95AC0 /* screenshot.png */; };
 /* End PBXBuildFile section */
 
@@ -23,14 +23,14 @@
 			containerPortal = 9987EE1822EBF09900C95AC0 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 9987EE1F22EBF09900C95AC0;
-			remoteInfo = dotBeatBar_old;
+			remoteInfo = dotBeatBar;
 		};
 		9987EE3E22EBF09A00C95AC0 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9987EE1822EBF09900C95AC0 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 9987EE1F22EBF09900C95AC0;
-			remoteInfo = dotBeatBar_old;
+			remoteInfo = dotBeatBar;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -41,12 +41,12 @@
 		9987EE2722EBF09A00C95AC0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		9987EE2A22EBF09A00C95AC0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		9987EE2C22EBF09A00C95AC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		9987EE2D22EBF09A00C95AC0 /* dotBeatBar_old.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = dotBeatBar_old.entitlements; sourceTree = "<group>"; };
+		9987EE2D22EBF09A00C95AC0 /* dotBeatBar.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = dotBeatBar.entitlements; sourceTree = "<group>"; };
 		9987EE3222EBF09A00C95AC0 /* dotBeatBarTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = dotBeatBarTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		9987EE3622EBF09A00C95AC0 /* dotBeatBar_oldTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dotBeatBar_oldTests.swift; sourceTree = "<group>"; };
+		9987EE3622EBF09A00C95AC0 /* dotBeatBarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dotBeatBarTests.swift; sourceTree = "<group>"; };
 		9987EE3822EBF09A00C95AC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9987EE3D22EBF09A00C95AC0 /* dotBeatBarUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = dotBeatBarUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		9987EE4122EBF09A00C95AC0 /* dotBeatBar_oldUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dotBeatBar_oldUITests.swift; sourceTree = "<group>"; };
+		9987EE4122EBF09A00C95AC0 /* dotBeatBarUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dotBeatBarUITests.swift; sourceTree = "<group>"; };
 		9987EE4322EBF09A00C95AC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9987EE5222EC00C400C95AC0 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		9987EE5322EC010E00C95AC0 /* screenshot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = screenshot.png; sourceTree = "<group>"; };
@@ -90,9 +90,9 @@
 			children = (
 				9987EE5322EC010E00C95AC0 /* screenshot.png */,
 				9987EE5222EC00C400C95AC0 /* README.md */,
-				9987EE2222EBF09900C95AC0 /* dotBeatBar_old */,
+				9987EE2222EBF09900C95AC0 /* dotBeatBar */,
-				9987EE3522EBF09A00C95AC0 /* dotBeatBar_oldTests */,
+				9987EE3522EBF09A00C95AC0 /* dotBeatBarTests */,
-				9987EE4022EBF09A00C95AC0 /* dotBeatBar_oldUITests */,
+				9987EE4022EBF09A00C95AC0 /* dotBeatBarUITests */,
 				9987EE2122EBF09900C95AC0 /* Products */,
 				9912D2F422EFC80B004A7802 /* Frameworks */,
 			);
@@ -108,7 +108,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		9987EE2222EBF09900C95AC0 /* dotBeatBar_old */ = {
+		9987EE2222EBF09900C95AC0 /* dotBeatBar */ = {
 			isa = PBXGroup;
 			children = (
 				9987EE2322EBF09900C95AC0 /* AppDelegate.swift */,
@@ -116,27 +116,27 @@
 				9987EE2722EBF09A00C95AC0 /* Assets.xcassets */,
 				9987EE2922EBF09A00C95AC0 /* Main.storyboard */,
 				9987EE2C22EBF09A00C95AC0 /* Info.plist */,
-				9987EE2D22EBF09A00C95AC0 /* dotBeatBar_old.entitlements */,
+				9987EE2D22EBF09A00C95AC0 /* dotBeatBar.entitlements */,
 			);
-			path = dotBeatBar_old;
+			path = dotBeatBar;
 			sourceTree = "<group>";
 		};
-		9987EE3522EBF09A00C95AC0 /* dotBeatBar_oldTests */ = {
+		9987EE3522EBF09A00C95AC0 /* dotBeatBarTests */ = {
 			isa = PBXGroup;
 			children = (
-				9987EE3622EBF09A00C95AC0 /* dotBeatBar_oldTests.swift */,
+				9987EE3622EBF09A00C95AC0 /* dotBeatBarTests.swift */,
 				9987EE3822EBF09A00C95AC0 /* Info.plist */,
 			);
-			path = dotBeatBar_oldTests;
+			path = dotBeatBarTests;
 			sourceTree = "<group>";
 		};
-		9987EE4022EBF09A00C95AC0 /* dotBeatBar_oldUITests */ = {
+		9987EE4022EBF09A00C95AC0 /* dotBeatBarUITests */ = {
 			isa = PBXGroup;
 			children = (
-				9987EE4122EBF09A00C95AC0 /* dotBeatBar_oldUITests.swift */,
+				9987EE4122EBF09A00C95AC0 /* dotBeatBarUITests.swift */,
 				9987EE4322EBF09A00C95AC0 /* Info.plist */,
 			);
-			path = dotBeatBar_oldUITests;
+			path = dotBeatBarUITests;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -158,7 +158,7 @@
 			packageProductDependencies = (
 				9912D2F522EFC80B004A7802 /* Beat */,
 			);
-			productName = dotBeatBar_old;
+			productName = dotBeatBar;
 			productReference = 9987EE2022EBF09900C95AC0 /* dotBeatBar.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -176,7 +176,7 @@
 				9987EE3422EBF09A00C95AC0 /* PBXTargetDependency */,
 			);
 			name = dotBeatBarTests;
-			productName = dotBeatBar_oldTests;
+			productName = dotBeatBarTests;
 			productReference = 9987EE3222EBF09A00C95AC0 /* dotBeatBarTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
@@ -194,7 +194,7 @@
 				9987EE3F22EBF09A00C95AC0 /* PBXTargetDependency */,
 			);
 			name = dotBeatBarUITests;
-			productName = dotBeatBar_oldUITests;
+			productName = dotBeatBarUITests;
 			productReference = 9987EE3D22EBF09A00C95AC0 /* dotBeatBarUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
@@ -285,7 +285,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9987EE3722EBF09A00C95AC0 /* dotBeatBar_oldTests.swift in Sources */,
+				9987EE3722EBF09A00C95AC0 /* dotBeatBarTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -293,7 +293,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9987EE4222EBF09A00C95AC0 /* dotBeatBar_oldUITests.swift in Sources */,
+				9987EE4222EBF09A00C95AC0 /* dotBeatBarUITests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -443,18 +443,18 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = dotBeatBar_old/dotBeatBar_old.entitlements;
+				CODE_SIGN_ENTITLEMENTS = dotBeatBar/dotBeatBar.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 9ZZ8BB7Y4Q;
 				ENABLE_HARDENED_RUNTIME = YES;
-				INFOPLIST_FILE = dotBeatBar_old/Info.plist;
+				INFOPLIST_FILE = dotBeatBar/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.bolddaemon.com.dotBeatBar-old";
+				PRODUCT_BUNDLE_IDENTIFIER = com.bolddaemon.com.dotBeatBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 			};
@@ -464,18 +464,18 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = dotBeatBar_old/dotBeatBar_old.entitlements;
+				CODE_SIGN_ENTITLEMENTS = dotBeatBar/dotBeatBar.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 9ZZ8BB7Y4Q;
 				ENABLE_HARDENED_RUNTIME = YES;
-				INFOPLIST_FILE = dotBeatBar_old/Info.plist;
+				INFOPLIST_FILE = dotBeatBar/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.bolddaemon.com.dotBeatBar-old";
+				PRODUCT_BUNDLE_IDENTIFIER = com.bolddaemon.com.dotBeatBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 			};
@@ -486,10 +486,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 9ZZ8BB7Y4Q;
-				INFOPLIST_FILE = dotBeatBar_oldTests/Info.plist;
+				INFOPLIST_FILE = dotBeatBarTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
@@ -507,10 +508,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 9ZZ8BB7Y4Q;
-				INFOPLIST_FILE = dotBeatBar_oldTests/Info.plist;
+				INFOPLIST_FILE = dotBeatBarTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
@@ -527,10 +529,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 9ZZ8BB7Y4Q;
-				INFOPLIST_FILE = dotBeatBar_oldUITests/Info.plist;
+				INFOPLIST_FILE = dotBeatBarUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
@@ -539,7 +542,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.bolddaemon.com.dotBeatBar-oldUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_TARGET_NAME = dotBeatBar_old;
+				TEST_TARGET_NAME = dotBeatBar;
 			};
 			name = Debug;
 		};
@@ -547,10 +550,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 9ZZ8BB7Y4Q;
-				INFOPLIST_FILE = dotBeatBar_oldUITests/Info.plist;
+				INFOPLIST_FILE = dotBeatBarUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
@@ -559,7 +563,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.bolddaemon.com.dotBeatBar-oldUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_TARGET_NAME = dotBeatBar_old;
+				TEST_TARGET_NAME = dotBeatBar;
 			};
 			name = Release;
 		};

dotBeatBar.xcodeproj/xcuserdata/qbit.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,7 +9,7 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>dotBeatBar_old.xcscheme_^#shared#^_</key>
+		<key>dotBeatBar.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>

dotBeatBar/AppDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  dotBeatBar_old
+//  dotBeatBar
 //
 //  Created by Aaron Bieber on 7/26/19.
 //  Copyright © 2019 Aaron Bieber. All rights reserved.
@@ -23,6 +23,22 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
     
+    func runTask(cmd: String, args: Array<String>) {
+        let task = Process()
+        let pipe = Pipe()
+        
+        NSLog("Running '\(cmd)' with '\(args.joined(separator: ", "))'")
+        task.executableURL = URL(fileURLWithPath: "\(cmd)")
+        task.arguments = args
+        task.standardOutput = pipe
+        task.launch()
+        
+        let data = pipe.fileHandleForReading.readDataToEndOfFile()
+        let output = NSString(data: data, encoding: String.Encoding.utf8.rawValue)
+
+        NSLog(output! as String)
+    }
+    
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         updateStatBar(self)
         timer = Timer.scheduledTimer(timeInterval: 1,
@@ -40,19 +56,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         
         _ = dnc.addObserver(forName: .init("com.apple.screenIsLocked"),
                                        object: nil, queue: .main) { _ in
-            NSLog("Screen Locked. Removing ssh-agent keys.")
+            NSLog("Screen Locked.")
-            let task = Process()
+            self.runTask(cmd: "/usr/bin/ssh-add", args: ["-D"])
-            let pipe = Pipe()
+            self.runTask(cmd: "/usr/bin/sudo", args: ["-K"])
-            
-            task.executableURL = URL(fileURLWithPath: "/usr/bin/ssh-add")
-            task.arguments = ["-D"]
-            task.standardOutput = pipe
-            task.launch()
-            
-            let data = pipe.fileHandleForReading.readDataToEndOfFile()
-            let output = NSString(data: data, encoding: String.Encoding.utf8.rawValue)
-
-            NSLog(output! as String)
         }
     }
 

dotBeatBar/Base.lproj/Main.storyboard

@@ -7,7 +7,7 @@
         <!--Application-->
         <scene sceneID="JPo-4y-FX3">
             <objects>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="dotBeatBar_old" customModuleProvider="target"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="dotBeatBar" customModuleProvider="target"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">

dotBeatBar/ViewController.swift

@@ -1,6 +1,6 @@
 //
 //  ViewController.swift
-//  dotBeatBar_old
+//  dotBeatBar
 //
 //  Created by Aaron Bieber on 7/26/19.
 //  Copyright © 2019 Aaron Bieber. All rights reserved.

dotBeatBarTests/dotBeatBarTests.swift

@@ -1,15 +1,15 @@
 //
-//  dotBeatBar_oldTests.swift
+//  dotBeatBarTests.swift
-//  dotBeatBar_oldTests
+//  dotBeatBarTests
 //
 //  Created by Aaron Bieber on 7/26/19.
 //  Copyright © 2019 Aaron Bieber. All rights reserved.
 //
 
 import XCTest
-@testable import dotBeatBar_old
+@testable import dotBeatBar
 
-class dotBeatBar_oldTests: XCTestCase {
+class dotBeatBarTests: XCTestCase {
 
     override func setUp() {
         // Put setup code here. This method is called before the invocation of each test method in the class.

dotBeatBarUITests/dotBeatBarUITests.swift

@@ -1,6 +1,6 @@
 //
-//  dotBeatBar_oldUITests.swift
+//  dotBeatBarUITests.swift
-//  dotBeatBar_oldUITests
+//  dotBeatBarUITests
 //
 //  Created by Aaron Bieber on 7/26/19.
 //  Copyright © 2019 Aaron Bieber. All rights reserved.
@@ -8,7 +8,7 @@
 
 import XCTest
 
-class dotBeatBar_oldUITests: XCTestCase {
+class dotBeatBarUITests: XCTestCase {
 
     override func setUp() {
         // Put setup code here. This method is called before the invocation of each test method in the class.