Merge pull request #2 from andrewn/feature/new-icon

New icon

BrewServicesMenubar.xcodeproj/project.pbxproj

@@ -90,6 +90,7 @@
 				TargetAttributes = {
 					49ED77AD1CD4B524000B4479 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0820;
 					};
 				};
 			};
@@ -237,6 +238,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = andrewnicolaou.BrewServicesMenubar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -249,6 +251,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = andrewnicolaou.BrewServicesMenubar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -271,6 +274,7 @@
 				49ED77BD1CD4B525000B4479 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

BrewServicesMenubar/AppDelegate.swift

@@ -13,13 +13,13 @@ struct Service {
     var state = "unknown" // "started", "stopped", "unknown"
 }
 
-func matchesForRegexInText(regex: String!, text: String!) -> [String] {
+func matchesForRegexInText(_ regex: String!, text: String!) -> [String] {
     do {
         let regex = try NSRegularExpression(pattern: regex, options: [])
         let nsString = text as NSString
-        let results = regex.matchesInString(text,
+        let results = regex.matches(in: text,
                                             options: [], range: NSMakeRange(0, nsString.length))
-        return results.map { nsString.substringWithRange($0.range)}
+        return results.map { nsString.substring(with: $0.range)}
     } catch let error as NSError {
         print("invalid regex: \(error.localizedDescription)")
         return []
@@ -34,11 +34,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @IBOutlet weak var statusMenu: NSMenu!
 
     // Returns a status item from the system menu bar of variable length
-    let statusItem = NSStatusBar.systemStatusBar().statusItemWithLength(-1)
+    let statusItem = NSStatusBar.system().statusItem(withLength: -1)
     var services = [Service]()
 
-    func applicationDidFinishLaunching(aNotification: NSNotification) {
-        let icon = NSImage(named: "statusIcon")
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        let icon = NSImage(named: "icon")
+        icon?.isTemplate = true
 
         if let button = statusItem.button {
             button.image = icon
@@ -48,14 +49,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         queryServicesAndUpdateMenu()
     }
 
-    func applicationWillTerminate(aNotification: NSNotification) {
+    func applicationWillTerminate(_ aNotification: Notification) {
         // Insert code here to tear down your application
     }
 
     //
     // Event handlers for UI actions
     //
-    func handleClick(sender: NSMenuItem) {
+    func handleClick(_ sender: NSMenuItem) {
         if (sender.state == NSOnState) {
             sender.state = NSOffState
             controlService(sender.title, state: "stop")
@@ -65,13 +66,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
-    func handleQuit(sender: NSMenuItem) {
-        NSApplication.sharedApplication().terminate(nil)
+    func handleQuit(_ sender: NSMenuItem) {
+        NSApplication.shared().terminate(nil)
     }
 
-    func handleMenuOpen(sender: AnyObject?) {
+    func handleMenuOpen(_ sender: AnyObject?) {
         queryServicesAndUpdateMenu()
-        statusItem.popUpStatusItemMenu(statusMenu)
+        statusItem.popUpMenu(statusMenu)
     }
 
     //
@@ -86,7 +87,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             }
             statusMenu.addItem(item)
         }
-        statusMenu.addItem(NSMenuItem.separatorItem())
+        statusMenu.addItem(NSMenuItem.separator())
         let quit = NSMenuItem.init(title: "Quit", action:#selector(AppDelegate.handleQuit(_:)), keyEquivalent: "q")
         statusMenu.addItem(quit)
     }
@@ -99,9 +100,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     //
     // Changes a service state
     //
-    func controlService(name:String, state:String) {
-        let task = NSTask()
-        let outpipe = NSPipe()
+    func controlService(_ name:String, state:String) {
+        let task = Process()
+        let outpipe = Pipe()
         task.standardOutput = outpipe
 
         task.launchPath = "/usr/local/bin/brew"
@@ -114,17 +115,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     //      brew services list
     //
     func serviceStates() -> [Service] {
-        let task = NSTask()
-        let outpipe = NSPipe()
+        let task = Process()
+        let outpipe = Pipe()
         task.standardOutput = outpipe
 
         task.launchPath = "/usr/local/bin/brew"
         task.arguments = ["services", "list"]
         task.launch()
 
         let outdata = outpipe.fileHandleForReading.readDataToEndOfFile()
-        if var string = String.fromCString(UnsafePointer(outdata.bytes)) {
-            string = string.stringByTrimmingCharactersInSet(NSCharacterSet.newlineCharacterSet())
+        if var string = String(data: outdata, encoding: String.Encoding.utf8) {
+            string = string.trimmingCharacters(in: CharacterSet.newlines)
             return parseServiceList(string)
         }
 
@@ -133,12 +134,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     let matcher = "([^ ]+)([^ ]+)"
 
-    func parseServiceList(raw: String) -> [Service] {
-        let rawServices = raw.componentsSeparatedByString("\n")
+    func parseServiceList(_ raw: String) -> [Service] {
+        let rawServices = raw.components(separatedBy: "\n")
         return rawServices[1..<rawServices.count].map(parseService)
     }
 
-    func parseService(raw:String) -> Service {
+    func parseService(_ raw:String) -> Service {
         let parts = matchesForRegexInText(matcher, text: raw)
         let service = Service(name: parts[0], state: parts[1])
         return service;

BrewServicesMenubar/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -41,13 +41,15 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "appIcon.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "[email protected]",
       "scale" : "2x"
     }
   ],

BrewServicesMenubar/Assets.xcassets/statusIcon.imageset/Contents.json → BrewServicesMenubar/Assets.xcassets/icon.imageset/Contents.json

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "icon.png",
+      "filename" : "icon.pdf",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

README.md

@@ -0,0 +1,17 @@
+brew-services-menubar
+===
+
+An OS X menu item for starting and stopping homebrew services Edit.
+
+This reads the [homebrew-services](https://github.com/Homebrew/homebrew-services) command 
+
+![Screenshot](docs/screenshot.png)
+
+## Install
+
+1. Install [homebrew-services](https://github.com/Homebrew/homebrew-services)
+2. Download from the [Releases](https://github.com/andrewn/brew-services-menubar/releases) page.
+
+## License
+
+Icon is [Beer by Enemen from the Noun Project](https://thenounproject.com/search/?q=beer&i=783212).