feat(cli): drop --skip-rule and --show-unmatched-globs flags (#1560)

docs/guides/2-cli.md

@@ -29,14 +29,11 @@ Other options include:
   --output, -o                 output to a file instead of stdout                            [string]
   --resolver                   path to custom json-ref-resolver instance                     [string]
   --ruleset, -r                path/URL to a ruleset file                                    [string]
-  --skip-rule, -s              ignore certain rules if they are causing trouble              [string]
   --fail-severity, -F          results of this level or above will trigger a failure exit code
                                [string] [choices: "error", "warn", "info", "hint"] [default: "error"]
   --display-only-failures, -D  only output results equal to or greater than --fail-severity
                                                                            [boolean] [default: false]
   --ignore-unknown-format      do not warn about unmatched formats         [boolean] [default: false]
-  --show-unmatched-globs       show unmatched glob patterns
-                               [deprecated: use --fail-on-unmatched-globs] [boolean] [default: false]
   --fail-on-unmatched-globs    fail on unmatched glob patterns             [boolean] [default: false]
   --verbose, -v                increase verbosity                                           [boolean]
   --quiet, -q                  no logging - output only                                     [boolean]

docs/migration-guides/6.0.md

@@ -0,0 +1,7 @@
+# Spectral v5 to v6 Migration Guide (WIP)
+
+## CLI
+
+1. deprecated `--show-unmatched-globs` flag has been removed. Alternative available: `--fail-on-unmatched-globs`
+
+2. `--skip-rule` has been removed. Use a custom ruleset instead.

src/cli/commands/__tests__/lint.test.ts

@@ -77,7 +77,6 @@ describe('lint', () => {
         encoding: 'utf8',
         format: 'stylish',
         ignoreUnknownFormat: false,
-        showUnmatchedGlobs: false,
         failOnUnmatchedGlobs: false,
       });
     });
@@ -95,7 +94,6 @@ describe('lint', () => {
       encoding: 'utf8',
       format: 'stylish',
       ignoreUnknownFormat: false,
-      showUnmatchedGlobs: false,
       failOnUnmatchedGlobs: false,
     });
   });
@@ -107,7 +105,6 @@ describe('lint', () => {
       encoding: 'utf16',
       format: 'stylish',
       ignoreUnknownFormat: false,
-      showUnmatchedGlobs: false,
       failOnUnmatchedGlobs: false,
     });
   });
@@ -119,7 +116,6 @@ describe('lint', () => {
       encoding: 'utf16',
       format: 'json',
       ignoreUnknownFormat: false,
-      showUnmatchedGlobs: false,
       failOnUnmatchedGlobs: false,
     });
   });
@@ -161,36 +157,12 @@ describe('lint', () => {
     expect(writeOutput).toBeCalledWith('<formatted output>', 'foo.json');
   });
 
-  it('passes skip-rule to lint', async () => {
-    await run('lint --skip-rule foo --skip-rule bar ./__fixtures__/empty-oas2-document.json');
-    expect(lint).toHaveBeenCalledWith([expect.any(String)], {
-      skipRule: ['foo', 'bar'],
-      encoding: 'utf8',
-      format: 'stylish',
-      ignoreUnknownFormat: false,
-      showUnmatchedGlobs: false,
-      failOnUnmatchedGlobs: false,
-    });
-  });
-
   it('passes ignore-unknown-format to lint', async () => {
     await run('lint --ignore-unknown-format ./__fixtures__/empty-oas2-document.json');
     expect(lint).toHaveBeenCalledWith([expect.any(String)], {
       encoding: 'utf8',
       format: 'stylish',
       ignoreUnknownFormat: true,
-      showUnmatchedGlobs: false,
-      failOnUnmatchedGlobs: false,
-    });
-  });
-
-  it('passes show-unmatched-globs to lint', async () => {
-    await run('lint --show-unmatched-globs ./__fixtures__/empty-oas2-document.json');
-    expect(lint).toHaveBeenCalledWith([expect.any(String)], {
-      encoding: 'utf8',
-      format: 'stylish',
-      ignoreUnknownFormat: false,
-      showUnmatchedGlobs: true,
       failOnUnmatchedGlobs: false,
     });
   });
@@ -201,7 +173,6 @@ describe('lint', () => {
       encoding: 'utf8',
       format: 'stylish',
       ignoreUnknownFormat: false,
-      showUnmatchedGlobs: false,
       failOnUnmatchedGlobs: true,
     });
   });

src/cli/commands/lint.ts

@@ -81,12 +81,6 @@ const lintCommand: CommandModule = {
           type: 'string',
           coerce: toArray,
         },
