Fixed missing variables in render context.

Author: coordt

generate_changelog/cli.py

@@ -63,15 +63,15 @@ def main(
     repository = Repo(search_parent_directories=True)
 
     # get starting tag based on configuration
-    start_tag_pipeline = pipeline_factory(config.starting_tag_pipeline)
+    start_tag_pipeline = pipeline_factory(config.starting_tag_pipeline, **config.variables)
     starting_tag = start_tag_pipeline.run()
     if not starting_tag:
         typer.echo("No starting tag found. Generating entire change log.")
     else:
         typer.echo(f"Generating change log from tag: '{starting_tag}'.")
 
     # use the output pipeline to deal with the rendered change log.
-    output_pipeline = pipeline_factory(config.output_pipeline)
+    output_pipeline = pipeline_factory(config.output_pipeline, **config.variables)
     output_pipeline.run(templating.render(repository, config, starting_tag))
 
 

generate_changelog/pipeline.py

@@ -130,6 +130,7 @@ def pipeline_factory(
     action_list: list,
     commit_metadata_func: Optional[Callable] = None,
     version_metadata_func: Optional[Callable] = None,
+    **kwargs,
 ) -> Pipeline:
     """Create a Pipeline from a list of configured actions."""
     action_specs = [ActionSpec(**action) for action in action_list]
@@ -144,4 +145,4 @@ def pipeline_factory(
         )
         for a in action_specs
     ]
-    return Pipeline(actions=actions)
+    return Pipeline(actions=actions, **kwargs)

generate_changelog/templating.py

@@ -185,17 +185,17 @@ def get_context_from_tags(repository: Repo, config: Configuration, starting_tag:
 
 def render(repository: Repo, config: Configuration, starting_tag: Optional[str] = None) -> str:
     """Render the changelog for the repository to a string."""
-    context = get_context_from_tags(repository, config, starting_tag)
+    version_context = get_context_from_tags(repository, config, starting_tag)
+    context = get_config().variables.copy()
+    context["versions"] = version_context
+    context["VALID_AUTHOR_TOKENS"] = get_config().valid_author_tokens
+
     if starting_tag:
         heading_str = default_env.get_template("heading.md.jinja").render()
-        versions_str = default_env.get_template("versions.md.jinja").render(
-            {"versions": context, "VALID_AUTHOR_TOKENS": get_config().valid_author_tokens}
-        )
+        versions_str = default_env.get_template("versions.md.jinja").render(context)
         return "\n".join([heading_str, versions_str])
 
-    return default_env.get_template("base.md.jinja").render(
-        {"versions": context, "VALID_AUTHOR_TOKENS": get_config().valid_author_tokens}
-    )
+    return default_env.get_template("base.md.jinja").render(context)
 
 
 def first_matching(section_patterns: dict, string: str) -> str:

generate_changelog/utilities.py

@@ -14,13 +14,16 @@ def is_pipeline(value: Any) -> bool:
 
 def eval_if_callable(value: Any) -> Any:
     """Return value or the result of calling value."""
+    from generate_changelog.configuration import get_config
     from generate_changelog.pipeline import pipeline_factory
 
+    config = get_config()
+
     if is_action(value):
         # convert it into a single action and call it
-        return pipeline_factory([value]).run()
+        return pipeline_factory([value], **config.variables).run()
     elif is_pipeline(value):
-        return pipeline_factory(value).run()
+        return pipeline_factory(value, **config.variables).run()
 
     return value() if callable(value) else value