From 655c83e40ac4f8c9b0261cdecd647f06bf81847c Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Tue, 12 Feb 2013 01:26:22 -0200
Subject: [PATCH 1/8] Added compiled file option.

---
 bin/yuglify    |  38 ++++++++++++-----
 lib/sprintf.js | 113 +++++++++++++++++++++++++++++++++++++++++++++++++
 package.json   |  66 +++++++++++++++--------------
 3 files changed, 175 insertions(+), 42 deletions(-)
 create mode 100644 lib/sprintf.js

diff --git a/bin/yuglify b/bin/yuglify
index 65e5bf0..09e7a2c 100755
--- a/bin/yuglify
+++ b/bin/yuglify
@@ -17,24 +17,26 @@ var nopt = require('nopt'),
         output: path,
         terminal: Boolean,
         help: Boolean,
-        version: Boolean
+        version: Boolean,
+        name: String,
+        compile: String
     },
     shorts = {
         'o': ['--output'],
         't': ['--type'],
         'h': ['--help'],
-        'v': ['--version']
+        'v': ['--version'],
+        'n': ['--name'],
+        'c': ['--compile']
     },
     parsed = nopt(known, shorts);
-
-parsed.type = parsed.type || 'js'; //Default to JS files
+    parsed.type = parsed.type || 'js'; //Default to JS files
 
 if (parsed.version) {
     console.log(pack.version);
     process.exit(0);
 }
 
-
 if (parsed.help || (!parsed.argv.remain.length && !parsed.terminal)) {
     var help = [
         'yuglify@' + pack.version,
@@ -77,10 +79,12 @@ if (parsed.terminal) {
         });
     });
 } else {
-    console.log('compressing..');
+
+    console.log('Compressing...');
     console.log(parsed.argv.remain.join(', '));
 
-    var out = parsed.out,
+    var out = parsed.output,
+        compiled = '',
         files = parsed.argv.remain;
 
     //Uglify is blocking, so we will do this in sync..
@@ -89,7 +93,9 @@ if (parsed.terminal) {
         if (exists(file)) {
             var data = fs.readFileSync(file, 'utf8'),
                 ext = path.extname(file),
-                out = path.join(path.dirname(file), path.basename(file).replace(ext, '') + '-min' + ext),
+                basename = 
+                out = path.join(path.dirname(file), path.basename(file).replace(ext, '') + '.min' + ext),
+
                 compfn = (ext === '.css' ? cssmin : jsmin);
 
             compfn(data, function(err, smashed) {
@@ -97,12 +103,24 @@ if (parsed.terminal) {
                     throw(err);
                     process.exit(1);
                 }
-                fs.writeFileSync(out, smashed, 'utf8');
-                console.log('compressed file', out);
+                
+                if(parsed.compile) {
+                    compiled += smashed;
+                } else {
+                    fs.writeFileSync(out, smashed, 'utf8');
+                    console.log('Compressed file:', out);
+                }
+                
             });
         } else {
             console.log('Failed to find', file);
             process.exit(1);
         }
     });
+
+    if(parsed.compile) {
+        fs.writeFileSync(parsed.compile, compiled.replace(/(\n|\r)/gi, ''), 'utf8');
+        console.log('Single compiled and compressed file:', parsed.compile);
+        compiled = '';
+    }
 }
