devopsdriver 0.1.45__tar.gz → 0.1.48__tar.gz

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devopsdriver
-Version: 0.1.45
+Version: 0.1.48
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -46,11 +46,11 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: PyYAML==6.0.1
-Requires-Dist: keyring==25.1.0
-Requires-Dist: setuptools==69.5.1
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: keyring==25.3.0
+Requires-Dist: setuptools==74.0.0
 Requires-Dist: azure-devops==7.1.0b4
-Requires-Dist: Mako==1.3.3
+Requires-Dist: Mako==1.3.5
 Provides-Extra: dev
 Requires-Dist: black>=24.3.0; extra == "dev"
 Requires-Dist: pylint>=3.1.0; extra == "dev"
@@ -60,7 +60,7 @@ Requires-Dist: coverage>=7.4.4; extra == "test"
 Provides-Extra: doc
 
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.45&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.45/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.48&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.48/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/README.md

@@ -1,5 +1,5 @@
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.45&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.45/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.48&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.48/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/devopsdriver/__init__.py

@@ -6,6 +6,6 @@ from .template import Template
 from .azdo.clients import Azure
 
 
-__version__ = "0.1.45"
+__version__ = "0.1.48"
 __author__ = "Marc Page"
 __credits__ = ""

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/devopsdriver/settings.py

@@ -20,7 +20,7 @@
         or next to the file passed in (__file__).
     This allows for secrets, keys, and tokens to be stored on the machine and not in the repo.
     
-    The OS specific directories are:
+    Files in the OS specific directories have priority over other files and are stored in:
     - macOS: ~/Library/Preferences/
     - Windows: %APPDATA%/
     - Linux: ~/.devopsdriver/
@@ -53,11 +53,11 @@
         This could be colors, emails, repos, queries, whatever.
     
     Use case 4: override secrets for specific script
-        Overriding secrets stored in <pref>/devopsdrive.yml for specific scripts.
-        If your script is `cool_script.py` save them to <pref>cool_script.yml.
+        Overriding secrets stored in `<pref>/devopsdriver.yml` for specific scripts.
+        If your script is `cool_script.py` save them to `<pref>/cool_script.yml`.
     
     *Note*: You can override a specific setting in a sub-dictionary.
-    For instance, say <pref>/devopsdrive.yml:
+    For instance, say `<pref>/devopsdriver.yml`:
     
     ```yaml
     api:
@@ -65,7 +65,7 @@
         password: Setec Astronomy
     ```
     
