Fix minor shell auto-completion mismatches (#587)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

completion/jsonschema.bash

@@ -11,7 +11,7 @@ _jsonschema() {
     previous=""
   fi
 
-  commands="validate metaschema compile test fmt lint bundle inspect encode decode version help"
+  commands="validate metaschema compile test fmt lint bundle inspect canonicalize encode decode version help"
 
   global_options="--verbose -v --resolve -r --default-dialect -d --json -j --http -h"
 
@@ -59,7 +59,7 @@ _jsonschema() {
 
   case "${command}" in
     validate)
-      local options="--http -h --benchmark -b --loop -l --extension -e --ignore -i --trace -t --fast -f --template -m"
+      local options="--benchmark -b --loop -l --extension -e --ignore -i --trace -t --fast -f --template -m"
       if [[ ${current} == -* ]]
       then
         COMPREPLY=( $(compgen -W "${options} ${global_options}" -- "${current}") )
@@ -68,7 +68,7 @@ _jsonschema() {
       fi
       ;;
     metaschema)
-      local options="--http -h --extension -e --ignore -i --trace -t"
+      local options="--extension -e --ignore -i --trace -t"
       if [[ ${current} == -* ]]
       then
         COMPREPLY=( $(compgen -W "${options} ${global_options}" -- "${current}") )
@@ -77,7 +77,7 @@ _jsonschema() {
       fi
       ;;
     compile)
-      local options="--http -h --extension -e --ignore -i --fast -f --minify -m"
+      local options="--extension -e --ignore -i --fast -f --minify -m"
       if [[ ${current} == -* ]]
       then
         COMPREPLY=( $(compgen -W "${options} ${global_options}" -- "${current}") )
@@ -86,7 +86,7 @@ _jsonschema() {
       fi
       ;;
     test)
-      local options="--http -h --extension -e --ignore -i"
+      local options="--extension -e --ignore -i"
       if [[ ${current} == -* ]]
       then
         COMPREPLY=( $(compgen -W "${options} ${global_options}" -- "${current}") )
@@ -113,7 +113,7 @@ _jsonschema() {
       fi
       ;;
     bundle)
-      local options="--http -h --extension -e --ignore -i --without-id -w"
+      local options="--extension -e --ignore -i --without-id -w"
       if [[ ${current} == -* ]]
       then
         COMPREPLY=( $(compgen -W "${options} ${global_options}" -- "${current}") )
@@ -129,6 +129,14 @@ _jsonschema() {
         COMPREPLY=( $(compgen -f -X '!*.json' -X '!*.yaml' -X '!*.yml' -- "${current}") )
       fi
       ;;
+    canonicalize)
+      if [[ ${current} == -* ]]
+      then
+        COMPREPLY=( $(compgen -W "${global_options}" -- "${current}") )
+      else
+        COMPREPLY=( $(compgen -f -X '!*.json' -X '!*.yaml' -X '!*.yml' -- "${current}") )
+      fi
+      ;;
     encode)
       if [[ ${current} == -* ]]
       then

completion/jsonschema.zsh

@@ -15,6 +15,7 @@ _jsonschema() {
     'lint:Lint schemas and optionally fix issues'
     'bundle:Inline remote references in a schema'
     'inspect:Display schema locations and references'
+    'canonicalize:Transform a schema into a canonical form'
     'encode:Encode JSON using JSON BinPack'
     'decode:Decode JSON using JSON BinPack'
     'version:Print version information'
@@ -114,6 +115,11 @@ _jsonschema() {
             ${global_options[@]} \
             '1:schema file:_files -g "*.json *.yaml *.yml"'
           ;;
+        canonicalize)
+          _arguments \
+            ${global_options[@]} \
+            '1:schema file:_files -g "*.json *.yaml *.yml"'
+          ;;
         encode)
           _arguments \
             ${global_options[@]} \

src/main.cc

@@ -21,6 +21,7 @@ Global Options:
    --default-dialect, -d <uri>    Specify the URI for the default dialect to be used
                                   if the `$schema` keyword is not set
    --json, -j                     Prefer JSON output if supported
+   --http, -h                     Allow network access to resolve remote schemas
 
 Commands:
 
@@ -32,9 +33,8 @@ Global Options:
 
        Print this command reference help.
 
-   validate <schema.json|.yaml> <instance.json|.jsonl|.yaml|directory...> [--http/-h]
-            [--benchmark/-b] [--loop <iterations>]
-            [--extension/-e <extension>]
+   validate <schema.json|.yaml> <instance.json|.jsonl|.yaml|directory...>
+            [--benchmark/-b] [--loop <iterations>] [--extension/-e <extension>]
             [--ignore/-i <schemas-or-directories>] [--trace/-t] [--fast/-f]
             [--template/-m <template.json>]
 
@@ -51,19 +51,18 @@ Global Options:
        for error reporting purposes. Make sure they match or you will get
        non-sense results.
 
-   metaschema [schemas-or-directories...] [--http/-h]
-              [--extension/-e <extension>]
+   metaschema [schemas-or-directories...] [--extension/-e <extension>]
               [--ignore/-i <schemas-or-directories>] [--trace/-t]
 
        Validate that a schema or a set of schemas are valid with respect
        to their metaschemas.
 
-   compile <schema.json|.yaml> [--http/-h] [--extension/-e <extension>]
+   compile <schema.json|.yaml> [--extension/-e <extension>]
            [--ignore/-i <schemas-or-directories>] [--fast/-f] [--minify/-m]
 
        Compile the given schema into an internal optimised representation.
 
-   test [schemas-or-directories...] [--http/-h] [--extension/-e <extension>]
+   test [schemas-or-directories...] [--extension/-e <extension>]
         [--ignore/-i <schemas-or-directories>]
 
        Run a set of unit tests against a schema.
@@ -84,7 +83,7 @@ Global Options:
        Use --list/-l to print a summary of all enabled rules.
        Use --indentation/-n to keep indentation when auto-fixing
 
-   bundle <schema.json|.yaml> [--http/-h] [--extension/-e <extension>]
+   bundle <schema.json|.yaml> [--extension/-e <extension>]
           [--ignore/-i <schemas-or-directories>] [--without-id/-w]
 
        Perform JSON Schema Bundling on a schema to inline remote references,
@@ -95,7 +94,7 @@ Global Options:
        Statically inspect a schema to display schema locations and
        references in a human-readable manner.
 
-   canonicalize <schema.json|.yaml> [--http/-h]
+   canonicalize <schema.json|.yaml>
 
        Transform a JSON Schema into a canonical normalized form.
        Canonicalization is a process that simplifies a schema into a

test/autocomplete_bash.sh

@@ -71,6 +71,7 @@ test_completion "jsonschema " "fmt" "Command completion includes fmt"
 test_completion "jsonschema " "lint" "Command completion includes lint"
 test_completion "jsonschema " "bundle" "Command completion includes bundle"
 test_completion "jsonschema " "inspect" "Command completion includes inspect"
+test_completion "jsonschema " "canonicalize" "Command completion includes canonicalize"
 test_completion "jsonschema " "encode" "Command completion includes encode"
 test_completion "jsonschema " "decode" "Command completion includes decode"
 test_completion "jsonschema " "version" "Command completion includes version"
@@ -91,4 +92,7 @@ test_completion "jsonschema compile --" "--minify" "Compile includes --minify"
 test_completion "jsonschema fmt --" "--check" "Fmt includes --check"
 test_completion "jsonschema fmt --" "--keep-ordering" "Fmt includes --keep-ordering"
 
+test_completion "jsonschema canonicalize --" "--http" "Canonicalize includes --http"
+test_completion "jsonschema canonicalize --" "--verbose" "Canonicalize includes global option --verbose"
+
 echo "PASS" 1>&2