-        'skip-rule': {
-          alias: 's',
-          description: 'ignore certain rules if they are causing trouble',
-          type: 'string',
-          coerce: toArray,
-        },
         'fail-severity': {
           alias: 'F',
           description: 'results of this level or above will trigger a failure exit code',
@@ -105,12 +99,6 @@ const lintCommand: CommandModule = {
           type: 'boolean',
           default: false,
         },
-        'show-unmatched-globs': {
-          description: 'show unmatched glob patterns',
-          type: 'boolean',
-          default: false,
-          deprecated: 'use --fail-on-unmatched-globs',
-        },
         'fail-on-unmatched-globs': {
           description: 'fail on unmatched glob patterns',
           type: 'boolean',
@@ -138,7 +126,6 @@ const lintCommand: CommandModule = {
       output,
       encoding,
       ignoreUnknownFormat,
-      showUnmatchedGlobs,
       failOnUnmatchedGlobs,
       ...config
     } = (args as unknown) as ILintConfig & {
@@ -153,9 +140,8 @@ const lintCommand: CommandModule = {
       encoding,
       ignoreUnknownFormat,
       failOnUnmatchedGlobs,
-      showUnmatchedGlobs,
       ruleset,
-      ...pick<Partial<ILintConfig>, keyof ILintConfig>(config, ['skipRule', 'verbose', 'quiet', 'resolver']),
+      ...pick<Partial<ILintConfig>, keyof ILintConfig>(config, ['verbose', 'quiet', 'resolver']),
     })
       .then(results => {
         if (displayOnlyFailures) {

src/cli/services/__tests__/linter.test.ts

@@ -129,24 +129,6 @@ describe('Linter service', () => {
           ]),
         );
       });
-
-      describe('and --skip-rule=info-contact is set', () => {
-        it('output other warnings but not info-contact', async () => {
-          const output = await run(`lint --skip-rule=info-contact ${document}`);
-
-          expect(output).toEqual(expect.arrayContaining([expect.objectContaining({ code: 'oas3-api-servers' })]));
-          expect(output).toEqual(expect.not.arrayContaining([expect.objectContaining({ code: 'info-contact' })]));
-        });
-      });
-
-      describe('and --skip-rule=info-contact --skip-rule=oas3-api-servers is set', () => {
-        it('outputs neither info-contact or oas3-api-servers', async () => {
-          const output = await run(`lint --skip-rule=info-contact --skip-rule=oas3-api-servers ${document}`);
-
-          expect(output).toEqual(expect.not.arrayContaining([expect.objectContaining({ code: 'info-contact' })]));
-          expect(output).toEqual(expect.not.arrayContaining([expect.objectContaining({ code: 'oas3-api-servers' })]));
-        });
-      });
     });
   });
 

src/cli/services/linter/linter.ts

@@ -4,7 +4,7 @@ import { readParsable, IFileReadOptions } from '../../../fs/reader';
 import * as Parsers from '../../../parsers';
 import { IRuleResult, Spectral } from '../../../spectral';
 import { ILintConfig } from '../../../types/config';
-import { getRuleset, listFiles, skipRules, segregateEntriesPerKind, readFileDescriptor } from './utils';
+import { getRuleset, listFiles, segregateEntriesPerKind, readFileDescriptor } from './utils';
 import { getResolver } from './utils/getResolver';
 import { YamlParserResult } from '@stoplight/yaml';
 import { DEFAULT_REQUEST_OPTIONS } from '../../../request';
@@ -45,15 +45,8 @@ export async function lint(documents: Array<number | string>, flags: ILintConfig
     }
   }
 
-  if (flags.skipRule !== void 0) {
-    spectral.setRules(skipRules(ruleset.rules, flags));
-  }
-
   const [globs, fileDescriptors] = segregateEntriesPerKind(documents);
-  const [targetUris, unmatchedPatterns] = await listFiles(
-    globs,
-    !(flags.showUnmatchedGlobs || flags.failOnUnmatchedGlobs),
-  );
+  const [targetUris, unmatchedPatterns] = await listFiles(globs, !flags.failOnUnmatchedGlobs);
   const results: IRuleResult[] = [];
 
   if (unmatchedPatterns.length > 0) {

src/cli/services/linter/utils/index.ts

@@ -2,4 +2,3 @@ export * from './getRuleset';
 export * from './listFiles';
 export * from './readFileDescriptor';
 export * from './segregateEntriesPerKind';
-export * from './skipRules';

src/types/config.ts

@@ -17,9 +17,7 @@ export interface ILintConfig {
   output?: string;
   resolver?: string;
   ruleset?: string[];
-  skipRule?: string[];
   ignoreUnknownFormat: boolean;
-  showUnmatchedGlobs: boolean;
   failOnUnmatchedGlobs: boolean;
   verbose?: boolean;
   quiet?: boolean;

test-harness/scenarios/help-no-document.scenario

@@ -18,11 +18,9 @@ Options:
   -o, --output                   output to a file instead of stdout  [string]
       --resolver                 path to custom json-ref-resolver instance  [string]
   -r, --ruleset                  path/URL to a ruleset file  [string]
-  -s, --skip-rule                ignore certain rules if they are causing trouble  [string]
   -F, --fail-severity            results of this level or above will trigger a failure exit code  [string] [choices: "error", "warn", "info", "hint"] [default: "error"]
   -D, --display-only-failures    only output results equal to or greater than --fail-severity  [boolean] [default: false]
       --ignore-unknown-format    do not warn about unmatched formats  [boolean] [default: false]
-      --show-unmatched-globs     show unmatched glob patterns  [deprecated: use --fail-on-unmatched-globs] [boolean] [default: false]
       --fail-on-unmatched-globs  fail on unmatched glob patterns  [boolean] [default: false]
   -v, --verbose                  increase verbosity  [boolean]
   -q, --quiet                    no logging - output only  [boolean]