From: yuanchuan <yuanchuan23@gmail.com>
Date: Thu, 23 Jul 2015 03:32:48 +0000 (+0800)
Subject: improve and simplify logs with wrapped methods in `cli` module
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=d775dc5ae73b66ba0abd97918d596df8b1a06378;p=html-minifier.git

improve and simplify logs with wrapped methods in `cli` module
---

diff --git a/cli.js b/cli.js
index 2a5c24a..0ee883e 100755
--- a/cli.js
+++ b/cli.js
@@ -143,8 +143,7 @@ cli.main(function(args, options) {
         }
       }
       catch (e) {
-        process.stderr.write('Error: Could not parse JSON value \'' + value + '\'');
-        cli.exit(1);
+        cli.fatal('Could not parse JSON value \'' + value + '\'');
       }
       if (jsonArray instanceof Array) {
         return jsonArray;
@@ -163,8 +162,8 @@ cli.main(function(args, options) {
     }
     catch (e) {
       status = 3;
-      process.stderr.write('Error: Minification error');
-      process.stderr.write('\n' + e);
+      cli.error('Minification error');
+      process.stderr.write(e);
     }
 
     if (minifyOptions.lint) {
@@ -183,7 +182,7 @@ cli.main(function(args, options) {
       }
       catch (e) {
         status = 4;
-        process.stderr.write('Error: Cannot write to output');
+        cli.error('Cannot write to output');
       }
     }
 
@@ -191,7 +190,7 @@ cli.main(function(args, options) {
   }
 
   if (options.version) {
-    process.stderr.write(appName + ' v' + appVersion);
+    cli.output(appName + ' v' + appVersion);
     cli.exit(0);
   }
 
@@ -203,8 +202,7 @@ cli.main(function(args, options) {
       }
     }
     catch (e) {
-      process.stderr.write('Error: Cannot read the specified config file');
-      cli.exit(1);
+      cli.fatal('Cannot read the specified config file');
     }
   }
 
@@ -252,7 +250,7 @@ cli.main(function(args, options) {
         original += fs.readFileSync(afile, 'utf8');
       }
       catch (e) {
-        process.stderr.write('Error: Cannot read file ' + afile);
+        cli.error('Cannot read file ' + afile);
         cli.exit(2);
       }
     });