Merge branch 'master' of https://github.com/Zirak/SO-ChatBot

Conflicts:
	source/adapter.js
	source/commands.js
	source/plugins/summon.js
	source/plugins/welcome.js

Author: BobVul

.gitignore

@@ -1,3 +1,5 @@
 *.*~
 \#*\#
 node_modules/
+data/
+*.jar

README.md

@@ -1,14 +1,13 @@
 For usage info, on how to use the bot, see [here](https://github.com/Zirak/SO-ChatBot/wiki/Interacting-with-the-bot).
 
 ###Running the bot###
-The bot is currently a big dangle-on script running in your browser. **Run `bookmarklet.js`** in your browser to get it up an' running.
+The bot is currently a big dangle-on script running in your browser. **Run `bookmarklet.js`** in your browser to get it up an' running. For some tips on handling the bot, see [Bot Handling](https://github.com/Zirak/SO-ChatBot/wiki/Bot-Handling).
 
 ###Building###
-(For build minification, install [uglify-js2](https://github.com/mishoo/UglifyJS2))
 
 ```sh
 #one must first get the repo
-$ git clone git://github.com/Zirak/SO-ChatBot.git
+$ git clone https://github.com/Zirak/SO-ChatBot.git
 $ cd SO-ChatBot
 ```
 
@@ -27,6 +26,8 @@ $ node build.js no-min
 ```
 The result will be in `master.js` and `master.min.js`
 
+Minifying will run [closure-compiler.jar](https://developers.google.com/closure/compiler/docs/gettingstarted_app) if java is installed, and then try to run [uglify-js2](https://github.com/mishoo/UglifyJS2).
+
 ###The Bot API###
 (, a very short explanation of a limited subset of)
 

build.js

@@ -128,7 +128,7 @@ var build = {
 			this.write( code );
 
 			if ( this.doMinify ) {
-				minify( code, this.minEndCallback );
+				minify( this.outputName, this.outputMin, this.minEndCallback );
 			}
 			code = null;
 		}
@@ -153,30 +153,107 @@ var build = {
 	}
 };
 
-var minify = function ( code, callback, outName ) {
-	outName = outName || 'master.min.js';
-	build.print( '\nminifying...' );
+var minify = (function () {
+
+var exec = require('child_process').exec;
+
+var minifiers = [
+	{
+		name : 'closure-compiler',
+		test : function ( success, fail ) {
+			exec( 'java -version &> /dev/null; echo $?', finish );
+
+			function finish ( err, stdout, stderr ) {
+				if (err || Number(stdout)) {
+					fail();
+				}
+				else {
+					success();
+				}
+			}
+		},
+		minify : function ( sourceFile, outFile, cb ) {
+			var cmd = [
+				'java -jar closure-compiler.jar',
+				'--language_in ECMASCRIPT5_STRICT',
+				'--compilation_level SIMPLE_OPTIMIZATIONS',
+				'--js', sourceFile,
+				'--js_output_file', outFile,
+			].join( ' ' );
+
+			exec( cmd, cb );
+		}
+	},
+	{
+		name : 'uglify2',
+		test : function ( success, fail ) {
+			try {
+				require.resolve( 'uglify-js2' );
+				success();
+			}
+			catch ( e ) {
+				fail();
+			}
+		},
+		minify : function ( sourceFile, outFile, cb ) {
+			var code;
+			try {
+				code = require( 'uglify-js2' ).minify( sourceFile ).code;
+			}
+			catch ( e ) {
+				cb( e );
+				//I find it extremely pleasing how the above lines line up.
+				return;
+			}
 
-	var min;
-	try {
-		min = require( 'uglify-js2' )
-			.minify( code, { fromString : true } ).code;
+			fs.writeFile( outFile, code, cb );
+		}
+	},
+	{
+		name : 'default',
+		test : function ( success ) {
+			success();
+		},
+		minify : function ( cb ) {
+			console.warn( 'no minifier found; skipping' );
+			cb();
+		}
 	}
-	catch ( e ) {
-		console.error( e.toString() );
-		return;
+];
+
+return function minify ( inFile, outFile, callback ) {
+	build.print( '\nminifying...' );
+	continuation( minifiers.slice() );
+
+	function continuation (fiers /* 'Merica */) {
+		var minifier = fiers.shift();
+
+		minifier.test(
+			function success () {
+				build.print( 'running minifier: ' + minifier.name );
+				runMinifier( minifier );
+			},
+			function fail () {
+				build.print( 'skipping minifier: ' + minifier.name );
+				continuation(fiers);
+			}
+		);
 	}
 
-	fs.writeFile( outName, min, finish );
+	function runMinifier ( minifier ) {
+		minifier.minify( inFile, outFile, finish );
+	}
 
 	function finish ( err ) {
 		if ( err ) {
 			throw err;
 		}
-		callback( outName, min.length );
+		callback( outFile, fs.statSync(outFile).size );
 	}
 };
 
+})();
+
 var preprocessor = (function () {
 
 var preprocessor = {