Merge pull request #194 from rivera-ernesto/better_cl_support

Improve support for OS X command line tools

.gitignore

@@ -27,3 +27,5 @@ Icon?
 .DS_Store
 Xcode/PerUserLogLevels/PerUserLogLevels/LumberjackUser.h
 Xcode/PerUserLogLevels/PerUserLogLevels/LumberjackUser.temp.h
+
+Pods

.travis.yml

@@ -32,3 +32,6 @@ script:
     - xctool -project Xcode/BenchmarkIPhone/BenchmarkIPhone.xcodeproj -scheme 'BenchmarkIPhone' -configuration Release -sdk iphonesimulator -arch i386 build
     - xctool -project Xcode/Testing/TestXcodeColors/Desktop/TestXcodeColors.xcodeproj -scheme 'TestXcodeColors'
     - xctool -project Xcode/UniversalApp/UniversalApp.xcodeproj -scheme 'UniversalApp' -configuration Release -sdk iphonesimulator -arch i386 build
+    - cd Xcode/CLI
+    - pod install
+    - xctool -workspace CLI.xcworkspace -scheme 'CLI'

CocoaLumberjack.podspec

@@ -21,6 +21,8 @@ Pod::Spec.new do |s|
 
   s.public_header_files = 'Lumberjack/**/*.h'
 
+  s.default_subspec = 'Extensions'
+
   s.subspec 'Core' do |ss|
     ss.source_files = 'Lumberjack/*.{h,m}'
   end
@@ -30,4 +32,9 @@ Pod::Spec.new do |s|
     ss.source_files = 'Lumberjack/Extensions/*.{h,m}'
   end
 
+  s.subspec 'CLI' do |ss|
+      ss.dependency 'CocoaLumberjack/Core'
+      ss.source_files = 'Lumberjack/CLI/*.{h,m}'
+  end
+
 end

Lumberjack/CLI/CLIColor.h

@@ -0,0 +1,19 @@
+//
+//  CLIColor.h
+//  CocoaLumberjack
+//
+//  Created by Ernesto Rivera on 2013/12/27.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ Simple NSColor replacement for CLI projects that don't link with AppKit
+ */
+@interface CLIColor : NSObject
+
++ (CLIColor *)colorWithCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha;
+- (void)getRed:(CGFloat *)red green:(CGFloat *)green blue:(CGFloat *)blue alpha:(CGFloat *)alpha;
+
+@end

Lumberjack/CLI/CLIColor.m

@@ -0,0 +1,34 @@
+//
+//  CLIColor.m
+//  CocoaLumberjack
+//
+//  Created by Ernesto Rivera on 2013/12/27.
+//
+//
+
+#import "CLIColor.h"
+
+@implementation CLIColor
+{
+    CGFloat _red, _green, _blue, _alpha;
+}
+
++(CLIColor *)colorWithCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha
+{
+    CLIColor * color = [CLIColor new];
+    color->_red     = red;
+    color->_green   = green;
+    color->_blue    = blue;
+    color->_alpha   = alpha;
+    return color;
+}
+
+- (void)getRed:(CGFloat *)red green:(CGFloat *)green blue:(CGFloat *)blue alpha:(CGFloat *)alpha
+{
+    if (red)    *red    = _red;
+    if (green)  *green  = _green;
+    if (blue)   *blue   = _blue;
+    if (alpha)  *alpha  = _alpha;
+}
+
+@end

Lumberjack/DDLog.m

@@ -155,7 +155,7 @@ + (void)initialize
     #else
         NSString *notificationName = nil;
 
-        if (NSApp)
+        if (NSClassFromString(@"NSApplication"))
         {
             notificationName = @"NSApplicationWillTerminateNotification";
         }
@@ -908,7 +908,7 @@ - (instancetype)initWithLogMsg:(NSString *)msg
                 #endif
                 floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_6_1 // iOS 7+ (> iOS 6.1)
             #else
-                [[NSApplication sharedApplication] respondsToSelector:@selector(occlusionState)] // OS X 10.9+
+                [NSTimer instancesRespondToSelector:@selector(tolerance)] // OS X 10.9+
             #endif
             ) {
             queueLabel = dd_str_copy(dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL));
@@ -925,7 +925,7 @@ - (instancetype)initWithLogMsg:(NSString *)msg
             #endif
             floor(NSFoundationVersionNumber) < NSFoundationVersionNumber_iOS_6_0 // < iOS 6.0
         #else
