cleanup

Author: DannyBen

lib/bashly/config_validator.rb

@@ -112,6 +112,7 @@ def assert_command(key, value)
       assert_hash key, value, Script::Command.option_keys
 
       refute value['commands'] && value['args'], "#{key} cannot have both commands and args"
+      refute value['commands'] && value['catch_all'], "#{key} cannot have both commands and catch_all"
 
       assert_string "#{key}.name", value['name']
       assert_optional_string "#{key}.help", value['help']
@@ -150,10 +151,6 @@ def assert_command(key, value)
         refute repeatable_arg, "#{key}.catch_all makes no sense with repeatable arg (#{repeatable_arg})"
       end
 
-      if value['catch_all']
-        refute value['commands'], "#{key}.catch_all makes no sense with commands"
-      end
-
       if value['expose']
         assert value['commands'], "#{key}.expose makes no sense without commands"
       end

spec/approvals/validations/command_catch_all_commands

@@ -1 +1 @@
-#<Bashly::ConfigurationError: root.catch_all makes no sense with commands>
+#<Bashly::ConfigurationError: root cannot have both commands and catch_all>

spec/fixtures/script/validations.yml

@@ -102,14 +102,6 @@
   args:
   - name: source
 
-# :commands_and_flags:
-#   name: invalid
-#   help: there are both commands and flags
-#   commands:
-#   - name: sub
-#   flags:
-#   - long: --force
-
 :commands_default_without_args:
   name: invalid
   help: default command requires args