diff --git a/lib/sprintf.js b/lib/sprintf.js
new file mode 100644
index 0000000..052b003
--- /dev/null
+++ b/lib/sprintf.js
@@ -0,0 +1,113 @@
+/**
+*
+* Basic sprintf implementation for JavaScript. Created for personal learning purposes.
+* This implementation has string (%s w/ padding), decimal (%d w/ padding) and object (%(foo)s) support.
+* 
+* @example
+* console.log(sprintf("http://%s.%s", "rinaldi", "nu")); // http://rinaldi.nu
+* console.log(sprintf("%(lorem)s %(ipsum)s", {lorem: "Lorem", ipsum: "Ipsum"})); // Lorem Ipsum
+* console.log(sprintf("%30s", "foo")); //                           foo
+*
+* @author Rafael Rinaldi (rafaelrinaldi.com)
+* @since Mar 17, 2010
+*
+*/
+exports.sprintf = function ( p_raw ) {
+
+	var raw = p_raw,
+		buffer,
+		args = arguments,
+		BASIC_REGEX = /%[d|s]|%\d+[d|s]/gi,
+		COMPLEX_REGEX = /%(\(([\w_\d]+)\))s/gi;
+
+	buffer = p_raw;
+
+	if(!raw) return null;
+
+	if(hasBasicFormatter())
+		processBasic();
+	else if(hasComplexFormatter())
+		processComplex();
+
+	/**
+	*
+	* Fill the buffer with a new entry.
+	*
+	* @param p_match Match.
+	* @param p_substitution Substitution value.
+	* @param p_padding Padding.
+	*
+	**/
+	function pad( p_match, p_substitution, p_padding ) {
+
+		/** Tip by Miller Medeiros (millermedeiros.com). **/
+		var padding = new Array(p_padding + 1).join(" ");
+		
+		/** Computes the result to string buffer. **/
+		buffer = buffer.replace(p_match, padding + p_substitution);
+
+	}
+
+	/**
+	* @return True if the second parameter is a number or a string, false otherwise.
+	*/
+	function hasBasicFormatter() {
+		return (typeof args[1] === "string" || typeof args[1] === "number");
+	}
+
+	/**
+	* @return True if the second parameter is a pure object, false otherwise.
+	*/
+	function hasComplexFormatter() {
+		return (typeof args[1] === "object");
+	}
+
+	/** Process values in the format: %s, %d, %ns and %nd. **/
+	function processBasic() {
+
+		var index = 0,
+			matches = raw.match(BASIC_REGEX),
+			match,
+			substitution,
+			padding;
+
+		do {
+			match = matches[index];
+			substitution = args[index + 1];
+			padding = parseInt(match.substring(1, match.length - 1)) || 0;
+
+			pad(match, substitution, padding);
+
+			index++;
+		}
+
+		while(index < matches.length);
+
+	}
+
+	/** Process values in the format: %(complex)s. **/
+	function processComplex() {
+
+		var index = 0,
+			matches = raw.match(COMPLEX_REGEX),
+			match,
+			id,
+			substitution;
+
+		do {
+			match = matches[index];
+			id = match.substring(2, match.length - 2);
+			substitution = args[1][id];
+
+			pad(match, substitution, 0);
+
+			index++;
+		}
+
+		while(index < matches.length);
+
+	}
+
+	return buffer;
+
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 3efc3da..cec7a90 100644
--- a/package.json
+++ b/package.json
@@ -1,35 +1,37 @@
 {
-    "name": "yuglify",
-    "description": "cli wrapper for uglify and cssmin used by YUI",
-    "version": "0.1.2",
-    "dependencies": {
-        "uglify-js": "~1.3.3",
-        "ycssmin": "~1.0.0",
-        "nopt": "*"
-    },
-    "devDependencies": {
-        "yui-lint": "~0.1.1",
-        "jshint": "~0.9.0",
-        "vows": "*" 
-    },
-    "main": "./lib/index.js",
-    "bin": {
-        "yuglify": "./bin/yuglify"
-    },
-    "scripts": {
-        "pretest": "jshint --config ./node_modules/yui-lint/jshint.json ./lib/*.js ./bin/yuglify",
-        "test": "vows --spec ./tests/*.js"
-    },
-    "preferGlobal": "true",
-    "bugs": { "url" : "http://github.com/yui/yuglify/issues" },
-    "licenses":[
-        {
-            "type" : "BSD",
-            "url" : "https://github.com/yui/yuglify/blob/master/LICENSE"
-        }
-    ],
-    "repository": {
-        "type":"git",
-        "url":"http://github.com/yui/yuglify.git"
+  "name": "yuglify",
+  "description": "cli wrapper for uglify and cssmin used by YUI",
+  "version": "0.1.2",
+  "dependencies": {
+    "uglify-js": "~1.3.4",
+    "ycssmin": "~1.0.1",
+    "nopt": "~2.1.1"
+  },
+  "devDependencies": {
+    "yui-lint": "~0.1.1",
+    "jshint": "~0.9.0",
+    "vows": "*"
+  },
+  "main": "./lib/index.js",
+  "bin": {
+    "yuglify": "./bin/yuglify"
+  },
+  "scripts": {
+    "pretest": "jshint --config ./node_modules/yui-lint/jshint.json ./lib/*.js ./bin/yuglify",
+    "test": "vows --spec ./tests/*.js"
+  },
+  "preferGlobal": "true",
+  "bugs": {
+    "url": "http://github.com/yui/yuglify/issues"
+  },
+  "licenses": [
+    {
+      "type": "BSD",
+      "url": "https://github.com/yui/yuglify/blob/master/LICENSE"
     }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/yui/yuglify.git"
+  }
 }

From eaae0a7b7d18f60928bea0843f8e51f485368a7b Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Tue, 12 Feb 2013 02:56:10 -0200
Subject: [PATCH 2/8] Added custom name feature.

---
 bin/yuglify | 50 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/bin/yuglify b/bin/yuglify
index 09e7a2c..b1fd20f 100755
--- a/bin/yuglify
+++ b/bin/yuglify
@@ -12,6 +12,10 @@ var nopt = require('nopt'),
     pack = require('../package.json'),
     jsmin = require('../').jsmin,
     cssmin = require('../').cssmin,
+    sprintf = require('../lib/sprintf.js').sprintf,
+    defaults = {
+        name: "%(name)s.min%(ext)s"
+    },
     known = {
         type: ['css', 'js'],
         output: path,
@@ -29,6 +33,7 @@ var nopt = require('nopt'),
         'n': ['--name'],
         'c': ['--compile']
     },
+    filename = defaults.name,
     parsed = nopt(known, shorts);
     parsed.type = parsed.type || 'js'; //Default to JS files
 
@@ -37,6 +42,10 @@ if (parsed.version) {
     process.exit(0);
 }
 
+if(parsed.name) {
+    filename = parsed.name;
+}
+
 if (parsed.help || (!parsed.argv.remain.length && !parsed.terminal)) {
     var help = [
         'yuglify@' + pack.version,
@@ -80,24 +89,26 @@ if (parsed.terminal) {
     });
 } else {
 
-    console.log('Compressing...');
-    console.log(parsed.argv.remain.join(', '));
-
-    var out = parsed.output,
-        compiled = '',
+    console.log('Compressing:', parsed.argv.remain.join(', '));
+    
+    var buffer = '',
         files = parsed.argv.remain;
 
     //Uglify is blocking, so we will do this in sync..
     files.forEach(function(file) {
+
         file = path.resolve(file);
+        
         if (exists(file)) {
-            var data = fs.readFileSync(file, 'utf8'),
-                ext = path.extname(file),
-                basename = 
-                out = path.join(path.dirname(file), path.basename(file).replace(ext, '') + '.min' + ext),
 
-                compfn = (ext === '.css' ? cssmin : jsmin);
+            var data = fs.readFileSync(file, 'utf8'),
+                destination = path.dirname(file) + '/',
+                extension = path.extname(file),
+                basename = path.basename(file).replace(extension, ''),
+                compressed = destination.concat(sprintf(filename, {name: basename, ext: extension})),
+                compfn = (extension === '.css' ? cssmin : jsmin);
 
+                
             compfn(data, function(err, smashed) {
                 if (err) {
                     throw(err);
@@ -105,10 +116,10 @@ if (parsed.terminal) {
                 }
                 
                 if(parsed.compile) {
-                    compiled += smashed;
+                    buffer += smashed;
                 } else {
-                    fs.writeFileSync(out, smashed, 'utf8');
-                    console.log('Compressed file:', out);
+                    fs.writeFileSync(compressed, smashed, 'utf8');
+                    console.log('Compressed file:', compressed);
                 }
                 
             });
@@ -119,8 +130,13 @@ if (parsed.terminal) {
     });
 
     if(parsed.compile) {
-        fs.writeFileSync(parsed.compile, compiled.replace(/(\n|\r)/gi, ''), 'utf8');
-        console.log('Single compiled and compressed file:', parsed.compile);
-        compiled = '';
+        
+        var compiled = parsed.compile === "true" ? sprintf(filename, {name: "main", ext: ".js"}) : parsed.compile;
+
+        fs.writeFileSync(compiled, buffer.replace(/(\n|\r)/gi, ''), 'utf8');
+        console.log('Single compiled and compressed file:', compiled);
+        buffer = '';
+
     }
-}
+
+}
\ No newline at end of file

From b7bb38474093236a9a4c0fad2163ae2258ad74a8 Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Tue, 12 Feb 2013 02:58:34 -0200
Subject: [PATCH 3/8] Updating help.

---
 bin/yuglify | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/yuglify b/bin/yuglify
index b1fd20f..506794b 100755
--- a/bin/yuglify
+++ b/bin/yuglify
@@ -59,6 +59,8 @@ if (parsed.help || (!parsed.argv.remain.length && !parsed.terminal)) {
         '   --type js|css   what type of file to compress (used with stdin)',
         '   --terminal      use stdin and stdout instead of files',
         '   --output <file> use this file when using --terminal',
+        '   --name/-n <template> custom sprintf-based file name template',
+        '   --compile/-c <file> compiles and compresses all files into a single one.',
         '   <files to compress>'
     ];
     console.log(help.join('\n'));

From 8e8baff4c18a1f01bf21f1fd5f79cc1c57d46fb3 Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Tue, 12 Feb 2013 03:21:15 -0200
Subject: [PATCH 4/8] Improving code by Travis logs.

---
 lib/sprintf.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/sprintf.js b/lib/sprintf.js
index 052b003..a75467c 100644
--- a/lib/sprintf.js
+++ b/lib/sprintf.js
@@ -22,13 +22,6 @@ exports.sprintf = function ( p_raw ) {
 
 	buffer = p_raw;
 
-	if(!raw) return null;
-
-	if(hasBasicFormatter())
-		processBasic();
-	else if(hasComplexFormatter())
-		processComplex();
-
 	/**
 	*
 	* Fill the buffer with a new entry.
@@ -108,6 +101,12 @@ exports.sprintf = function ( p_raw ) {
 
 	}
 
-	return buffer;
+	if(hasBasicFormatter()) {
+		processBasic();
+	} else if(hasComplexFormatter()) {
+		processComplex();
+	}
+
+	return !raw ? null : buffer;
 
-}
\ No newline at end of file
+};
\ No newline at end of file

From 2be173639fd5ddcad8c938d57abc4432fea773b3 Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Tue, 12 Feb 2013 03:26:40 -0200
Subject: [PATCH 5/8] Improving code by Travis logs.

---
 lib/sprintf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sprintf.js b/lib/sprintf.js
index a75467c..dd7c5d3 100644
--- a/lib/sprintf.js
+++ b/lib/sprintf.js
@@ -2,7 +2,7 @@
 *
 * Basic sprintf implementation for JavaScript. Created for personal learning purposes.
 * This implementation has string (%s w/ padding), decimal (%d w/ padding) and object (%(foo)s) support.
-* 
+*
 * @example
 * console.log(sprintf("http://%s.%s", "rinaldi", "nu")); // http://rinaldi.nu
 * console.log(sprintf("%(lorem)s %(ipsum)s", {lorem: "Lorem", ipsum: "Ipsum"})); // Lorem Ipsum
@@ -67,7 +67,7 @@ exports.sprintf = function ( p_raw ) {
 		do {
 			match = matches[index];
 			substitution = args[index + 1];
-			padding = parseInt(match.substring(1, match.length - 1)) || 0;
+			padding = parseInt(match.substring(1, match.length - 1), 10) || 0;
 
 			pad(match, substitution, padding);
 

From 772da4fcf4343f6ad2e64d5cd1810a30e6f2c6ae Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Tue, 12 Feb 2013 17:31:28 -0200
Subject: [PATCH 6/8] Improved 'sprintf.js' structure and did some cleaning on
 the changes made to yuglify.

---
 bin/yuglify    |   6 +-
 lib/sprintf.js | 166 +++++++++++++++++++++++++++----------------------
 2 files changed, 96 insertions(+), 76 deletions(-)

diff --git a/bin/yuglify b/bin/yuglify
index 506794b..3803d5a 100755
--- a/bin/yuglify
+++ b/bin/yuglify
@@ -14,7 +14,7 @@ var nopt = require('nopt'),
     cssmin = require('../').cssmin,
     sprintf = require('../lib/sprintf.js').sprintf,
     defaults = {
-        name: "%(name)s.min%(ext)s"
+        name: '%(name)s.min%(ext)s'
     },
     known = {
         type: ['css', 'js'],
@@ -71,7 +71,7 @@ if (parsed.terminal) {
     var stdin = process.openStdin(),
         data = '';
 
-    stdin.setEncoding("utf8");
+    stdin.setEncoding('utf8');
     stdin.on('data', function(buffer) {
         data += buffer;
     });
@@ -133,7 +133,7 @@ if (parsed.terminal) {
 
     if(parsed.compile) {
         
-        var compiled = parsed.compile === "true" ? sprintf(filename, {name: "main", ext: ".js"}) : parsed.compile;
+        var compiled = parsed.compile === 'true' ? sprintf(filename, {name: 'main', ext: '.js'}) : parsed.compile;
 
         fs.writeFileSync(compiled, buffer.replace(/(\n|\r)/gi, ''), 'utf8');
         console.log('Single compiled and compressed file:', compiled);
diff --git a/lib/sprintf.js b/lib/sprintf.js
index dd7c5d3..8c0b305 100644
--- a/lib/sprintf.js
+++ b/lib/sprintf.js
@@ -4,107 +4,127 @@
 * This implementation has string (%s w/ padding), decimal (%d w/ padding) and object (%(foo)s) support.
 *
 * @example
-* console.log(sprintf("http://%s.%s", "rinaldi", "nu")); // http://rinaldi.nu
-* console.log(sprintf("%(lorem)s %(ipsum)s", {lorem: "Lorem", ipsum: "Ipsum"})); // Lorem Ipsum
-* console.log(sprintf("%30s", "foo")); //                           foo
+* console.log(sprintf('http://%s.%s', 'rinaldi', 'nu')); // http://rinaldi.nu
+* console.log(sprintf('%(lorem)s %(ipsum)s', {lorem: 'Lorem', ipsum: 'Ipsum'})); // Lorem Ipsum
+* console.log(sprintf('%30s', 'foo')); //                           foo
 *
 * @author Rafael Rinaldi (rafaelrinaldi.com)
 * @since Mar 17, 2010
 *
 */
-exports.sprintf = function ( p_raw ) {
 
-	var raw = p_raw,
-		buffer,
-		args = arguments,
-		BASIC_REGEX = /%[d|s]|%\d+[d|s]/gi,
-		COMPLEX_REGEX = /%(\(([\w_\d]+)\))s/gi;
-
-	buffer = p_raw;
-
-	/**
-	*
-	* Fill the buffer with a new entry.
-	*
-	* @param p_match Match.
-	* @param p_substitution Substitution value.
-	* @param p_padding Padding.
-	*
-	**/
-	function pad( p_match, p_substitution, p_padding ) {
-
-		/** Tip by Miller Medeiros (millermedeiros.com). **/
-		var padding = new Array(p_padding + 1).join(" ");
-		
-		/** Computes the result to string buffer. **/
-		buffer = buffer.replace(p_match, padding + p_substitution);
+var raw = '',
+	buffer = raw,
+	args = [],
+	BASIC_REGEX = /%[d|s]|%\d+[d|s]/gi,
+	COMPLEX_REGEX = /%(\(([\w_\d]+)\))s/gi;
 
-	}
+/**
+* Fill the buffer with a new entry.
+* @method pad
+* @param p_match {String} Match.
+* @param p_substitution {String} Substitution value.
+* @param p_padding {Number} Padding.
+* @private
+*/
+function pad( p_match, p_substitution, p_padding ) {
 
-	/**
-	* @return True if the second parameter is a number or a string, false otherwise.
-	*/
-	function hasBasicFormatter() {
-		return (typeof args[1] === "string" || typeof args[1] === "number");
-	}
+	/** Tip by Miller Medeiros (millermedeiros.com). **/
+	var padding = new Array(p_padding + 1).join(' ');
+	
+	/** Computes the result to string buffer. **/
+	buffer = buffer.replace(p_match, padding + p_substitution);
 
-	/**
-	* @return True if the second parameter is a pure object, false otherwise.
-	*/
-	function hasComplexFormatter() {
-		return (typeof args[1] === "object");
-	}
+};
 
-	/** Process values in the format: %s, %d, %ns and %nd. **/
-	function processBasic() {
+/**
+* @method hasBasicFormatter
+* @return {Boolean} True if the second parameter is a number or a string, false otherwise.
+* @private
+*/
+function hasBasicFormatter() {
+	return (typeof args[1] === 'string' || typeof args[1] === 'number');
+};
 
-		var index = 0,
-			matches = raw.match(BASIC_REGEX),
-			match,
-			substitution,
-			padding;
+/**
+* @method hasComplexFormatter
+* @return {Boolean} True if the second parameter is a pure object, false otherwise.
+* @private
+*/
+function hasComplexFormatter() {
+	return (typeof args[1] === 'object');
+};
 
-		do {
-			match = matches[index];
-			substitution = args[index + 1];
-			padding = parseInt(match.substring(1, match.length - 1), 10) || 0;
+/**
+* Process values in the format: %s, %d, %ns and %nd.
+* @method resolveBasic
+* @private
+*/
+function resolveBasic() {
 
-			pad(match, substitution, padding);
+	var index = 0,
+		matches = raw.match(BASIC_REGEX),
+		match,
+		substitution,
+		padding;
 
-			index++;
-		}
+	do {
+		match = matches[index];
+		substitution = args[index + 1];
+		padding = parseInt(match.substring(1, match.length - 1), 10) || 0;
 
-		while(index < matches.length);
+		pad(match, substitution, padding);
 
+		index++;
 	}
 
-	/** Process values in the format: %(complex)s. **/
-	function processComplex() {
+	while(index < matches.length);
 
-		var index = 0,
-			matches = raw.match(COMPLEX_REGEX),
-			match,
-			id,
-			substitution;
+};
 
-		do {
-			match = matches[index];
-			id = match.substring(2, match.length - 2);
-			substitution = args[1][id];
 
-			pad(match, substitution, 0);
+/**
+* Process values in the format: %(complex)s.
+* @method resolveComplex
+* @private
+*/
+function resolveComplex() {
 
-			index++;
-		}
+	var index = 0,
+		matches = raw.match(COMPLEX_REGEX),
+		match,
+		id,
+		substitution;
 
-		while(index < matches.length);
+	do {
+		match = matches[index];
+		id = match.substring(2, match.length - 2);
+		substitution = args[1][id];
 
+		pad(match, substitution, 0);
+
+		index++;
 	}
 
+	while(index < matches.length);
+
+};
+
+/**
+* @method sprintf
+* @param p_raw {String} String to be sprintfied.
+* @return Sprintfied string.
+*/
+exports.sprintf = function ( p_raw ) {
+
+	raw = p_raw;
+	buffer = raw;
+	args = arguments;
+	
 	if(hasBasicFormatter()) {
-		processBasic();
+		resolveBasic();
 	} else if(hasComplexFormatter()) {
-		processComplex();
+		resolveComplex();
 	}
 
 	return !raw ? null : buffer;

From 34c5e3c614a4980a483900c919fa464da7c882f7 Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Tue, 12 Feb 2013 17:38:56 -0200
Subject: [PATCH 7/8] Improving code in order to pass Travis tests.

---
 lib/sprintf.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/sprintf.js b/lib/sprintf.js
index 8c0b305..8d08ec7 100644
--- a/lib/sprintf.js
+++ b/lib/sprintf.js
@@ -35,7 +35,7 @@ function pad( p_match, p_substitution, p_padding ) {
 	/** Computes the result to string buffer. **/
 	buffer = buffer.replace(p_match, padding + p_substitution);
 
-};
+}
 
 /**
 * @method hasBasicFormatter
@@ -44,7 +44,7 @@ function pad( p_match, p_substitution, p_padding ) {
 */
 function hasBasicFormatter() {
 	return (typeof args[1] === 'string' || typeof args[1] === 'number');
-};
+}
 
 /**
 * @method hasComplexFormatter
@@ -53,7 +53,7 @@ function hasBasicFormatter() {
 */
 function hasComplexFormatter() {
 	return (typeof args[1] === 'object');
-};
+}
 
 /**
 * Process values in the format: %s, %d, %ns and %nd.
@@ -80,7 +80,7 @@ function resolveBasic() {
 
 	while(index < matches.length);
 
-};
+}
 
 
 /**
@@ -108,7 +108,7 @@ function resolveComplex() {
 
 	while(index < matches.length);
 
-};
+}
 
 /**
 * @method sprintf

From a34f6a143bafe18a5de7727b77def10b9fe9500e Mon Sep 17 00:00:00 2001
From: Rafael Rinaldi <rafael.rinaldi@gmail.com>
Date: Fri, 29 Mar 2013 22:13:07 -0300
Subject: [PATCH 8/8] Removing vendor sprintf implementation and templating
 feature. Not it looks more concise.

---
 bin/yuglify    |  84 ++++++++++++++++++-------------
 lib/sprintf.js | 132 -------------------------------------------------
 2 files changed, 51 insertions(+), 165 deletions(-)
 delete mode 100644 lib/sprintf.js

diff --git a/bin/yuglify b/bin/yuglify
index 3803d5a..85c0b23 100755
--- a/bin/yuglify
+++ b/bin/yuglify
@@ -8,13 +8,14 @@ http://yuilibrary.com/license/
 var nopt = require('nopt'),
     path = require('path'),
     fs = require('fs'),
+    util = require('util'),
+    pwd = path.resolve(),
     exists = fs.existsSync || path.existsSync,
     pack = require('../package.json'),
     jsmin = require('../').jsmin,
     cssmin = require('../').cssmin,
-    sprintf = require('../lib/sprintf.js').sprintf,
     defaults = {
-        name: '%(name)s.min%(ext)s'
+        name: '%s.min%s'
     },
     known = {
         type: ['css', 'js'],
@@ -22,16 +23,14 @@ var nopt = require('nopt'),
         terminal: Boolean,
         help: Boolean,
         version: Boolean,
-        name: String,
-        compile: String
+        combine: String
     },
     shorts = {
         'o': ['--output'],
         't': ['--type'],
         'h': ['--help'],
         'v': ['--version'],
-        'n': ['--name'],
-        'c': ['--compile']
+        'c': ['--combine']
     },
     filename = defaults.name,
     parsed = nopt(known, shorts);
@@ -42,25 +41,20 @@ if (parsed.version) {
     process.exit(0);
 }
 
-if(parsed.name) {
-    filename = parsed.name;
-}
-
 if (parsed.help || (!parsed.argv.remain.length && !parsed.terminal)) {
     var help = [
         'yuglify@' + pack.version,
         '',
-        '           yuglify ./foo.js #Auto saves to ./foo-min.js',
-        '           yuglify ./foo/foo.js ./bar/bar.js #Auto saves to ./foo/foo-min.js and ./bar/bar-min.js',
-        '           yuglify ./foo/foo.css ./bar/bar.js #Auto saves to ./foo/foo-min.css and ./bar/bar-min.js',
+        '           yuglify ./foo.js #Auto saves to ./foo.min.js',
+        '           yuglify ./foo/foo.js ./bar/bar.js #Auto saves to ./foo/foo.min.js and ./bar/bar.min.js',
+        '           yuglify ./foo/foo.css ./bar/bar.js #Auto saves to ./foo/foo.min.css and ./bar/bar.min.js',
         '',
         '   --help/-h       show this',
         '   --version/-v    show version',
         '   --type js|css   what type of file to compress (used with stdin)',
         '   --terminal      use stdin and stdout instead of files',
         '   --output <file> use this file when using --terminal',
-        '   --name/-n <template> custom sprintf-based file name template',
-        '   --compile/-c <file> compiles and compresses all files into a single one.',
+        '   --combine/-c <file> compresses and combines all files into a single one.',
         '   <files to compress>'
     ];
     console.log(help.join('\n'));
@@ -91,14 +85,14 @@ if (parsed.terminal) {
     });
 } else {
 
-    console.log('Compressing:', parsed.argv.remain.join(', '));
-    
-    var buffer = '',
-        files = parsed.argv.remain;
+    console.log('Compressing ' + parsed.argv.remain.join(', ') + '...');
 
-    //Uglify is blocking, so we will do this in sync..
-    files.forEach(function(file) {
+    var buffer = {js: '', css: ''},
+        files = parsed.argv.remain;
 
+    // Uglify is blocking, so we will do this in sync.
+    files.forEach(function(file, index) {
+        
         file = path.resolve(file);
         
         if (exists(file)) {
@@ -107,37 +101,61 @@ if (parsed.terminal) {
                 destination = path.dirname(file) + '/',
                 extension = path.extname(file),
                 basename = path.basename(file).replace(extension, ''),
-                compressed = destination.concat(sprintf(filename, {name: basename, ext: extension})),
+                compressed = destination.concat(util.format(filename, basename, extension)),
                 compfn = (extension === '.css' ? cssmin : jsmin);
 
-                
             compfn(data, function(err, smashed) {
+
                 if (err) {
                     throw(err);
                     process.exit(1);
                 }
                 
-                if(parsed.compile) {
-                    buffer += smashed;
+                if(parsed.combine) {
+
+                    // Fill the buffer content by its type.
+                    buffer[extension.slice(1)] += smashed;
+
                 } else {
+
                     fs.writeFileSync(compressed, smashed, 'utf8');
-                    console.log('Compressed file:', compressed);
+
+                    // Those bizarre sets of characters are for coloring the output.
+                    console.log('Successfully generated ' + extension.slice(1).toUpperCase() + ' file: \u001b[32m' + path.relative(pwd, compressed) + '\033[0m');
+
                 }
                 
             });
         } else {
-            console.log('Failed to find', file);
+            console.log('Failed to find:', file);
             process.exit(1);
         }
     });
 
-    if(parsed.compile) {
-        
-        var compiled = parsed.compile === 'true' ? sprintf(filename, {name: 'main', ext: '.js'}) : parsed.compile;
+    if(parsed.combine) {
+
+        var combined;
+
+        // Looping through kown types.
+        known.type.forEach(function( type ) {
+
+            if(buffer[type] !== '') {
+
+                // It uses the default file name (which is main) in case user doesn't give a custom one.
+                // The file is always generated on the current folder.
+                combined = util.format(filename, parsed.combine !== 'true' ? parsed.combine : 'main', '.'.concat(type));
+
+                fs.writeFileSync(combined, buffer[type].replace(/(\n|\r)/gi, ''), 'utf8');
 
-        fs.writeFileSync(compiled, buffer.replace(/(\n|\r)/gi, ''), 'utf8');
-        console.log('Single compiled and compressed file:', compiled);
-        buffer = '';
+                // Those bizarre sets of characters are for coloring the output.
+                console.log('Generated combined ' + type.toUpperCase() + ' file: \u001b[32m' + combined + '\033[0m');
+
+            }
+
+            // Cleaning up buffer.
+            buffer[type] = '';
+
+        });
 
     }
 
diff --git a/lib/sprintf.js b/lib/sprintf.js
deleted file mode 100644
index 8d08ec7..0000000
--- a/lib/sprintf.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
-*
-* Basic sprintf implementation for JavaScript. Created for personal learning purposes.
-* This implementation has string (%s w/ padding), decimal (%d w/ padding) and object (%(foo)s) support.
-*
-* @example
-* console.log(sprintf('http://%s.%s', 'rinaldi', 'nu')); // http://rinaldi.nu
-* console.log(sprintf('%(lorem)s %(ipsum)s', {lorem: 'Lorem', ipsum: 'Ipsum'})); // Lorem Ipsum
-* console.log(sprintf('%30s', 'foo')); //                           foo
-*
-* @author Rafael Rinaldi (rafaelrinaldi.com)
-* @since Mar 17, 2010
-*
-*/
-
-var raw = '',
-	buffer = raw,
-	args = [],
-	BASIC_REGEX = /%[d|s]|%\d+[d|s]/gi,
-	COMPLEX_REGEX = /%(\(([\w_\d]+)\))s/gi;
-
-/**
-* Fill the buffer with a new entry.
-* @method pad
-* @param p_match {String} Match.
-* @param p_substitution {String} Substitution value.
-* @param p_padding {Number} Padding.
-* @private
-*/
-function pad( p_match, p_substitution, p_padding ) {
-
-	/** Tip by Miller Medeiros (millermedeiros.com). **/
-	var padding = new Array(p_padding + 1).join(' ');
-	
-	/** Computes the result to string buffer. **/
-	buffer = buffer.replace(p_match, padding + p_substitution);
-
-}
-
-/**
-* @method hasBasicFormatter
-* @return {Boolean} True if the second parameter is a number or a string, false otherwise.
-* @private
-*/
-function hasBasicFormatter() {
-	return (typeof args[1] === 'string' || typeof args[1] === 'number');
-}
-
-/**
-* @method hasComplexFormatter
-* @return {Boolean} True if the second parameter is a pure object, false otherwise.
-* @private
-*/
-function hasComplexFormatter() {
-	return (typeof args[1] === 'object');
-}
-
-/**
-* Process values in the format: %s, %d, %ns and %nd.
-* @method resolveBasic
-* @private
-*/
-function resolveBasic() {
-
-	var index = 0,
-		matches = raw.match(BASIC_REGEX),
-		match,
-		substitution,
-		padding;
-
-	do {
-		match = matches[index];
-		substitution = args[index + 1];
-		padding = parseInt(match.substring(1, match.length - 1), 10) || 0;
-
-		pad(match, substitution, padding);
-
-		index++;
-	}
-
-	while(index < matches.length);
-
-}
-
-
-/**
-* Process values in the format: %(complex)s.
-* @method resolveComplex
-* @private
-*/
-function resolveComplex() {
-
-	var index = 0,
-		matches = raw.match(COMPLEX_REGEX),
-		match,
-		id,
-		substitution;
-
-	do {
-		match = matches[index];
-		id = match.substring(2, match.length - 2);
-		substitution = args[1][id];
-
-		pad(match, substitution, 0);
-
-		index++;
-	}
-
-	while(index < matches.length);
-
-}
-
-/**
-* @method sprintf
-* @param p_raw {String} String to be sprintfied.
-* @return Sprintfied string.
-*/
-exports.sprintf = function ( p_raw ) {
-
-	raw = p_raw;
-	buffer = raw;
-	args = arguments;
-	
-	if(hasBasicFormatter()) {
-		resolveBasic();
-	} else if(hasComplexFormatter()) {
-		resolveComplex();
-	}
-
-	return !raw ? null : buffer;
-
-};
\ No newline at end of file