-            ![[NSApplication sharedApplication] respondsToSelector:@selector(occlusionState)] // < OS X 10.9
+            ![NSTimer instancesRespondToSelector:@selector(tolerance)] // < OS X 10.9
         #endif
             ) {
             #pragma clang diagnostic push

Lumberjack/DDTTYLogger.h

@@ -1,8 +1,10 @@
 #import <Foundation/Foundation.h>
 #if TARGET_OS_IPHONE
-#import <UIKit/UIColor.h>
+#import <UIKit/UIColor.h>   // iOS
+#elif !defined (COCOAPODS_POD_AVAILABLE_CocoaLumberjack_CLI)
+#import <AppKit/NSColor.h>  // OS X with AppKit
 #else
-#import <AppKit/NSColor.h>
+#import "CLIColor.h"        // OS X without AppKit
 #endif
 
 #import "DDLog.h"
@@ -109,8 +111,10 @@
 **/
 #if TARGET_OS_IPHONE
 - (void)setForegroundColor:(UIColor *)txtColor backgroundColor:(UIColor *)bgColor forFlag:(int)mask;
-#else
+#elif !defined (COCOAPODS_POD_AVAILABLE_CocoaLumberjack_CLI)
 - (void)setForegroundColor:(NSColor *)txtColor backgroundColor:(NSColor *)bgColor forFlag:(int)mask;
+#else
+- (void)setForegroundColor:(CLIColor *)txtColor backgroundColor:(CLIColor *)bgColor forFlag:(int)mask;
 #endif
 
 /**
@@ -126,8 +130,10 @@
 **/
 #if TARGET_OS_IPHONE
 - (void)setForegroundColor:(UIColor *)txtColor backgroundColor:(UIColor *)bgColor forFlag:(int)mask context:(int)ctxt;
-#else
+#elif !defined (COCOAPODS_POD_AVAILABLE_CocoaLumberjack_CLI)
 - (void)setForegroundColor:(NSColor *)txtColor backgroundColor:(NSColor *)bgColor forFlag:(int)mask context:(int)ctxt;
+#else
+- (void)setForegroundColor:(CLIColor *)txtColor backgroundColor:(CLIColor *)bgColor forFlag:(int)mask context:(int)ctxt;
 #endif
 
 /**
@@ -144,6 +150,8 @@
  *   UIColor *purple = [UIColor colorWithRed:(64/255.0) green:(0/255.0) blue:(128/255.0) alpha:1.0];
  * #else
  *   NSColor *purple = [NSColor colorWithCalibratedRed:(64/255.0) green:(0/255.0) blue:(128/255.0) alpha:1.0];
+ *
+ * Note: For CLI OS X projects that don't link with AppKit use CLIColor objects instead
  * 
  * [[DDTTYLogger sharedInstance] setForegroundColor:purple backgroundColor:nil forTag:PurpleTag];
  * [DDLog addLogger:[DDTTYLogger sharedInstance]];
@@ -154,8 +162,10 @@
 **/
 #if TARGET_OS_IPHONE
 - (void)setForegroundColor:(UIColor *)txtColor backgroundColor:(UIColor *)bgColor forTag:(id <NSCopying>)tag;
-#else
+#elif !defined (COCOAPODS_POD_AVAILABLE_CocoaLumberjack_CLI)
 - (void)setForegroundColor:(NSColor *)txtColor backgroundColor:(NSColor *)bgColor forTag:(id <NSCopying>)tag;
+#else
+- (void)setForegroundColor:(CLIColor *)txtColor backgroundColor:(CLIColor *)bgColor forTag:(id <NSCopying>)tag;
 #endif
 
 /**

Lumberjack/DDTTYLogger.m

@@ -65,15 +65,14 @@
 // Some simple defines to make life easier on ourself
 
 #if TARGET_OS_IPHONE
+  #define OSColor UIColor
   #define MakeColor(r, g, b) [UIColor colorWithRed:(r/255.0f) green:(g/255.0f) blue:(b/255.0f) alpha:1.0f]
-#else
+#elif !defined (COCOAPODS_POD_AVAILABLE_CocoaLumberjack_CLI)
+  #define OSColor NSColor
   #define MakeColor(r, g, b) [NSColor colorWithCalibratedRed:(r/255.0f) green:(g/255.0f) blue:(b/255.0f) alpha:1.0f]
-#endif
-
-#if TARGET_OS_IPHONE
-  #define OSColor UIColor
 #else
-  #define OSColor NSColor
+  #define OSColor CLIColor
+  #define MakeColor(r, g, b) [CLIColor colorWithCalibratedRed:(r/255.0f) green:(g/255.0f) blue:(b/255.0f) alpha:1.0f]
 #endif
 
 // If running in a shell, not all RGB colors will be supported.
@@ -702,14 +701,20 @@ + (void)getRed:(CGFloat *)rPtr green:(CGFloat *)gPtr blue:(CGFloat *)bPtr fromCo
         CGColorSpaceRelease(rgbColorSpace);
     }
 
-    #else
+    #elif !defined (COCOAPODS_POD_AVAILABLE_CocoaLumberjack_CLI)
 
-    // Mac OS X
+    // OS X with AppKit
 
     NSColor *safeColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 
     [safeColor getRed:rPtr green:gPtr blue:bPtr alpha:NULL];
 
+    #else
+
+    // OS X without AppKit
+
+    [color getRed:rPtr green:gPtr blue:bPtr alpha:NULL];
+
     #endif
 }