validate catch_all hash and reduce Command#catch_all_label cognitive complexity

Author: DannyBen

lib/bashly/config_validator.rb

@@ -56,6 +56,14 @@ def assert_catch_all(key, value)
       return unless value
       assert [TrueClass, String, Hash].include?(value.class),
         "#{key} must be a boolean, a string or a hash" 
+
+      assert_catch_all_hash key, value if value.is_a? Hash
+    end
+
+    def assert_catch_all_hash(key, value)
+      assert_string "#{key}.label", value['label']
+      assert_optional_string "#{key}.help", value['help']
+      assert_boolean "#{key}.required", value['required']
     end
 
     def assert_extensible(key, value)

lib/bashly/script/command.rb

@@ -36,14 +36,14 @@ def catch_all_label
 
         if catch_all.is_a? String
           "#{catch_all.upcase}..."
-        elsif catch_all.is_a?(Hash) and catch_all['label'].is_a?(String)
+        elsif catch_all.is_a?(Hash)
           "#{catch_all['label'].upcase}..."
         else
           "..."
         end
       end
 
-      # Returns a used defined help string for the catch_all directive
+      # Returns a user defined help string for the catch_all directive
       def catch_all_help
         return nil unless catch_all