effectual 0.5.1__tar.gz → 0.5.3__tar.gz

{effectual-0.5.1 → effectual-0.5.3}/PKG-INFO

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

{effectual-0.5.1 → effectual-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "effectual"
-version = "0.5.1"
+version = "0.5.3"
 description = "A python package/script bundler"
 readme = "README.md"
 license = "MIT"

{effectual-0.5.1 → effectual-0.5.3}/src/effectual/build.py

@@ -5,12 +5,11 @@ import zipfile
 from pathlib import Path
 from time import perf_counter
 from typing import Any
-from watch_lite import getHash
 
-import rtoml
+from watch_lite import getHash
 
 from .colors import completeColor, fileColor, folderColor, tagColor
-from .config import loadConfig
+from .config import dumpHashes, loadConfig, loadToml
 from .minifier import minifyFile, minifyToString
 
 
@@ -67,7 +66,7 @@ def bundleFiles(
 
 def dependencies(minify: bool) -> None:
     with open("./pyproject.toml", "r", encoding="utf-8") as file:
-        packages: list[str] = dict(rtoml.load(file)).get("project").get("dependencies")  # type: ignore
+        packages: list[str] = loadToml(file).get("project").get("dependencies")  # type: ignore
 
     arguments: list[str] = ["--no-compile", "--quiet", "--no-binary=none", "--no-cache"]
 
@@ -140,14 +139,14 @@ def main() -> None:
 
     if uvHashPath.exists():
         with open(uvHashPath, "r") as file:
-            lastHash: dict[Any, Any] = dict(rtoml.load(file)).get("hashes")
+            lastHash: dict[Any, Any] = loadToml(file).get("hashes")
         if currentHash["hashes"] != lastHash:
             with open(uvHashPath, "w") as file:
-                rtoml.dump(currentHash, file)
+                dumpHashes(currentHash, file)
             dependencies(minify=minification)
     else:
         with open(uvHashPath, "x") as file:
-            rtoml.dump(currentHash, file)
+            dumpHashes(currentHash, file)
         dependencies(minify=minification)
 
     bundleFiles(

effectual-0.5.3/src/effectual/config.py

@@ -0,0 +1,60 @@
+import io
+from typing import Any
+
+import rtoml
+
+
+def loadToml(tomlFile: str | io.TextIOWrapper) -> 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
+
+    Raises:
+        RuntimeError: Toml file is incorrectly configured
+        RuntimeError: Toml file is can't be located
+
+    Returns:
+        dict[Any, Any]: Dictionary of toml file contents
+    """
+    try:
+        with open(tomlFile, "r", encoding="utf-8") as file:
+            return dict(rtoml.load(file))  # type: ignore
+    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]:
+    """Loads effectual config from a file
+
+    Args:
+        configPath (str): Path to the config file
+
+    Returns:
+        dict: Dictionary containing effectual config
+    """
+    configData: dict[str, Any] = loadToml(configPath)
+    if configData is None:
+        configData = {
+            "sourceDirectory": "./src/",
+            "outputDirectory": "./dist/",
+            "outputFileName": "bundle.pyz",
+            "minification": True,
+            "compressionLevel": 5,
+        }
+    else:
+        configData = configData.get("tool").get("effectual")
+
+    return configData
+
+
+def dumpHashes(hashesToDump: dict[str, dict[str, str]], file: io.TextIOWrapper) -> None:
+    """Dumps hashes in a specific format to a toml file
+
+    Args:
+        hashesToDump (dict[str, dict[str, str]]): Dictionary of hashes to dump as toml
+        file (_type_): File object
+    """
+    return rtoml.dump(hashesToDump, file, pretty=False)

{effectual-0.5.1 → effectual-0.5.3}/src/effectual/developer.py

@@ -3,6 +3,7 @@ import time
 import zipfile
 from pathlib import Path
 from typing import Any
+
 from watch_lite import getAllHashes
 
 from .colors import completeColor, fileColor, tagColor
@@ -40,10 +41,10 @@ def main() -> None:
 
     runCommand = subprocess.Popen(["uv", "run", outputFile], shell=True)
 
-    lastHashSet: set[str] = getAllHashes(sourceDirectory)
+    lastHashSet: set[str] = getAllHashes(str(sourceDirectory))
 
     while True:
-        currentHashSet: set[str] = getAllHashes(sourceDirectory)
+        currentHashSet: set[str] = getAllHashes(str(sourceDirectory))
         if currentHashSet != lastHashSet:
             lastHashSet = currentHashSet
             runCommand.kill()

{effectual-0.5.1 → effectual-0.5.3}/uv.lock

@@ -24,7 +24,7 @@ wheels = [
 
 [[package]]
 name = "effectual"
-version = "0.4.0"
+version = "0.5.2"
 source = { editable = "." }
 dependencies = [
     { name = "click" },

effectual-0.5.1/src/effectual/config.py

@@ -1,38 +0,0 @@
-from typing import Any
-
-import rtoml
-
-
-def loadConfig(configPath: str) -> dict[Any, Any]:
-    """Loads effectual config from a file
-
-    Args:
-        configPath (str): Path to the config file
-
-    Raises:
-        RuntimeError: Invalid TOML format
-        RuntimeError: No configuration file found
-
-    Returns:
-        dict: _description_
-    """
-    try:
-        with open(configPath, "r", encoding="utf-8") as file:
-            configData: dict[Any, Any] = dict(rtoml.load(file))
-            if configData is None:
-                configData = {
-                    "sourceDirectory": "./src/",
-                    "outputDirectory": "./dist/",
-                    "outputFileName": "bundle.pyz",
-                    "minification": True,
-                    "compressionLevel": 5,
-                }
-            else:
-                configData = configData.get("tool").get("effectual")  # type: ignore
-
-    except ValueError as e:
-        raise RuntimeError(f"Invalid TOML in {configPath}: {e}")
-    except FileNotFoundError:
-        raise RuntimeError(f"Configuration file {configPath} not found.")
-
-    return configData

effectual-0.5.1/src/effectual/fileHash.py

@@ -1,34 +0,0 @@
-import hashlib
-from multiprocessing import Pool
-from pathlib import Path
-
-
-def getFilehash(filePath: Path) -> str:
-    """Gets the file hash of a single python script
-
-    Args:
-        filePath (Path): Path to a file
-
-    Returns:
-        str: Hash of the file
-    """
-    with open(filePath, "rb") as file:
-        fileHash = hashlib.sha1(file.read()).hexdigest()
-    return fileHash
-
-
-def getAllHashes(sourceDirectory: Path, fileExtension: str) -> set[str]:
-    """Gets all hashes in directory
-
-    Args:
-        sourceDirectory (Path): Path to a folder containing files
-
-    Returns:
-        set[str]: Set containing paths and hashes
-    """
-
-    with Pool() as pool:
-        hashList: set[str] = set(
-            pool.map(getFilehash, sourceDirectory.glob(f"*.{fileExtension}"))
-        )
-    return hashList