Version 1.2. Apache distribution support, bug fixes and cleanup of th…

…e codebase.

Cassandra-PrefsPane.xcodeproj/project.pbxproj

@@ -7,8 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		AD71428515BDF4E700FF90F5 /* NSString+Log.h in Headers */ = {isa = PBXBuildFile; fileRef = AD71428315BDF4E700FF90F5 /* NSString+Log.h */; };
-		AD71428615BDF4E700FF90F5 /* NSString+Log.m in Sources */ = {isa = PBXBuildFile; fileRef = AD71428415BDF4E700FF90F5 /* NSString+Log.m */; };
 		AD7142A415BE728000FF90F5 /* AutoUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = AD7142A215BE728000FF90F5 /* AutoUpdater.h */; };
 		AD7142A515BE728000FF90F5 /* AutoUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = AD7142A315BE728000FF90F5 /* AutoUpdater.m */; };
 		AD7142B415BECCA900FF90F5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD7142B315BECCA900FF90F5 /* Security.framework */; };
@@ -19,8 +17,8 @@
 		AD822B5D15B9ADD300FB0B55 /* CassandraPrefsPane.h in Headers */ = {isa = PBXBuildFile; fileRef = AD822B5015B9ADD300FB0B55 /* CassandraPrefsPane.h */; };
 		ADAF3CBB15BA9569008C79F0 /* Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = ADAF3CB915BA9569008C79F0 /* Helpers.h */; };
 		ADAF3CBC15BA9569008C79F0 /* Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = ADAF3CBA15BA9569008C79F0 /* Helpers.m */; };
-		ADAF3CCF15BC0257008C79F0 /* Helpers+Cassandra.h in Headers */ = {isa = PBXBuildFile; fileRef = ADAF3CCD15BC0257008C79F0 /* Helpers+Cassandra.h */; };
-		ADAF3CD015BC0257008C79F0 /* Helpers+Cassandra.m in Sources */ = {isa = PBXBuildFile; fileRef = ADAF3CCE15BC0257008C79F0 /* Helpers+Cassandra.m */; };
+		ADAF3CCF15BC0257008C79F0 /* Helpers+Process.h in Headers */ = {isa = PBXBuildFile; fileRef = ADAF3CCD15BC0257008C79F0 /* Helpers+Process.h */; };
+		ADAF3CD015BC0257008C79F0 /* Helpers+Process.m in Sources */ = {isa = PBXBuildFile; fileRef = ADAF3CCE15BC0257008C79F0 /* Helpers+Process.m */; };
 		ADAF3CD315BC0275008C79F0 /* Helpers+Launchd.h in Headers */ = {isa = PBXBuildFile; fileRef = ADAF3CD115BC0275008C79F0 /* Helpers+Launchd.h */; };
 		ADAF3CD415BC0275008C79F0 /* Helpers+Launchd.m in Sources */ = {isa = PBXBuildFile; fileRef = ADAF3CD215BC0275008C79F0 /* Helpers+Launchd.m */; };
 		ADAF3CD715BC0D1F008C79F0 /* Helpers+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = ADAF3CD515BC0D1F008C79F0 /* Helpers+Private.h */; };
@@ -34,8 +32,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		AD71428315BDF4E700FF90F5 /* NSString+Log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Log.h"; sourceTree = "<group>"; };
-		AD71428415BDF4E700FF90F5 /* NSString+Log.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Log.m"; sourceTree = "<group>"; };
 		AD7142A215BE728000FF90F5 /* AutoUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoUpdater.h; sourceTree = "<group>"; };
 		AD7142A315BE728000FF90F5 /* AutoUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AutoUpdater.m; sourceTree = "<group>"; };
 		AD7142B315BECCA900FF90F5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
@@ -51,8 +47,8 @@
 		AD822B5015B9ADD300FB0B55 /* CassandraPrefsPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CassandraPrefsPane.h; sourceTree = "<group>"; };
 		ADAF3CB915BA9569008C79F0 /* Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Helpers.h; sourceTree = "<group>"; };
 		ADAF3CBA15BA9569008C79F0 /* Helpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Helpers.m; sourceTree = "<group>"; };
-		ADAF3CCD15BC0257008C79F0 /* Helpers+Cassandra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Helpers+Cassandra.h"; sourceTree = "<group>"; };
-		ADAF3CCE15BC0257008C79F0 /* Helpers+Cassandra.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Helpers+Cassandra.m"; sourceTree = "<group>"; };
+		ADAF3CCD15BC0257008C79F0 /* Helpers+Process.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Helpers+Process.h"; sourceTree = "<group>"; };
+		ADAF3CCE15BC0257008C79F0 /* Helpers+Process.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Helpers+Process.m"; sourceTree = "<group>"; };
 		ADAF3CD115BC0275008C79F0 /* Helpers+Launchd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Helpers+Launchd.h"; sourceTree = "<group>"; };
 		ADAF3CD215BC0275008C79F0 /* Helpers+Launchd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Helpers+Launchd.m"; sourceTree = "<group>"; };
 		ADAF3CD515BC0D1F008C79F0 /* Helpers+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Helpers+Private.h"; sourceTree = "<group>"; };
@@ -152,14 +148,12 @@
 				AD7142BE15BFC7DA00FF90F5 /* CassandraPrefsPane.m */,
 				ADAF3CB915BA9569008C79F0 /* Helpers.h */,
 				ADAF3CBA15BA9569008C79F0 /* Helpers.m */,
