effectual 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

effectual/__init__.py

@@ -8,7 +8,10 @@ def main() -> None:
 
 @click.command("dist")
 def dist() -> None:
-    """Bundles your source directory."""
+    """
+    Bundles your source directory
+    into a production bundle
+    """
     from . import build
 
     build.main()
@@ -16,7 +19,10 @@ def dist() -> None:
 
 @click.command("dev")
 def dev() -> None:
-    """Bundles your source directory."""
+    """
+    Bundles your source directory
+    into a developer bundle
+    """
     from . import developer
 
     developer.main()

effectual/build.py

@@ -10,15 +10,15 @@ from watch_lite import getHash
 
 from .colors import completeColor, fileColor, folderColor, tagColor
 from .config import dumpHashes, loadConfig, loadToml
-from .minifier import minifyFile, minifyToString
+from .transformations import minifyFile, minifyToString
 
 
 def bundleFiles(
-    sourceDirectory: Path,
-    outputDirectory: Path,
-    outputFileName: str,
-    compressionLevel: int,
-    minification: bool,
+    sourceDirectory: Path = Path("./src/"),
+    outputDirectory: Path = Path("./out"),
+    outputFileName: str = "bundle.pyz",
+    compressionLevel: int = 5,
+    minification: bool = True,
 ) -> None:
     """Bundles dependencies and scripts into a single .pyz archive
 
@@ -42,16 +42,19 @@ def bundleFiles(
         compression=zipfile.ZIP_DEFLATED,
     ) as bundler:
         cachePath: Path = Path("./.effectual_cache/cachedPackages")
-
-        totalSize: int = int(0)
-        for cachedFile in cachePath.rglob("*"):
-            if cachedFile.is_dir() and not any(cachedFile.iterdir()):
-                continue
-            totalSize += cachedFile.stat().st_size
-            arcName = cachedFile.relative_to(cachePath)
-            bundler.write(cachedFile, arcname=arcName)
-
-        print(f"{tagColor('bundling')}   || uv dependencies {folderColor(totalSize)}")
+        if cachePath.exists():
+            if os.listdir(cachePath):
+                totalSize: int = int(0)
+                for cachedFile in cachePath.rglob("*"):
+                    if cachedFile.is_dir() and not any(cachedFile.iterdir()):
+                        continue
+                    totalSize += cachedFile.stat().st_size
+                    arcName = cachedFile.relative_to(cachePath)
+                    bundler.write(cachedFile, arcname=arcName)
+
+                print(
+                    f"{tagColor('bundling')}   || uv dependencies {folderColor(totalSize)}"  # noqa: E501
+                )
 
         for pyFile in sourceDirectory.rglob("*.py"):
             print(f"{tagColor('bundling')}   || {pyFile.name} {fileColor(pyFile)}")
@@ -65,27 +68,36 @@ def bundleFiles(
 
 
 def dependencies(minify: bool) -> None:
-    with open("./pyproject.toml", "r", encoding="utf-8") as file:
-        packages: list[str] = loadToml(file).get("project").get("dependencies")  # type: ignore
+    packages: list[str] = (
+        loadToml("./pyproject.toml").get("project").get("dependencies")
+    )
 
-    arguments: list[str] = ["--no-compile", "--quiet", "--no-binary=none", "--no-cache"]
+    if len(packages) != 0:
+        arguments: list[str] = [
+            "--no-compile",
+            "--quiet",
+            "--no-binary=none",
+            "--no-cache",
+        ]
 
-    pathToInstallTo: str = "./.effectual_cache/cachedPackages"
-    argumentString: str = " ".join(arguments)
+        pathToInstallTo: str = "./.effectual_cache/cachedPackages"
+        argumentString: str = " ".join(arguments)
 
-    if Path(pathToInstallTo).exists():
-        shutil.rmtree(pathToInstallTo)
+        if Path(pathToInstallTo).exists():
+            shutil.rmtree(pathToInstallTo)
 
-    for key in packages:
-        print(f"{tagColor('installing')} || {key}")
-        os.system(f'uv pip install "{key}" {argumentString} --target {pathToInstallTo}')
+        for key in packages:
+            print(f"{tagColor('installing')} || {key}")
+            os.system(
+                f'uv pip install "{key}" {argumentString} --target {pathToInstallTo}'
+            )
 
-    print(f"{tagColor('optimizing')} || {', '.join(packages)}")
+        print(f"{tagColor('optimizing')} || {', '.join(packages)}")
 
-    multiprocessing = importlib.import_module("multiprocessing")
+        multiprocessing = importlib.import_module("multiprocessing")
 
-    with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as pool:
-        pool.map(optimizeDependencies, Path(pathToInstallTo).rglob("*"))
+        with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as pool:
+            pool.map(optimizeDependencies, Path(pathToInstallTo).rglob("*"))
 
 
 def optimizeDependencies(file: Path) -> None:
@@ -111,7 +123,7 @@ def main() -> None:
         RuntimeError: In the event there is no source directory
     """
 
-    configData: dict[Any, Any] = loadConfig("./pyproject.toml")
+    configData: dict[str, Any] = loadConfig("./pyproject.toml")
 
     sourceDirectory: Path = Path(configData.get("sourceDirectory", "src/"))
     outputDirectory: Path = Path(configData.get("outputDirectory", "out/"))
@@ -119,8 +131,7 @@ def main() -> None:
     compressionLevel: int = max(
         0, min(9, configData.get("compressionLevel", 5))
     )  # Default level if not set
