Pass the dictionary of CLI options rather than one by one

Author: befeleme

pyp2spec/conf2spec.py

@@ -204,11 +204,13 @@ def fill_in_template(config: ConfigFile, declarative_buildsystem: bool) -> str:
     return result
 
 
-def save_spec_file(config: ConfigFile, output: str | None, declarative_buildsystem: bool) -> str:
+def save_spec_file(config: ConfigFile, options: dict[str, str]) -> str:
     """Save the spec file in the current directory if custom output is not set.
     Return the saved file name."""
 
+    declarative_buildsystem = options.get("declarative_buildsystem")
     result = fill_in_template(config, declarative_buildsystem)
+    output = options.get("spec_output")
     if output is None:
         output = create_compat_name(config.get_string("python_name"), config.get_string("compat"))
         output += ".spec"
@@ -218,10 +220,10 @@ def save_spec_file(config: ConfigFile, output: str | None, declarative_buildsyst
     return output
 
 
-def create_spec_file(config_file: str, spec_output: str | None=None, declarative_buildsystem: bool=False) -> str | None:
+def create_spec_file(config_file: str, options: dict[str, str]) -> str | None:
     """Create and save the generate spec file."""
     config = ConfigFile(load_config_file(config_file))
-    return save_spec_file(config, spec_output, declarative_buildsystem)
+    return save_spec_file(config, options)
 
 
 @click.command()
@@ -235,9 +237,9 @@ def create_spec_file(config_file: str, spec_output: str | None=None, declarative
     "--declarative-buildsystem", is_flag=True, default=False,
     help="Create a spec file with pyproject declarative buildsystem (experimental)",
 )
-def main(config: str, spec_output: str, declarative_buildsystem: bool) -> None:
+def main(config: str, **options: dict[str, str]) -> None:
     try:
-        create_spec_file(config, spec_output, declarative_buildsystem)
+        create_spec_file(config, options)
     except (Pyp2specError, NotImplementedError) as exc:
         warn(f"Fatal exception occurred: {exc}")
         sys.exit(1)

pyp2spec/pyp2spec.py

@@ -23,7 +23,7 @@ def main(**options):  # noqa
         if options["automode"] and options["declarative_buildsystem"]:
             raise Pyp2specError("Declarative buildsystem doesn't work with automode")
         config_file = create_config(options)
-        create_spec_file(config_file, options["spec_output"], options["declarative_buildsystem"])
+        create_spec_file(config_file, options)
     except (Pyp2specError, NotImplementedError) as exc:
         warn(f"Fatal exception occurred: {exc}")
         sys.exit(1)

tests/test_conf2spec.py

@@ -56,7 +56,7 @@ def test_archful_flag_is_loaded(config_dir, conf, expected):
 )
 def test_default_generated_specfile(file_regression, config_dir, conf, db):
     # Run the conf2spec converter
-    rendered_file = conf2spec.create_spec_file(config_dir + conf, declarative_buildsystem=db)
+    rendered_file = conf2spec.create_spec_file(config_dir + conf, {"declarative_buildsystem": db})
 
     # Compare the results
     with open(rendered_file, "r", encoding="utf-8") as rendered_f: