[cli] Use old linter

hadabo · Feb 8, 2017 · dd30f0b · dd30f0b
1 parent 49cae43
commit dd30f0b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 75 deletions.
diff --git a/src/cli.js b/src/cli.js
@@ -43,24 +43,20 @@ if (options.detect) {
 var config = getConfig();
 comb.configure(config);
 
-if (options.fix && process.stdin.isTTY) {
+if (process.stdin.isTTY) {
   processFiles(options._);
-} else if (options.fix) {
-  processSTDIN();
-} else if (process.stdin.isTTY) {
-  lintFiles(options._);
 } else {
-  lintSTDIN();
+  processSTDIN();
 }
 
 
 function getOptions() {
   var parserOptions = {
-    boolean: ['help', 'fix', 'verbose'],
+    boolean: ['help', 'lint', 'verbose'],
     alias: {
       config: 'c',
       detect: 'd',
-      fix: 'f',
+      lint: 'l',
       help: 'h',
       verbose: 'v'
     }
@@ -82,8 +78,8 @@ function displayHelp() {
     '        Path to configuration file.',
     '    -d, --detect',
     '        Run the tool in detect mode, returning detected options.',
-    '    -f, --fix',
-    '        Run the tool in fixer mode, modifying files when possible.',
+    '    -l, --lint',
+    '        Run the tool in linter mode, without modifying files.',
     '    -h, --help',
     '        Display help message.',
     '    -v, --verbose',
@@ -119,6 +115,7 @@ function getConfig() {
 
   applyTemplate(config);
   if (options.verbose) config.verbose = options.verbose;
+  if (options.lint) config.lint = options.lint;
 
   return config;
 }
@@ -155,15 +152,21 @@ function processFiles(files) {
       return a + b;
     }, 0);
 
-    if (config.verbose) {
+    var changed = options.lint ? 0 : tbchanged;
+
+    if (options.verbose) {
       let message = [
           `${c.length} file${c.length === 1 ? '' : 's'} processed`,
-          `${tbchanged} file${tbchanged === 1 ? '' : 's'} fixed`,
+          `${changed} file${changed === 1 ? '' : 's'} fixed`,
           ''
           ].join('\n');
       process.stdout.write(message);
     }
 
+    if (options.lint && tbchanged) {
+      process.exit(1);
+    }
+
     process.exit(0);
   });
 }
@@ -181,63 +184,3 @@ function processInputData(input) {
     process.exit(0);
   });
 }
-
-function lintFiles(files) {
-  let anyErrorsFound = false;
-
-  const promises = files.map(file => {
-    return comb.lintPath(file).then(errors => {
-      if (!errors.length) {
-        return;
-      }
-
-      anyErrorsFound = true;
-      const message = formatErrors(file, errors);
-      process.stdout.write(message);
-    });
-  });
-
-  Promise.all(promises).catch(error => {
-    process.stderr.write(error.message);
-    process.exit(1);
-  }).then(function() {
-    if (anyErrorsFound) {
-      process.exit(1);
-    } else {
-      process.exit(0);
-    }
-  });
-}
-
-function formatErrors(fileName, errors) {
-  let message = [];
-
-  errors.forEach(error => {
-    message.push(
-        error.message + ' at ' + fileName + ':' + error.line,
-        error.context,
-        '',
-        ''
-        );
-  });
-
-  return message.join('\n');
-}
-
-function lintSTDIN() {
-  getInputData.then(lintInputData);
-}
-
-function lintInputData(input) {
-  comb.lintString(input).catch(e => {
-    process.stderr.write(e.message);
-    process.exit(1);
-  }).then(output => {
-    if (!output.length) {
-      process.exit(0);
-    } else {
-      process.stdout.write(output);
-      process.exit(1);
-    }
-  });
-}
diff --git a/src/core.js b/src/core.js
@@ -197,10 +197,16 @@ class Comb {
             resolve(0);
           }
 
-          return vfs.write(path, processedData, 'utf8').then(function() {
-            if (that.verbose) console.log('✓', path);
+          let tick = that.lint ? '!' : '✓';
+          if (that.lint) {
+            if (that.verbose) console.log(tick, path);
             resolve(1);
-          });
+          } else {
+            return vfs.write(path, processedData, 'utf8').then(function() {
+              if (that.verbose) console.log(tick, path);
+              resolve(1);
+            });
+          }
         });
       });
     });