-    global minification
-    minification = configData.get("minification", True)
+    minification: bool = configData.get("minification", True)
 
     if not sourceDirectory.is_dir():
         raise RuntimeError(
@@ -138,8 +149,7 @@ def main() -> None:
     currentHash["hashes"]["lock"] = getHash("./uv.lock")
 
     if uvHashPath.exists():
-        with open(uvHashPath, "r") as file:
-            lastHash: dict[Any, Any] = loadToml(file).get("hashes")
+        lastHash: dict[str, Any] = loadToml(uvHashPath).get("hashes")
         if currentHash["hashes"] != lastHash:
             with open(uvHashPath, "w") as file:
                 dumpHashes(currentHash, file)

effectual/config.py

@@ -1,14 +1,15 @@
 import io
+from pathlib import Path
 from typing import Any
 
 import rtoml
 
 
-def loadToml(tomlFile: str | io.TextIOWrapper) -> dict[str, Any]:
+def loadToml(tomlFile: str | Path) -> dict[str, Any]:
     """Loads a toml file from a specific path to a dictionary
 
     Args:
-        pathToToml (str | io.TextIOWrapper): Path or object of a toml file
+        pathToToml (str): Path of a toml file
 
     Raises:
         RuntimeError: Toml file is incorrectly configured
@@ -19,14 +20,14 @@ def loadToml(tomlFile: str | io.TextIOWrapper) -> dict[str, Any]:
     """
     try:
         with open(tomlFile, "r", encoding="utf-8") as file:
-            return dict(rtoml.load(file))  # type: ignore
+            return dict(rtoml.load(file))
     except ValueError as e:
         raise RuntimeError(f"Invalid TOML in {tomlFile}: {e}")
     except FileNotFoundError:
         raise RuntimeError(f"TOML file {tomlFile} not found.")
 
 
-def loadConfig(configPath: str) -> dict[Any, Any]:
+def loadConfig(configPath: str = "./pyproject.toml") -> dict[Any, Any]:
     """Loads effectual config from a file
 
     Args:
@@ -57,4 +58,4 @@ def dumpHashes(hashesToDump: dict[str, dict[str, str]], file: io.TextIOWrapper)
         hashesToDump (dict[str, dict[str, str]]): Dictionary of hashes to dump as toml
         file (_type_): File object
     """
-    return rtoml.dump(hashesToDump, file, pretty=False)
+    rtoml.dump(hashesToDump, file, pretty=False)

effectual/developer.py

@@ -46,10 +46,10 @@ def main() -> None:
     while True:
         currentHashSet: set[str] = getAllHashes(str(sourceDirectory))
         if currentHashSet != lastHashSet:
-            lastHashSet = currentHashSet
             runCommand.kill()
             runCommand.wait()
             outputFile.unlink()
+            lastHashSet = currentHashSet
             print(f"{tagColor('reloaded')}   || file change detected")
             bundle(sourceDirectory, outputFile)
             runCommand = subprocess.Popen(["uv", "run", outputFile], shell=True)

{effectual-0.5.3.dist-info → effectual-0.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: effectual
-Version: 0.5.3
+Version: 0.5.5
 Summary: A python package/script bundler
 Project-URL: Homepage, https://github.com/effectualpy/effectual
 Author-email: jake <jakewdr@proton.me>

effectual-0.5.5.dist-info/RECORD

@@ -0,0 +1,11 @@
+effectual/__init__.py,sha256=Hg_RSVgpLZvaeBUqt5uL_r5YIDsVdKPcFE2L5WJVYbM,482
+effectual/build.py,sha256=id8BZ4ZEs1VbpL_gEz3iXk60PKKHIwM5FGjoFB5YPeI,5946
+effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
+effectual/config.py,sha256=Z99V7AnJpSWuo-aEz10TDj5BAaT7tboGJUjggj-HQh4,1798
+effectual/developer.py,sha256=D_KX6YYWgHF5b6ri-48ai1RqxqiIqZ0Rw-dVHG9NLHE,2052
+effectual/transformations.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
+effectual-0.5.5.dist-info/METADATA,sha256=7PFhRgidBjPr0-soAFbNbvG1aikUp-kNJX6-_1j5jH8,2560
+effectual-0.5.5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+effectual-0.5.5.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
+effectual-0.5.5.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
+effectual-0.5.5.dist-info/RECORD,,

effectual-0.5.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-effectual/__init__.py,sha256=9hA5S-390BtY7m-NojGHioaBJJ8vEM3IXuMvmzWBv0E,407
-effectual/build.py,sha256=PfnE6A8OfrVNV5AFxwqQIpNwr7OxbfhjkIzkcwSRM0M,5638
-effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
-effectual/config.py,sha256=HthkvUSOvkEN9N2_Eg5z4OU1jLLixLB5mmv-Npf3f4o,1815
-effectual/developer.py,sha256=ERbmZuaUzSVzKgWNUWMa1H7K39xfBNeHolUEdUKcOWc,2052
-effectual/minifier.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
-effectual-0.5.3.dist-info/METADATA,sha256=J5La4SFmCBy5DYzkzagOQqUbysivbsoknc1RAV_vV-Y,2560
-effectual-0.5.3.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-effectual-0.5.3.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
-effectual-0.5.3.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
-effectual-0.5.3.dist-info/RECORD,,