Merge branch 'master' into fix-override-with-disabled-rule

Author: mdaloia

lib/loader.js

@@ -6,6 +6,7 @@ const path = require('path');
 const rules = require('./rules.js');
 const resolver = require('oas-resolver');
 const yaml = require('js-yaml');
+const readline = require('readline');
 
 class ExtendableError extends Error {
     constructor(message) {
@@ -27,6 +28,21 @@ function readFileAsync(filename, encoding) {
     });
 }
 
+function readFileStdinAsync() {
+    return new Promise((resolve, reject) => {
+        const rl = readline.createInterface({
+            input: process.stdin
+        });
+        let lines = [];
+        rl.on('line', (line) => {
+            lines.push(line);
+        });
+        rl.on('close', () => {
+            resolve(lines.join('\n'));
+        });
+    });
+}
+
 const fetchUrl = async (url) => {
     let response;
     try {
@@ -45,18 +61,24 @@ const fetchUrl = async (url) => {
 };
 
 
+// file can be null, meaning stdin
 function readSpecFile(file, options) {
     if (options.verbose > 1) {
-        console.log('GET ' + file);
+        file ? console.error('GET ' + file) : console.error('GET <stdin>');
     }
-    if (file && file.startsWith('http')) {
+    if (!file) {
+        // standard input
+        return readFileStdinAsync();
+    } else if (file && file.startsWith('http')) {
+        // remote file
         return fetch(file).then(res => {
             if (res.status !== 200) {
                 throw new Error(`Received status code ${res.status}`);
             }
             return res.text();
         })
     } else {
+        // local file
         // TODO error handlers?
         return readFileAsync(file, 'utf8');
     }
@@ -83,16 +105,16 @@ const recursivelyLoadRulesets = async (ruleset, loadedRulesets, options) => {
     let text;
     // If the ruleset looks like a HTTP URL
     if (ruleset && ruleset.startsWith('http')) {
-        if (verbose > 1) console.log('GET ' + ruleset);
+        if (verbose > 1) console.error('GET ' + ruleset);
         text = await fetchUrl(ruleset);
     }
     else if (fs.existsSync(ruleset)) {
-        if (verbose > 1) console.log('READ ' + ruleset);
+        if (verbose > 1) console.error('READ ' + ruleset);
         text = fs.readFileSync(ruleset, 'utf8');
     }
     else {
         const rulesetFile = path.join(__dirname, '../rules/' + ruleset + '.yaml');
-        if (verbose > 1) console.log('READ ' + rulesetFile);
+        if (verbose > 1) console.error('READ ' + rulesetFile);
         text = fs.readFileSync(rulesetFile, 'utf8');
     }
 

lint.js

@@ -68,7 +68,7 @@ More information: https://speccy.io/rules/1-rulesets#${rule.name}
 const command = async (specFile, cmd) => {
     config.init(cmd);
     const jsonSchema = config.get('jsonSchema');
-    const verbose = config.get('quiet') ? 0 : (config.get('verbose') ? 2 : 1);
+    const verbose = config.get('quiet') ? 0 : config.get('verbose', 1); 
     const rulesets = config.get('lint:rules');
     const skip = config.get('lint:skip');
 
@@ -84,7 +84,7 @@ const command = async (specFile, cmd) => {
     );
 
     return new Promise((resolve, reject) => {
-            validator.validate(spec, buildValidatorOptions(skip, verbose), (err, _options) => {
+        validator.validate(spec, buildValidatorOptions(skip, verbose), (err, _options) => {
             const { context, warnings, valid } = _options || err.options;
 
             if (err && valid === false) {