cleaned up.. virtually ready for submission

Author: mralexgray

DVTCompatibilitizer.h

@@ -1,5 +1,6 @@
 
 @import Foundation;
+@import CoreServices;
 
 @interface DVTCompatibilitizer : NSObject
 
@@ -11,3 +12,11 @@
 +      (void) watchAndFixPluginsAsNeeded;
 
 @end
+
+#define kCompatibilityUUIDKey @"DVTPlugInCompatibilityUUID"
+#define kCompatibilityUUIDsKey  kCompatibilityUUIDKey @"s"
+#define kInfoPlistComponent @"Contents/Info.plist"
+#define FM NSFileManager.defaultManager
+
+#define kPluginsDirectoryPath @"~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/"
+#define kXcodePluginSuffix @".xcplugin"

DVTCompatibilitizer.m

@@ -1,44 +1,67 @@
 
-@import CoreServices;
-
 #import "DVTCompatibilitizer.h"
 
-#define kCompatibilityUUIDKey @"DVTPlugInCompatibilityUUID"
-#define kCompatibilityUUIDsKey  kCompatibilityUUIDKey @"s"
-#define kInfoPlistComponent @"Contents/Info.plist"
-#define FM NSFileManager.defaultManager
+@implementation DVTCompatibilitizer
 
-#define kPluginsDirectoryPath @"~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/"
-#define kXcodePluginSuffix @".xcplugin"
++ (void) watchAndFixPluginsAsNeeded {
 
-//#define  NSLog(...)  (void)fprintf(stderr,"%s\n",[NSString stringWithFormat:__VA_ARGS__,nil].UTF8String)
+  NSArray * pathsToWatch = [self.installedXcodes arrayByAddingObjectsFromArray:@[self.pluginsDirectoryPath]];
 
-@implementation DVTCompatibilitizer
+	CFAbsoluteTime latency = 10.;
+  FSEventStreamContext *callbackInfo = NULL;
+  FSEventStreamRef stream = FSEventStreamCreate(NULL, &_mycallback, callbackInfo,
+                                               (__bridge CFArrayRef)pathsToWatch,
+																									 kFSEventStreamEventIdSinceNow, /* Or a previous event ID */
+																																				 latency,
+																									 kFSEventStreamCreateFlagNone); /* Flags explained in reference */
 
-#pragma mark - Utility
+   FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+   FSEventStreamStart(stream);
+   CFRunLoopRun();
+}
 
-static NSArray * xcodes = nil,
-                * uuids = nil,
-                * plugs = nil;
-static NSString * plugPath = nil;
++ (void) fixPlugins {
 
+  NSMutableArray *fixed = @[].mutableCopy;
 
-+ (BOOL) _keysAreOK: (NSArray*) testing {
+  for (id x in self.installedPlugins) {
 
-  return ![self.allCompatibilityUUIDs filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id  _Nonnull evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
-    return ![testing containsObject:evaluatedObject];
-  }]].count && [NSSet setWithArray:testing].allObjects.count == testing.count;
-}
+    id plpath = [[self.pluginsDirectoryPath stringByAppendingPathComponent:x] stringByAppendingPathComponent:kInfoPlistComponent];
 
-+ (NSString*) _cuuidsForXcode:(NSString*)path {
+    if (![FM fileExistsAtPath:plpath]) {
 
-  NSString *info = [path stringByAppendingPathComponent:kInfoPlistComponent];
-  return [NSDictionary dictionaryWithContentsOfFile:info][kCompatibilityUUIDKey];
+      NSLog(@"WARNING: Skipped %@, as it was missing.", plpath);
+			continue;
+		}
+
+    NSMutableDictionary *d = [NSMutableDictionary dictionaryWithContentsOfFile:plpath];
+
+		id a = d[kCompatibilityUUIDsKey];
+
+    if (a && [a count] && [self _keysAreOK:a]) {
+
+      NSLog(@"NOT fixing: %@... It's already ok!", x);
+      continue;
+    }
+
+		a = a ? [a mutableCopy] : @[].mutableCopy;
+
+    [a addObjectsFromArray:self.allCompatibilityUUIDs];
+
+    d[kCompatibilityUUIDsKey] = [NSSet setWithArray:a].allObjects;
+
+    BOOL ok = [d writeToFile:plpath atomically:YES];
+
+    ok ? [fixed addObject:[x stringByDeletingPathExtension]] : nil;
+
+    NSLog(@"%@: %@", ok ? @"FIXED" : @"FAILED TO FIX", x);
+  }
+  [self _notify: fixed.count ? [fixed componentsJoinedByString:@" "] : @"All Plugins OK"];
 }
 