-    You could override this for `cool_script.py` be adding <pref>cool_script.yml:
+    You could override this for `cool_script.py` be adding `<pref>/cool_script.yml`:
     
     ```yaml
     api:
@@ -143,19 +143,29 @@ class Settings:
     PREF_DIR = {
         "Darwin": join(ENVIRON.get("HOME", ""), "Library", "Preferences"),
         "Windows": join(ENVIRON.get("APPDATA", "")),
-        "Linux": join(ENVIRON.get("HOME", ""), ".devopsdriver"),
+        "Linux": join(ENVIRON.get("HOME", ""), ".%shared_name%"),
     }
     ENV_VAR_PATTERN = regex(r"\${(\S+)}")
 
-    def __init__(self, file: str, *directories, **settings):
+    def __init__(self, file: str, *directories, shared_name: str = None, **settings):
         """Create a settings object using a file, directories to search, and settings overrides
 
         Args:
             file (str): The basename to use and a directory to search. pass __file__
+            *directories (list[str]): You can pass other directories to search for files
+            shared_name (str, optional): The name of the common settings file.
+                                        Defaults to "devopsdriver".
+            **settings (dict[str,str]): Keys you want to directly override in the code
         """
         self.overrides = settings
-        directories = [dirname(file), *directories, Settings.__preferences_dir()]
-        search_info = Settings.__all_paths(file, directories)
+        directories = [
+            Settings.__preferences_dir(SHARED if shared_name is None else shared_name),
+            dirname(file),
+            *directories,
+        ]
+        search_info = Settings.__all_paths(
+            file, directories, SHARED if shared_name is None else shared_name
+        )
         self.search_files = [join(d, n + e) for e, n, d, _ in search_info]
         self.settings = Settings.__find_all_settings(search_info)
         self.opts = {}
@@ -316,9 +326,14 @@ class Settings:
         return self.get(key)
 
     @staticmethod
-    def __preferences_dir() -> str:
-        default_dir = Settings.PREF_DIR[Settings.DEFAULT_PREF_DIR]
-        directory = Settings.PREF_DIR.get(SYSTEM(), default_dir)
+    def __preferences_dir(shared_name: str) -> str:
+
+        default_dir = Settings.PREF_DIR[Settings.DEFAULT_PREF_DIR].replace(
+            "%shared_name%", shared_name
+        )
+        directory = Settings.PREF_DIR.get(SYSTEM(), default_dir).replace(
+            "%shared_name%", shared_name
+        )
         MAKEDIRS(directory, exist_ok=True)
         return directory
 
@@ -341,8 +356,8 @@ class Settings:
                 Settings.__merge(base[key], new[key])
 
     @staticmethod
-    def __all_paths(file: str, directories: list[str]) -> list[tuple]:
-        names = [splitext(basename(file))[0], SHARED]
+    def __all_paths(file: str, directories: list[str], shared: str) -> list[tuple]:
+        names = [splitext(basename(file))[0], shared]
         return [
             (e, n, d, f)
             for n in names

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/devopsdriver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devopsdriver
-Version: 0.1.45
+Version: 0.1.48
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -46,11 +46,11 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: PyYAML==6.0.1
-Requires-Dist: keyring==25.1.0
-Requires-Dist: setuptools==69.5.1
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: keyring==25.3.0
+Requires-Dist: setuptools==74.0.0
 Requires-Dist: azure-devops==7.1.0b4
-Requires-Dist: Mako==1.3.3
+Requires-Dist: Mako==1.3.5
 Provides-Extra: dev
 Requires-Dist: black>=24.3.0; extra == "dev"
 Requires-Dist: pylint>=3.1.0; extra == "dev"
@@ -60,7 +60,7 @@ Requires-Dist: coverage>=7.4.4; extra == "test"
 Provides-Extra: doc
 
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.45&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.45/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.48&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.48/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/devopsdriver.egg-info/requires.txt

@@ -1,8 +1,8 @@
-PyYAML==6.0.1
-keyring==25.1.0
-setuptools==69.5.1
+PyYAML==6.0.2
+keyring==25.3.0
+setuptools==74.0.0
 azure-devops==7.1.0b4
-Mako==1.3.3
+Mako==1.3.5
 
 [dev]
 black>=24.3.0

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/pyproject.toml

@@ -6,11 +6,11 @@ license = {file = "LICENSE"}
 dynamic = ["version"]
 requires-python = ">= 3.10"
 dependencies = [
-  "PyYAML==6.0.1",
-  "keyring==25.1.0",
-  "setuptools==69.5.1",  # neded for azure-devops to use 7.1 API
+  "PyYAML==6.0.2",
+  "keyring==25.3.0",
+  "setuptools==74.0.0",  # neded for azure-devops to use 7.1 API
   "azure-devops==7.1.0b4",
-  "Mako==1.3.3",
+  "Mako==1.3.5",
 ]
 keywords = ["azure", "devops", "jira", "confluence", "email", "pipelines", "tools"]
 classifiers=[

{devopsdriver-0.1.45 → devopsdriver-0.1.48}/tests/test_settings.py

@@ -98,6 +98,40 @@ def test_basic():
                 .env("yy", "yota")
             )
             ltr = {"Linux": "l", "Darwin": "m", "Windows": "w", "Unknown": "l"}
+            local_overrides = {
+                "Darwin": {
+                    "v": "mmv",
+                    "dp.v": "mmv",
+                    "w": "mmw",
+                    "dp.w": "mmw",
+                    "x": "mmx",
+                    "dp.x": "mmx",
+                },
+                "Linux": {
+                    "v": "mlv",
+                    "dp.v": "mlv",
+                    "w": "mlw",
+                    "dp.w": "mlw",
+                    "x": "mlx",
+                    "dp.x": "mlx",
+                },
+                "Windows": {
+                    "v": "mwv",
+                    "dp.v": "mwv",
+                    "w": "mww",
+                    "dp.w": "mww",
+                    "x": "mwx",
+                    "dp.x": "mwx",
+                },
+                "Unknown": {
+                    "v": "mlv",
+                    "dp.v": "mlv",
+                    "w": "mlw",
+                    "dp.w": "mlw",
+                    "x": "mlx",
+                    "dp.x": "mlx",
+                },
+            }
             assert opts["yy"] == "yyenviron", opts["yy"]
             assert opts["aa"] == 1, f"{opts['aa']} {os}"
             assert opts["bb"] == 2, f"{opts['bb']} {os}"
@@ -145,12 +179,12 @@ def test_basic():
             assert opts["dp.t"] == "2ammt", f"{opts['dp.t']} {os}"
             assert opts["u"] == "2smmu", f"{opts['u']} {os}"
             assert opts["dp.u"] == "2smmu", f"{opts['dp.u']} {os}"
-            assert opts["v"] == "2mtmv", f"{opts['v']} {os}"
-            assert opts["dp.v"] == "2mtmv", f"{opts['dp.v']} {os}"
-            assert opts["w"] == "2atmw", f"{opts['w']} {os}"
-            assert opts["dp.w"] == "2atmw", f"{opts['dp.w']} {os}"
-            assert opts["x"] == "2stmx", f"{opts['x']} {os}"
-            assert opts["dp.x"] == "2stmx", f"{opts['dp.x']} {os}"
+            assert opts["v"] == local_overrides[os]["v"], f"{opts['v']} {os}"
+            assert opts["dp.v"] == local_overrides[os]["dp.v"], f"{opts['dp.v']} {os}"
+            assert opts["w"] == local_overrides[os]["w"], f"{opts['w']} {os}"
+            assert opts["dp.w"] == local_overrides[os]["dp.w"], f"{opts['dp.w']} {os}"
+            assert opts["x"] == local_overrides[os]["x"], f"{opts['x']} {os}"
+            assert opts["dp.x"] == local_overrides[os]["dp.x"], f"{opts['dp.x']} {os}"
             assert opts["y"] == f"m{ltr[os]}y", f"{opts['y']} m{ltr[os]}y {os}"
             assert opts["dp.y"] == f"m{ltr[os]}y", f"{opts['dp.y']} m{ltr[os]}y {os}"