update JSON scehame with command.catch_all.catch_help and add CI tests for scehams in fixtures

Author: DannyBen

lib/bashly/views/command/long_usage.gtx

@@ -1,7 +1,7 @@
 = view_marker
 
 > if [[ -n "$long_usage" ]]; then
-= render(:usage_options).indent 2
+= render(:usage_options).indent 2 if flags.any? || fixed_flags?
 = render(:usage_args).indent 2 if args.any? or catch_all.help
 = render(:usage_environment_variables).indent 2 if environment_variables.any?
 = render(:usage_examples).indent 2 if examples

lib/bashly/views/command/usage_options.gtx

@@ -1,13 +1,11 @@
 = view_marker
 
-if flags.any? || fixed_flags?
-  options_caption = strings[:options]
-  if commands.any? && (public_flags.any? || (flags.any? && Settings.private_reveal_key))
-    options_caption = strings[:global_options]
-  end
-
-  > printf "%s\n" "{{ options_caption.color(:caption) }}"
-  >
-  = render(:usage_flags) if flags.any?
-  = render(:usage_fixed_flags)
+options_caption = strings[:options]
+if commands.any? && (public_flags.any? || (flags.any? && Settings.private_reveal_key))
+  options_caption = strings[:global_options]
 end
+
+> printf "%s\n" "{{ options_caption.color(:caption) }}"
+>
+= render(:usage_flags) if flags.any?
+= render(:usage_fixed_flags)

schemas/bashly.json

@@ -683,6 +683,11 @@
               "description": "Whether the current argument or flag is required\nhttps://bashly.dev/configuration/command/#catch_all",
               "type": "boolean",
               "default": false
+            },
+            "catch_help": {
+              "description": "Whether to also disable the --help flag and catch it like any other\nhttps://bashly.dev/configuration/command/#catch_all",
+              "type": "boolean",
+              "default": false
             }
           },
           "additionalProperties": false

spec/fixtures/workspaces/catch-all-including-help/test.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-# This fixture tests that catch all with help is displayed even when the
-# configuration file does not have any args defined.
-# It is executed as part of the Runfile examples test
-# Reference issue: https://github.com/bashly-framework/bashly/issues/74
-
 rm -f ./cli
 
 set -x

spec/fixtures/workspaces/catch-all-no-fixed-flags/test.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-# This fixture tests that catch all with help is displayed even when the
-# configuration file does not have any args defined.
-# It is executed as part of the Runfile examples test
-# Reference issue: https://github.com/bashly-framework/bashly/issues/74
-
 rm -f ./cli
 
 set -x

support/runfile/example.rb

@@ -8,7 +8,9 @@ def examples
     end
 
     def fixtures
-      filter_dirs('spec/fixtures/workspaces').map { |dir| new dir, type: :fixture }
+      filter_dirs('spec/fixtures/workspaces')
+        .select { |dir| File.exist? "#{dir}/src/bashly.yml" }
+        .map { |dir| new dir, type: :fixture }
     end
 
     def all

support/runfile/schema.runfile

@@ -16,6 +16,7 @@ end
 help 'Run all the test actions in this runfile'
 action :all do
   check_examples
+  check_fixtures
   check_settings
   check_strings
   check_arbitrary
@@ -46,6 +47,9 @@ action(:example) { |args| schema_check "examples/#{args['EXAMPLE']}/src/bashly.y
 help 'Test the bashly schema against all examples'
 action(:examples) { check_examples }
 
+help 'Test the bashly schema against all workspace fixtures'
+action(:fixtures) { check_fixtures }
+
 help 'Test the settings schema against the default settings template'
 action(:settings) { check_settings }
 
@@ -68,6 +72,15 @@ helpers do
     say "\ngub`Examples PASS`"
   end
 
+  def check_fixtures
+    say "\ngub`Fixtures`"
+    Example.fixtures.each do |example|
+      file = example.yaml_path
+      schema_check file
+    end
+    say "\ngub`Examples PASS`"
+  end
+
   def check_settings
     say "\ngub`Settings schema`"
     file = 'lib/bashly/libraries/settings/settings.yml'

support/schema/bashly.yml

@@ -581,6 +581,12 @@ definitions:
               https://bashly.dev/configuration/command/#catch_all
             type: boolean
             default: false
+          catch_help:
+            description: |-
+              Whether to also disable the --help flag and catch it like any other
+              https://bashly.dev/configuration/command/#catch_all
+            type: boolean
+            default: false
         additionalProperties: false
   completions-property:
     title: completions