pyappify 1.0.9__tar.gz → 1.0.11__tar.gz

{pyappify-1.0.9 → pyappify-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyappify
-Version: 1.0.9
+Version: 1.0.11
 Summary: My awesome Python application
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{pyappify-1.0.9 → pyappify-1.0.11}/pyappify/__init__.py

@@ -58,13 +58,14 @@ except ImportError:
 
 
 def find_pyappify_executable(start_dir=None, environ=None):
-    """Find the launcher configured by PyAppify or in a parent directory."""
+    """Find the configured launcher or an app launcher above ``working``."""
     environ = os.environ if environ is None else environ
     configured = environ.get("PYAPPIFY_EXECUTABLE")
     if configured:
         configured_path = Path(configured).expanduser()
         if configured_path.is_file():
             return str(configured_path.resolve())
+        return None
 
     current = Path(start_dir or os.getcwd()).expanduser()
     if current.is_file():
@@ -74,12 +75,37 @@ def find_pyappify_executable(start_dir=None, environ=None):
     except OSError:
         current = current.absolute()
 
-    executable_names = ("pyappify.exe", "pyappify")
-    for directory in (current,) + tuple(current.parents):
-        for executable_name in executable_names:
-            candidate = directory / executable_name
-            if candidate.is_file():
-                return str(candidate.resolve())
+    working_directory = next(
+        (
+            directory
+            for directory in (current,) + tuple(current.parents)
+            if directory.name.casefold() == "working" and directory.parent.name
+        ),
+        None,
+    )
+    if working_directory is None:
+        return None
+
+    app_name = working_directory.parent.name
+    apps_directory = working_directory.parent.parent
+    data_directory = apps_directory.parent
+    if apps_directory.name.casefold() != "apps" or data_directory.name.casefold() != "data":
+        return None
+
+    app_root = data_directory.parent
+    executable_name = "{}.exe".format(app_name)
+    search_directories = []
+    directory = working_directory
+    while True:
+        search_directories.append(directory)
+        if directory == app_root:
+            break
+        directory = directory.parent
+
+    for directory in search_directories:
+        candidate = directory / executable_name
+        if candidate.is_file():
+            return str(candidate.resolve())
     return None
 
 
@@ -291,7 +317,8 @@ def _require_pyappify_executable():
     if not pyappify_executable:
         raise FileNotFoundError(
             "PyAppify executable was not found. Set PYAPPIFY_EXECUTABLE to an "
-            "existing executable or place pyappify.exe in this directory or a parent directory."
+            "existing executable or place <app_name>.exe between the working directory "
+            "and the app root."
         )
     return pyappify_executable
 

{pyappify-1.0.9 → pyappify-1.0.11}/pyappify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyappify
-Version: 1.0.9
+Version: 1.0.11
 Summary: My awesome Python application
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{pyappify-1.0.9 → pyappify-1.0.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyappify"
-version = "1.0.9"
+version = "1.0.11"
 description = "My awesome Python application"
 readme = "README.md"
 requires-python = ">=3.7"