Entire roundtrip

Author: jaapmengers

ComputeInstanceStatus/AppDelegate.swift

@@ -22,48 +22,92 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
   var statusItem: NSStatusItem!
   let popover = NSPopover()
+  let menu = NSMenu(title: "Menu")
+  let statusMenuItem = NSMenuItem(title: "Status unknown", action: nil, keyEquivalent: "")
+  let startMenuItem = NSMenuItem(title: "Start", action: #selector(start), keyEquivalent: "")
+  let stopMenuItem = NSMenuItem(title: "Stop", action: #selector(stop), keyEquivalent: "")
 
   var lastStatus: Status? = nil {
     didSet {
       switch lastStatus {
       case .some(.running):
         statusItem.button?.title = "🌝"
+        statusMenuItem.title = "Running"
+        startMenuItem.isHidden = true
+        stopMenuItem.isHidden = false
       case .some(.staging):
         statusItem.button?.title = "🌜"
+        statusMenuItem.title = "Staging"
+        startMenuItem.isHidden = true
+        stopMenuItem.isHidden = false
       case .some(.stopping):
         statusItem.button?.title = "🌛"
+        statusMenuItem.title = "Stopping"
+        startMenuItem.isHidden = true
+        stopMenuItem.isHidden = true
+      case .some(.terminated):
+        statusItem.button?.title = "🌚"
+        statusMenuItem.title = "Terminated"
+        startMenuItem.isHidden = false
+        stopMenuItem.isHidden = true
       default:
         statusItem.button?.title = "🌚"
+        statusMenuItem.title = "Status unknown"
+        startMenuItem.isHidden = true
+        stopMenuItem.isHidden = true
       }
     }
   }
-
+  
   func applicationDidFinishLaunching(_ aNotification: Notification) {
-    
     statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
+    statusMenuItem.isEnabled = false
 
-    let menu = NSMenu(title: "Menu")
+    startMenuItem.isHidden = true
+    stopMenuItem.isHidden = true
+    
+    menu.addItem(statusMenuItem)
+    menu.addItem(NSMenuItem.separator())
+    menu.addItem(startMenuItem)
+    menu.addItem(stopMenuItem)
     menu.addItem(withTitle: "Preferences", action: #selector(openPreferences), keyEquivalent: "")
 
     statusItem.button?.title = "🌚"
     statusItem.button?.target = self
     statusItem.menu = menu
 
-//    Timer.scheduledTimer(withTimeInterval: 10, repeats: true) { [weak self] _ in
-//      GCPService.getInstanceState().then { [weak self] status in
-//        self?.lastStatus = status
-//      }.trap { err in
-//        print("Error: \(err)")
-//      }
-//    }
+    Timer.scheduledTimer(withTimeInterval: 10, repeats: true) { [weak self] _ in
+     self?.runCommand(command: "status")
+    }
   }
 
+  @objc func start() {
+    runCommand(command: "start")
+  }
+  
+  @objc func stop(){
+    runCommand(command: "stop")
+  }
 
   @objc func openPreferences() {
     let vc = PreferencesViewController.instantiate()
     let window = NSWindow(contentViewController: vc)
     window.title = "Preferences"
     window.orderFront(nil)
   }
+  
+  private func runCommand(command: String) {
+    guard let serviceAccountPath = UserDefaultsService.serviceAccountFileBookmark,
+      let zone = UserDefaultsService.zone,
+      let instanceName = UserDefaultsService.instanceName
+      else { return }
+    
+    GCPService.runCommand(serviceAccountPath.path, zone, instanceName, command)
+      .then { [weak self] status in
+        self?.lastStatus = status
+    }.trap { err in
+      print("Error: \(err)")
+    }
+  }
 }
 

ComputeInstanceStatus/GCPService.swift

@@ -11,7 +11,7 @@ import Promissum
 
 class GCPService {
 
-  static func getInstanceState(_ serviceAccountPath: String, _ zone: String, _ instanceName: String) -> Promise<Status, Error> {
+  static func runCommand(_ serviceAccountPath: String, _ zone: String, _ instanceName: String, _ command: String = "status") -> Promise<Status, Error> {
     guard
       let cliPath = Bundle.main.path(forResource: "index-macos", ofType: nil)
       else {
@@ -23,7 +23,7 @@ class GCPService {
     DispatchQueue.global(qos: .background).async {
       let task = Process()
       task.launchPath = cliPath
-      task.arguments = ["status", "-z", zone, "-i", instanceName]
+      task.arguments =  [command, "-z", zone, "-i", instanceName]
       task.environment = ["GOOGLE_APPLICATION_CREDENTIALS": serviceAccountPath]
 
       let pipe = Pipe()

ComputeInstanceStatus/PreferencesViewController.swift

@@ -55,15 +55,10 @@ class PreferencesViewController: NSViewController, NSTextFieldDelegate {
       return
     }
 
-    do {
-      self.serviceAccountFileBookmark = url
-    } catch {
-      print("Don't handle this for now")
-    }
+    self.serviceAccountFileBookmark = url
   }
 
   @IBAction func didTouchTestConnection(_ sender: Any) {
-    var isStale = false
     guard
       let serviceAccountFileBookmark = serviceAccountFileBookmark,
       let zone = zone,
@@ -73,7 +68,7 @@ class PreferencesViewController: NSViewController, NSTextFieldDelegate {
     self.imageView.isHidden = true
     progressIndicator.startAnimation(nil)
 
-    GCPService.getInstanceState(serviceAccountFileBookmark.path, zone, instanceName)
+    GCPService.runCommand(serviceAccountFileBookmark.path, zone, instanceName)
       .then { [weak self] state in
         self?.imageView.isHidden = false
         self?.imageView.image = NSImage(named: "NSStatusAvailable")