-#pragma mark - public
+#pragma mark - Static Info Fetchers
 
-+ (NSArray*) installedPlugins {
++ (NSArray*) installedPlugins { static NSArray * plugs;
 
   return plugs = plugs ?: ({
     NSError* error = nil;
@@ -50,7 +73,7 @@ + (NSArray*) installedPlugins {
   });
 }
 
-+ (NSArray*) allCompatibilityUUIDs {
++ (NSArray*) allCompatibilityUUIDs { static NSArray * uuids;
 
   return uuids = uuids ?: ({
     NSMutableArray *pot = @[].mutableCopy;
@@ -62,56 +85,52 @@ + (NSArray*) allCompatibilityUUIDs {
   });
 }
 
-+ (NSArray *) installedXcodes {
++ (NSArray*) installedXcodes { static NSArray * xcodes;
 
   return xcodes = xcodes ?: ({
     CFArrayRef result = LSCopyApplicationURLsForBundleIdentifier(CFSTR("com.apple.dt.Xcode"), nil);
     !result ? nil : [(__bridge NSArray*) result valueForKeyPath:@"path"];
   });
 }
 
-+ (void) fixPlugins {
++ (NSString*) pluginsDirectoryPath { static NSString * plugPath;
 
-  NSMutableArray *fixed = @[].mutableCopy;
+  return plugPath = plugPath ?: [NSURL fileURLWithPath:kPluginsDirectoryPath.stringByStandardizingPath.stringByResolvingSymlinksInPath.stringByExpandingTildeInPath isDirectory:YES].path;
+}
 
-  for (id x in self.installedPlugins) {
+#pragma mark - Utility
 
-    id plpath = [[self.pluginsDirectoryPath stringByAppendingPathComponent:x] stringByAppendingPathComponent:kInfoPlistComponent];
-    if (![FM fileExistsAtPath:plpath]) {
-      NSLog(@"WARNING: Skipped %@, as it was missing.", plpath);
-      continue;
-    }
++ (void) _notify:(NSString*) reason {  // Posts notifications on our behalf!
 
-    NSMutableDictionary *d = [NSMutableDictionary dictionaryWithContentsOfFile:plpath];
-    id a = d[kCompatibilityUUIDsKey];
+  id notifier = [[[NSBundle bundleForClass:self]
+								pathForAuxiliaryExecutable:@"DVTCompatibilitizer.notfier.app"]
+						stringByAppendingPathComponent:@"Contents/MacOS/applet"];
 
-    if (a && [a count] && [self _keysAreOK:a]) {
-      NSLog(@"NOT fixing: %@... It's already ok!", x);
-      continue;
-    }
-    a = a ? [a mutableCopy] : @[].mutableCopy;
-    [a addObjectsFromArray:self.allCompatibilityUUIDs];
-    d[kCompatibilityUUIDsKey] = [NSSet setWithArray:a].allObjects;
-    BOOL ok = [d writeToFile:plpath atomically:YES];
-    ok ? [fixed addObject:[x stringByDeletingPathExtension]] : nil;
-    NSLog(@"%@: %@", ok ? @"FIXED" : @"FAILED TO FIX", x);
-  }
-  [self _notify: fixed.count ? [fixed componentsJoinedByString:@" "] : @"All Plugins OK"];
+  system([[NSString stringWithFormat:@"title=\"%@\" message=\"%@\" \"%@\"", NSStringFromClass(self),
+																																						reason ?: @"DVTCompatibilitized!",
+																																						notifier] UTF8String]);
 }
 
-+ (NSString*) pluginsDirectoryPath
-{
-  return plugPath = plugPath ?: [NSURL fileURLWithPath:kPluginsDirectoryPath.stringByStandardizingPath.stringByResolvingSymlinksInPath.stringByExpandingTildeInPath isDirectory:YES].path;
++ (BOOL) _keysAreOK: (NSArray*) testing {
+
+  return ![self.allCompatibilityUUIDs filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id  _Nonnull evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
+    return ![testing containsObject:evaluatedObject];
+  }]].count && [NSSet setWithArray:testing].allObjects.count == testing.count;
+}
+
++ (NSString*) _cuuidsForXcode:(NSString*)path {
+
+  NSString *info = [path stringByAppendingPathComponent:kInfoPlistComponent];
+  return [NSDictionary dictionaryWithContentsOfFile:info][kCompatibilityUUIDKey];
 }
 
-void mycallback(
-  ConstFSEventStreamRef streamRef,
-  void *clientCallBackInfo,
-  size_t numEvents,
-  void *eventPaths,
+void _mycallback(
+  ConstFSEventStreamRef            streamRef,
+  void *                  clientCallBackInfo,
+  size_t                           numEvents,
+  void *                          eventPaths,
   const FSEventStreamEventFlags eventFlags[],
-  const FSEventStreamEventId eventIds[])
-{
+  const FSEventStreamEventId      eventIds[]) {
 
   NSLog(@"Fixing plugins due to some change!\n");
   BOOL needsFix = YES;
@@ -125,41 +144,4 @@ void mycallback(
   needsFix ? [DVTCompatibilitizer fixPlugins] : nil;
 }
 
-+ (void) _notify:(NSString*) reason {
-
-
-
-  id notifier = [[[NSBundle bundleForClass:self] pathForAuxiliaryExecutable:@"DVTCompatibilitizer.notfier.app"] stringByAppendingPathComponent:@"Contents/MacOS/applet"];
-  id title = NSStringFromClass(self);
-  id r = reason ?: @"DVTCompatibilitized!";
-  id cmd = [NSString stringWithFormat:@"title=\"%@\" message=\"%@\" \"%@\"", title, r, notifier];
-  NSLog(@"running: %@", cmd);
-  system([cmd UTF8String]);
-//    NSUserNotification *notification = NSUserNotification.new;
-//    notification.title = NSStringFromClass(self);
-//    notification.informativeText = r;
-//    notification.soundName = @"Sosumi";
-//    [NSUserNotificationCenter.defaultUserNotificationCenter deliverNotification:notification];
-}
-
-+ (void) watchAndFixPluginsAsNeeded {
-
-  NSArray *paths = [self.installedXcodes arrayByAddingObjectsFromArray:@[self.pluginsDirectoryPath]];
-
-  // CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void **)&mypath, 1, NULL);
-  FSEventStreamContext *callbackInfo = NULL;
-
-  CFAbsoluteTime latency = 10.;
-  FSEventStreamRef stream = FSEventStreamCreate(NULL, &mycallback, callbackInfo,
-                                               (__bridge CFArrayRef)paths,
-                  kFSEventStreamEventIdSinceNow, /* Or a previous event ID */
-                                                latency,
-                   kFSEventStreamCreateFlagNone); /* Flags explained in reference */
-
-   FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
-   FSEventStreamStart(stream);
-   CFRunLoopRun();
-}
-
 @end
-

DVTPlugInCompatibilityUUIDifier.xcodeproj/project.pbxproj

@@ -67,6 +67,7 @@
 		7B6A680F1BE046D80023C7D8 /* NSFileManger+Privileged.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileManger+Privileged.m"; sourceTree = "<group>"; };
 		7B6A68101BE046D80023C7D8 /* NSString+ah_versionCompare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+ah_versionCompare.h"; sourceTree = "<group>"; };
 		7B6A68111BE046D80023C7D8 /* NSString+ah_versionCompare.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+ah_versionCompare.m"; sourceTree = "<group>"; };
+		7B89A34A1C1F1AB0000ADD8D /* scratch */ = {isa = PBXFileReference; lastKnownFileType = text; path = scratch; sourceTree = "<group>"; };
 		7B91FE901BE023E200F3BF55 /* DVTCompatibilitizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTCompatibilitizer.h; sourceTree = "<group>"; };
 		7B91FE911BE023E200F3BF55 /* DVTCompatibilitizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DVTCompatibilitizer.m; sourceTree = "<group>"; };
 		7B953EEE1BE00F0500EB7F15 /* DVTPlugInCompatibilityUUIDifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DVTPlugInCompatibilityUUIDifier.m; sourceTree = "<group>"; };
@@ -80,6 +81,7 @@
 			children = (
 				7B91FE901BE023E200F3BF55 /* DVTCompatibilitizer.h */,
 				7B91FE911BE023E200F3BF55 /* DVTCompatibilitizer.m */,
+				7B89A34A1C1F1AB0000ADD8D /* scratch */,
 				7B953EEE1BE00F0500EB7F15 /* DVTPlugInCompatibilityUUIDifier.m */,
 				7B6A67C41BE02C980023C7D8 /* DVTPlugInCompatibilityWatchdog.m */,
 				7B2153381BE0BE2B00BDE9AE /* Support */,

DVTPlugInCompatibilityUUIDifier.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -3,17 +3,21 @@
 
 ![Sreneity Now](https://github.com/mralexgray/DVTPlugInCompatibilityUUIDifier/raw/master/Screenshots/alcatraz.art.png)
 
-## _Permanent, automatic, and hassle-free_ Xcode upgrades.
+## _Permanent, automatic, and hassle-free_ `Xcode`/`Alcatraz` "compatibility" upgrades.
 
-- [x] Are you *sick and tired* of thinking about / dealing with Alcatraz / all your Xcode plugins breaking with each Xcode release?
+- [x] Are you *sick and tired* of thinking about / dealing with `Alcatraz` / all your `Xcode` plugins breaking with each `Xcode` release?
 
-- [x] Have you tried those other hacks, and still you can't keep up with all the compatibility UUID's?
+- [x] Have you tried those other hacks, and still you can't keep up with all the compatibility UUID's, aka `DVTPlugInCompatibilityUUIDs`?
 
-- [x] Does the fact that Alcatraz doesn't do this automcatically make you want to jump off a cliff?
+- [x] Does the fact that `Alcatraz` doesn't do this automcatically make you want to _jump off a cliff_?
 
 ### Stop the insanity!!
 
-Through the magic of science, the ever-incompatible [`Alcatraz`](http://alcatraz.io) (and all it's little friends) will now "magically" BE compatible.  Wow.  Imagine.  If something doesn't work, don't cry!  *Just delete the offending plugin-in* from ``~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/` and move on!  You can always just install it later (now that you can depend on ALcatraz being around!)  
+Through the _magic of science_, the _ever-incompatible_ [`Alcatraz`](http://alcatraz.io) (and all it's little friends) will now "magically" BE compatible.  Wow.  Imagine.  If something doesn't work, don't cry!  *Just delete the offending plugin-in* from 
+
+    ~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/
+		
+and move on!  You can _always just install it later_ (now that you CAN depend on ALcatraz being available, via this plugin!)  
 
 ### Mo' Xcode's.. Mo' Problems..
 
@@ -29,7 +33,6 @@ Through the magic of science, the ever-incompatible [`Alcatraz`](http://alcatraz
 
 **Behold**
 
-
 ![Screenshot](https://github.com/mralexgray/DVTPlugInCompatibilityUUIDifier/raw/master/Screenshots/notification.png "Notifications!")
 
 ## Installation
@@ -38,11 +41,26 @@ Simply build this Xcode project once and restart Xcode. You can delete the proje
 
 If you get a "Permission Denied" error while building, please see [this issue](https://github.com/omz/ColorSense-for-Xcode/issues/1) of the great [ColorSense plugin](https://github.com/omz/ColorSense-for-Xcode/).
 
+The plugin automatically registers a LaunchAgent with `launchd`, which keeps 
+ 
+    ~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/DVTPlugInCompatibilityUUIDifier.xcplugin/Contents/MacOS/DVTPlugInCompatibilityWatchdog
+
+ running for you, unassisted!  `DVTPlugInCompatibilityWatchdog` is the little macgic helper that makes sure you can ALWAYS be up and running with ALL your plugins/Alcatraz, no matter what!
+
+![Screenshot](https://github.com/mralexgray/DVTPlugInCompatibilityUUIDifier/raw/master/Screenshots/xcode.hates.you.png "WAAAA. No cooties!")
+
+**Make sure to always <kbd>Load Bundles</kbd> when prompted by _prissy/cooties-averse/xenophobic_ `Xcode`.**
 
 ## Uninstall
 
-In Xcode, go to *Plugins > JDPluginManager > Uninstall* and restart Xcode afterwards.
+Either manually delete 
+
+    ~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/DVTPlugInCompatibilityUUIDifier.xcplugin
+
+or use the great [JDPluginManager](https://github.com/jaydee3/JDPluginManager), and within `Xcode`, just go to <kbd>Plugins</kbd> `>` <kbd>DVTPlugInCompatibilityUUIDifier</kbd> `>` <kbd>Uninstall</kbd> 
+
+and restart `Xcode`.
 
 ## Twitter
 
-I'm [@jaydee3](http://twitter.com/jaydee3) on Twitter. Please [tweet](https://twitter.com/intent/tweet?button_hashtag=JDPluginManager&text=This%20plugin%20manages%20Xcode%20plugins!%20Easy%20installing%20and%20uninstalling%20for%20plugins!%20https%3A%2F%2Fgithub.com%2Fjaydee3%2FJDPluginManager&via=jaydee3) about the plugin. 
+I'm [@mralexgray](http://twitter.com/mralexgray) on Twitter. Please [tweet](https://twitter.com/intent/tweet?button_hashtag=DVTPlugInCompatibilityUUIDifier&text=Permanent%2C+automatic%2C+and+hassle-free+Xcode%2FAlcatraz+upgrades.%20http%3A%2F%2Flinks.mrgray.com%2FMoPluginsMoProblems&via=mralexgray) about the plugin.