Merge pull request #15 from vkottler/dev/1.1.1

1.1.1 - Fix some minor bugs

README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.2
-    hash=d6cd0e307dd25044b7eb3a7adaf13b33
+    hash=e17a2a1feecf3316dd227e4ef69c4351
     =====================================
 -->
 
-# rcmpy ([1.1.0](https://pypi.org/project/rcmpy/))
+# rcmpy ([1.1.1](https://pypi.org/project/rcmpy/))
 
 [![python](https://img.shields.io/pypi/pyversions/rcmpy.svg)](https://pypi.org/project/rcmpy/)
 ![Build Status](https://github.com/vkottler/rcmpy/workflows/Python%20Package/badge.svg)

local/variables/package.yaml

@@ -1,5 +1,5 @@
 ---
 major: 1
 minor: 1
-patch: 0
+patch: 1
 entry: rcmpy

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "rcmpy"
-version = "1.1.0"
+version = "1.1.1"
 description = "A configuration-file management system."
 readme = "README.md"
 requires-python = ">=3.7"

rcmpy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.2
-# hash=db6b75d059437ccfb73620d52efc9103
+# hash=8cf27e726efd71565b56531e6b4da766
 # =====================================
 
 """
@@ -10,4 +10,4 @@
 
 DESCRIPTION = "A configuration-file management system."
 PKG_NAME = "rcmpy"
-VERSION = "1.1.0"
+VERSION = "1.1.1"

rcmpy/environment/template.py

@@ -92,7 +92,10 @@ def _init_templates(self, template_names: Set[str]) -> bool:
         that may be relevant to some task.
         """
 
-        candidates = self.state.root_directories("templates")
+        # The variant's template directory takes precedence.
+        candidates = self.state.root_directories(
+            "templates", common_first=False
+        )
 
         # Prefer variant templates, if the variant template-directory
         # exists.

rcmpy/state/__init__.py

@@ -86,7 +86,9 @@ def update_manifest(self, data: Dict[str, Any]) -> None:
         self.manifest_new = self.manifest != data
         self.manifest = data
 
-    def root_directories(self, subdir: str) -> List[Path]:
+    def root_directories(
+        self, subdir: str, common_first: bool = True
+    ) -> List[Path]:
         """
         Get up to a pair of directories from some sub-directory of the current
         root.
@@ -96,7 +98,10 @@ def root_directories(self, subdir: str) -> List[Path]:
 
         candidates = [root.joinpath("common")]
         if self.variant:
-            candidates.insert(0, root.joinpath(self.variant))
+            if common_first:
+                candidates.append(root.joinpath(self.variant))
+            else:
+                candidates.insert(0, root.joinpath(self.variant))
 
         return [x for x in candidates if x.is_dir()]
 
@@ -124,6 +129,7 @@ def preprocessor(stream: DataStream) -> DataStream:
                         expect_overwrite=True,
                         preprocessor=preprocessor,
                     ).data,
+                    expect_overwrite=True,
                     logger=self.logger,
                 )
 
@@ -147,6 +153,7 @@ def _load_variables(self) -> None:
                     includes_key="includes",
                     expect_overwrite=True,
                 ).data,
+                expect_overwrite=True,
                 logger=self.logger,
             )