lib/tapioca/helpers/config_helper.rb in tapioca-0.6.4 vs lib/tapioca/helpers/config_helper.rb in tapioca-0.7.0

@@ -102,15 +102,13 @@
       ).returns(T::Array[ConfigError])
     end
     def validate_config_options(command_options, config_key, config_options)
       config_options.map do |config_option_key, config_option_value|
         command_option = command_options[config_option_key.to_sym]
+        error_msg = "unknown option `#{config_option_key}` for key `#{config_key}`"
+        next build_error(error_msg) unless command_option
 
-        unless command_option
-          next build_error("unknown option `#{config_option_key}` for key `#{config_key}`")
-        end
-
         config_option_value_type = case config_option_value
         when FalseClass, TrueClass
           :boolean
         when Numeric
           :numeric
@@ -122,13 +120,12 @@
           :string
         else
           :object
         end
 
-        unless config_option_value_type == command_option.type
-          next build_error("invalid value for option `#{config_option_key}` for key `#{config_key}` " \
-            "- expected `#{command_option.type.capitalize}` but found #{config_option_value_type.capitalize}")
-        end
+        error_msg = "invalid value for option `#{config_option_key}` for key `#{config_key}` - expected " \
+          "`#{command_option.type.capitalize}` but found #{config_option_value_type.capitalize}"
+        next build_error(error_msg) unless config_option_value_type == command_option.type
       end.compact
     end
 
     class ConfigErrorMessagePart < T::Struct
       const :message, String