src/python/cram/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.5-7"
+__version__ = "0.2.5-6"
 __author__ = "Reid D. 'arrdem' McKenzie <me@arrdem.com>"
 __copyright__ = "Copyright 2020"
 __license__ = "https://anticapitalist.software/"

src/python/cram/common.py

@@ -102,7 +102,7 @@ def expandvars(s: str) -> str:
             return os.uname()[1]
         elif var == "${home}":
             return os.path.expanduser("~")
-        elif var == "${uname}" or var == "${sysname}":
+        elif var == "${uname}" | "${sysname}":
             return platform.system().lower()
         elif var == "${arch}":
             return platform.machine()

src/python/cram/v1.py

@@ -19,12 +19,7 @@ def tempf(global_config, name):
     root = Path(global_config["cram"]["root"])
     assert root.exists() and root.is_dir()
 
-    cache_dir = (
+    cache_dir = global_config.get("cram", {}).get("task", {}).get("default", {}).get("cache_dir")
-        global_config.get("cram", {})
-        .get("task", {})
-        .get("default", {})
-        .get("cache_dir")
-    )
     cache_root = cache_dir and Path(expandvars(cache_dir)) or root / ".cache"
 
     return cache_root / name[0:2] / name
@@ -43,9 +38,7 @@ class PackageV1(Package):
         return self._config
 
     def test(self):
-        return (self.root / self.SPECIAL_FILES[0]).exists() and self.config().get(
+        return (self.root / self.SPECIAL_FILES[0]).exists() and self.config().get("cram", {}).get("version") == 1
-            "cram", {}
-        ).get("version") == 1
 
     def requires(self):
         """Get the dependencies of this package."""
@@ -56,15 +49,11 @@ class PackageV1(Package):
             elif isinstance(it, dict):
                 return it["name"]
 
-        return [_name(it) for it in self.config().get("package", {}).get("require", [])]
+        return [
+            _name(it) for it in self.config().get("package", {}).get("require", [])
+        ]
 
-    def do_sh_or_script(
+    def do_sh_or_script(self, content: Optional[Union[List[str], str]], fs: Vfs, dest: Path, cwd: Path = "/tmp"):
-        self,
-        content: Optional[Union[List[str], str]],
-        fs: Vfs,
-        dest: Path,
-        cwd: Path = "/tmp",
-    ):
         if content is None:
             pass
 
@@ -77,7 +66,7 @@ class PackageV1(Package):
                 content["run"],
                 fs,
                 dest,
-                {"cwd": self.root}.get(content.get("root"), "/tmp"),
+                {"cwd": self.root}.get(content.get("root"), "/tmp")
             )
 
         elif isinstance(content, str):
@@ -104,24 +93,19 @@ class PackageV1(Package):
                 with open(installf, "r") as fp:
                     self.do_sh_or_script(fp.read(), fs, dest)
 
+
     def do_build(self, fs: Vfs, dest: Path):
         self.do_sh_or_script(self.config().get("package", {}).get("build"), fs, dest)
 
     def pre_install(self, fs: Vfs, dest: Path):
-        self.do_sh_or_script(
+        self.do_sh_or_script(self.config().get("package", {}).get("pre_install"), fs, dest)
-            self.config().get("package", {}).get("pre_install"), fs, dest
-        )
 
     def do_install(self, fs: Vfs, dest: Path):
-        if not self.do_sh_or_script(
+        if not self.do_sh_or_script(self.config().get("package", {}).get("install"), fs, dest):
-            self.config().get("package", {}).get("install"), fs, dest
-        ):
             stow(fs, self.root, dest, self.SPECIAL_FILES)
 
     def post_install(self, fs: Vfs, dest: Path):
-        self.do_sh_or_script(
+        self.do_sh_or_script(self.config().get("package", {}).get("post_install"), fs, dest)
-            self.config().get("package", {}).get("post_install"), fs, dest
-        )
 
     def json(self):
         return self.config()
@@ -140,24 +124,16 @@ class LightPackageV1(PackageV1):
         return self._config
 
     def test(self):
-        return (
+        return self.root.exists() \
-            self.root.exists()
+            and self.root.is_file() \
-            and self.root.is_file()
+            and self.root.name.endswith(".toml") \
-            and self.root.name.endswith(".toml")
             and self.config().get("cram", {}).get("version") == 1
-        )
 
 
 class ProfileV1(PackageV1):
     """Unline packages, profiles don't support recursive stow of contents."""
 
-    _LEGACY_SPECIAL_FILES = [
+    _LEGACY_SPECIAL_FILES = ["BUILD", "PRE_INSTALL", "INSTALL", "POST_INSTALL", "REQUIRES"]
-        "BUILD",
-        "PRE_INSTALL",
-        "INSTALL",
-        "POST_INSTALL",
-        "REQUIRES",
-    ]
     SPECIAL_FILES = []
     _config = None
 
@@ -165,9 +141,7 @@ class ProfileV1(PackageV1):
         return {}
 
     def test(self):
-        return self.root.is_dir() and not any(
+        return self.root.is_dir() and not any((self.root / f).exists() for f in self._LEGACY_SPECIAL_FILES)
-            (self.root / f).exists() for f in self._LEGACY_SPECIAL_FILES
-        )
 
     def do_install(self, fs: Vfs, dest: Path):
         return