-				ADAF3CCD15BC0257008C79F0 /* Helpers+Cassandra.h */,
-				ADAF3CCE15BC0257008C79F0 /* Helpers+Cassandra.m */,
+				ADAF3CCD15BC0257008C79F0 /* Helpers+Process.h */,
+				ADAF3CCE15BC0257008C79F0 /* Helpers+Process.m */,
 				ADAF3CD115BC0275008C79F0 /* Helpers+Launchd.h */,
 				ADAF3CD215BC0275008C79F0 /* Helpers+Launchd.m */,
 				ADAF3CD515BC0D1F008C79F0 /* Helpers+Private.h */,
 				ADAF3CD615BC0D1F008C79F0 /* Helpers+Private.m */,
-				AD71428315BDF4E700FF90F5 /* NSString+Log.h */,
-				AD71428415BDF4E700FF90F5 /* NSString+Log.m */,
 				AD7142A215BE728000FF90F5 /* AutoUpdater.h */,
 				AD7142A315BE728000FF90F5 /* AutoUpdater.m */,
 			);
@@ -189,10 +183,9 @@
 				AD822B5C15B9ADD300FB0B55 /* Cassandra-Prefix.pch in Headers */,
 				AD822B5D15B9ADD300FB0B55 /* CassandraPrefsPane.h in Headers */,
 				ADAF3CBB15BA9569008C79F0 /* Helpers.h in Headers */,
-				ADAF3CCF15BC0257008C79F0 /* Helpers+Cassandra.h in Headers */,
+				ADAF3CCF15BC0257008C79F0 /* Helpers+Process.h in Headers */,
 				ADAF3CD315BC0275008C79F0 /* Helpers+Launchd.h in Headers */,
 				ADAF3CD715BC0D1F008C79F0 /* Helpers+Private.h in Headers */,
-				AD71428515BDF4E700FF90F5 /* NSString+Log.h in Headers */,
 				AD7142A415BE728000FF90F5 /* AutoUpdater.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -224,8 +217,8 @@
 		AD822B1B15B9951F00FB0B55 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
-				ORGANIZATIONNAME = "Octo Technology";
+				LastUpgradeCheck = 0460;
+				ORGANIZATIONNAME = "";
 			};
 			buildConfigurationList = AD822B1E15B9951F00FB0B55 /* Build configuration list for PBXProject "Cassandra-PrefsPane" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -270,10 +263,9 @@
 			files = (
 				AD7142BD15BFC7DA00FF90F5 /* CassandraPrefsPane.m in Sources */,
 				ADAF3CBC15BA9569008C79F0 /* Helpers.m in Sources */,
-				ADAF3CD015BC0257008C79F0 /* Helpers+Cassandra.m in Sources */,
+				ADAF3CD015BC0257008C79F0 /* Helpers+Process.m in Sources */,
 				ADAF3CD415BC0275008C79F0 /* Helpers+Launchd.m in Sources */,
 				ADAF3CD815BC0D1F008C79F0 /* Helpers+Private.m in Sources */,
-				AD71428615BDF4E700FF90F5 /* NSString+Log.m in Sources */,
 				AD7142A515BE728000FF90F5 /* AutoUpdater.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -314,12 +306,15 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = NO;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -344,12 +339,15 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = NO;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -365,8 +363,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = "${inherited}";
-				CURRENT_PROJECT_VERSION = 2;
-				GCC_ENABLE_OBJC_GC = supported;
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "src/main/objc/Cassandra-Prefix.pch";
 				INFOPLIST_FILE = "src/main/config/Cassandra-PrefsPane-Info.plist";
@@ -381,8 +379,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = "${inherited}";
-				CURRENT_PROJECT_VERSION = 2;
-				GCC_ENABLE_OBJC_GC = supported;
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "src/main/objc/Cassandra-Prefix.pch";
 				INFOPLIST_FILE = "src/main/config/Cassandra-PrefsPane-Info.plist";

README.md

@@ -1,23 +1,21 @@
 cassandra-macosx-prefspane
 ========================
 
-This Preferences pane for Cassandra.
+This is a Preferences pane for Cassandra.
 
 ![Screenshot](https://github.com/remysaissy/cassandra-macosx-prefspane/raw/master/doc/screenshot%20started.png)
 
 Functionalities
 ---------------
 
-* Runs on MacOSX Snow Leopard, Lion and Moutain Lion
+* Runs on MacOSX Snow Leopard, Lion as well as Moutain Lion
 * Indicates if the server is running
 * Manual start/stop of the Cassandra server
-* Enable/disable automatic startup of the server at boot
-* Keep your plist’s customizations safe
-* Homebrew’s launchd plist is migrated
-* Enable/disable automatic startup don’t delete the launchd plist
-* Automatic update
-* New versions install automatically
+* Enable/disable automatic startup of the server at login
+* Automatic update, new versions install automatically
 * A green label at the top right corner informs you that you should restart your system preferences
+* Works with homebrew
+* Works with the Apache distribution of Cassandra (as long as you have a symbolic link of cassandra binary to ~/bin)
 
 Localization
 ------------
@@ -33,22 +31,35 @@ Prerequisites
 
 It does not embed a Cassandra Server. Therefore, you first have to install Cassandra.
 A simple way to do it is by using Homebrew to install Cassandra.
+Another way is to download Cassandra from http://cassandra.apache.org.
+
+_Homebrew installation_
 
 $brew install cassandra
 
+_Apache distribution installation_
+
+* Download a  Cassandra release from http://cassandra.apache.org/.
+* Unpack the archive whereever you want.
+* Create a symbolic link of the cassandra binary to your homedir's bin directory:
+$mkdir -p ~/bin
+$ln -s <path to your cassandra distribution>/bin/cassandra ~/bin/cassandra
+
+
 Installation
 ------------
 
 1.	Download the latest version: https://github.com/remysaissy/cassandra-macosx-prefspane/raw/master/download/Cassandra.prefPane.zip
 2.	Unzip Cassandra.prefPane.zip
 3.	Double click on Cassandra.prefPane. This will install it in your System Preferences
 
-Note: To Mountain Lion users. This application is presently not on the app store and therefore it is not signed. You can still install it but don't be surprised to have an alert about it.
+Note: To Mountain Lion users. This application is not on the app store and therefore it is not signed. Therefore, you must allow third party applications to be able to install this application. If you're wondering how to do it, here is an explanation: http://blog.remysaissy.com/2012/08/allowing-installation-of-non-mac-app.html
 
 Contributing
 ------------
 
-Want to contribute? Great!
+Feel free to let me know about your experience with this application.
+And for those who want to contribute, don't be shy!
 
 1. Fork it.
 2. Create a branch (`git checkout -b my_cassandra_prefspane`)

download/Cassandra.prefPane.dSYM/Contents/Info.plist

@@ -13,8 +13,8 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
+		<string>1.2</string>
 		<key>CFBundleVersion</key>
-		<string>1</string>
+		<string>3</string>
 	</dict>
 </plist>

download/LATEST_VERSION

@@ -1 +1 @@
-1.0
+1.2

src/main/config/Cassandra-PrefsPane-Info.plist

@@ -17,15 +17,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2012 Octo Technology. All rights reserved.</string>
+	<string>Copyleft LGPL 2013. Rémy SAISSY</string>
 	<key>NSMainNibFile</key>
 	<string>CassandraPrefsPane</string>
 	<key>NSPrefPaneIconFile</key>

src/main/objc/AutoUpdater.h

@@ -3,7 +3,7 @@
 //  Cassandra-PrefsPane
 //
 //  Created by Rémy SAISSY on 24/07/12.
-//  Copyright (c) 2012 Octo Technology. All rights reserved.
+//  Copyleft LGPL 2013.
 //
 
 #import <Foundation/Foundation.h>

src/main/objc/AutoUpdater.m

@@ -3,7 +3,7 @@
 //  Cassandra-PrefsPane
 //
 //  Created by Rémy SAISSY on 24/07/12.
-//  Copyright (c) 2012 Octo Technology. All rights reserved.
+//  Copyleft LGPL 2013.
 //
 
 #import "AutoUpdater.h"
@@ -92,7 +92,7 @@ -(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)erro
 {
     self._updateStep = AutoUpdateStepIdle;
     self._data = nil;
-    [NSString logErrorFromClass:[self class] withSelector:_cmd withFormat:@"Failed to check for an update: %@.", error];
+    ERROR(@"Failed to check for an update: %@.", error);
 }
 
 - (void)connectionDidFinishLoading:(NSURLConnection *)connection
@@ -121,7 +121,7 @@ - (void)_checkingUpdateDidFinish
     self._data = nil;
 
     if ([versionNumber floatValue] < [latestVersionNumber floatValue]) {
-        [NSString logInfoFromClass:[self class] withSelector:_cmd withFormat:@"A new version (%@) has been found. Downloading...", latestVersionNumber];
+        INFO(@"A new version (%@) has been found. Downloading...", latestVersionNumber);
         NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://github.com/remysaissy/cassandra-macosx-prefspane/raw/master/download/Cassandra.prefPane.zip"]];
         self._updateStep = AutoUpdateStepDownloadLatest;
         NSURLConnection *connection = [[[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:YES] autorelease];
@@ -131,7 +131,7 @@ - (void)_checkingUpdateDidFinish
 
 - (void)_downloadingUpdateDidFinish
 {
-    [NSString logInfoFromClass:[self class] withSelector:_cmd withFormat:@"Installing new version..."];
+    INFO(@"Installing new version...");
     NSString *prefsPaneBinary = [[NSBundle bundleForClass:[self class]] bundlePath];
     NSString *prefsPanePath = [prefsPaneBinary stringByDeletingLastPathComponent];
     NSString *updatedBinaryZipped = [NSTemporaryDirectory() stringByAppendingPathComponent:@"Cassandra.prefPane.zip"];
@@ -172,7 +172,7 @@ - (void)_downloadingUpdateDidFinish
             }
             AuthorizationFree(authorizationRef, 0);
         }
-        [NSString logInfoFromClass:[self class] withSelector:_cmd withFormat:@"New version installed in %@.", prefsPanePath];
+        INFO(@"New version installed in %@.", prefsPanePath);
         self.hasUpdated = YES;
     }
 }

src/main/objc/Cassandra-Prefix.pch

@@ -4,5 +4,13 @@
 
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
-    #import "NSString+Log.h"
+
+//Logging.
+
+#define INFO(fmt, ...) NSLog(@"INFO %@:%d:%@ %@", [[NSString stringWithUTF8String:__FILE__] lastPathComponent], \
+__LINE__, NSStringFromSelector(_cmd), [NSString stringWithFormat:(fmt), ##__VA_ARGS__])
+
+#define ERROR(fmt, ...) NSLog(@"ERROR %@:%d:%@ %@", [[NSString stringWithUTF8String:__FILE__] lastPathComponent], \
+__LINE__, NSStringFromSelector(_cmd), [NSString stringWithFormat:(fmt), ##__VA_ARGS__])
+
 #endif

src/main/objc/CassandraPrefsPane.h

@@ -3,7 +3,7 @@
 //  Cassandra-PrefsPane
 //
 //  Created by Rémy SAISSY on 20/07/12.
-//  Copyright (c) 2012 Octo Technology. All rights reserved.
+//  Copyleft LGPL 2013.
 //
 
 #import <PreferencePanes/PreferencePanes.h>

src/main/objc/CassandraPrefsPane.m

@@ -3,7 +3,7 @@
 //  Cassandra-PrefsPane
 //
 //  Created by Rémy SAISSY on 20/07/12.
-//  Copyright (c) 2012 Octo Technology. All rights reserved.
+//  Copyleft LGPL 2013.
 //
 
 #import "CassandraPrefsPane.h"
@@ -63,7 +63,7 @@ - (void)didSelect
     else
         [self _setProcessAsStopped];
 
-    [self.instanceAutomaticStartButton setState:[Helpers isAutomaticStartupInstalled]];
+    [self.instanceAutomaticStartButton setState:[Helpers isLaunchdInstalled]];
     [self._autoUpdater checkForUpdate];
 }
 
@@ -90,11 +90,11 @@ - (IBAction)onStartStopButtonPushed:(id)sender
 - (IBAction)onAutomaticStartButtonPushed:(id)sender
 {
     if (self.instanceAutomaticStartButton.state) {
-        if ([Helpers installAutomaticStartup] == YES)
-            [self.instanceAutomaticStartButton setState:[Helpers isAutomaticStartupInstalled]];
+        if ([Helpers installLaunchd] == YES)
+            [self.instanceAutomaticStartButton setState:[Helpers isLaunchdInstalled]];
     } else {
-        if ([Helpers uninstallAutomaticStartup] == YES)
-            [self.instanceAutomaticStartButton setState:[Helpers isAutomaticStartupInstalled]];
+        if ([Helpers uninstallLaunchd] == YES)
+            [self.instanceAutomaticStartButton setState:[Helpers isLaunchdInstalled]];
     }
     if ([Helpers isProcessRunning] == YES)
         [self _setProcessAsStarted];