daktari 0.0.303__py3-none-any.whl → 0.0.306__py3-none-any.whl

daktari/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.303"
+__version__ = "0.0.306"

daktari/checks/npmrc.py

@@ -9,12 +9,14 @@ from daktari.command_utils import can_run_command
 from daktari.file_utils import file_exists
 from daktari.os import OS
 
+PLACEHOLDER_TOKEN = "UPDATE_WITH_TOKEN"
+
 
 @dataclass
 class NpmrcScope:
     name: str
     registry: str
-    requireAuthToken: bool = False
+    require_auth_token: bool = False
 
 
 def get_npmrc_path() -> str:
@@ -42,8 +44,7 @@ def get_registry_host(registry_url: str) -> str:
 def npmrc_contains_scope_registry(lines: List[str], scope: NpmrcScope) -> bool:
     expected_line = f"@{scope.name}:registry={scope.registry}"
     for line in lines:
-        stripped = line.strip()
-        if stripped == expected_line or stripped.startswith(expected_line + "\n"):
+        if line.strip() == expected_line:
             return True
     return False
 
@@ -55,7 +56,7 @@ def npmrc_contains_auth_token(lines: List[str], registry_url: str) -> bool:
         stripped = line.strip()
         if stripped.startswith(auth_token_prefix):
             token_value = stripped[len(auth_token_prefix) :]
-            if token_value and token_value != "UPDATE_WITH_TOKEN":
+            if token_value and token_value != PLACEHOLDER_TOKEN:
                 return True
     return False
 
@@ -63,41 +64,30 @@ def npmrc_contains_auth_token(lines: List[str], registry_url: str) -> bool:
 def npmrc_scope_is_configured(lines: List[str], scope: NpmrcScope) -> bool:
     if not npmrc_contains_scope_registry(lines, scope):
         return False
-    if scope.requireAuthToken and not npmrc_contains_auth_token(lines, scope.registry):
+    if scope.require_auth_token and not npmrc_contains_auth_token(lines, scope.registry):
         return False
     return True
 
 
 def get_npmrc_suggestion(scope: NpmrcScope) -> str:
     lines = [f"@{scope.name}:registry={scope.registry}"]
-    if scope.requireAuthToken:
+    if scope.require_auth_token:
         host = get_registry_host(scope.registry)
-        lines.append(f"//{host}/:_authToken=UPDATE_WITH_TOKEN")
+        lines.append(f"//{host}/:_authToken={PLACEHOLDER_TOKEN}")
     return "\n".join(lines)
 
 
-def get_npmrc_token_for_registry(registry_url: str) -> Optional[str]:
-    lines = get_npmrc_contents()
-    host = get_registry_host(registry_url)
-    auth_token_prefix = f"//{host}/:_authToken="
-    for line in lines:
-        stripped = line.strip()
-        if stripped.startswith(auth_token_prefix):
-            return stripped[len(auth_token_prefix) :]
-    return None
-
-
 class NpmrcScopeConfigured(Check):
     name = "npmrc.scopeConfigured"
 
-    def __init__(self, scope: NpmrcScope, tokenInstructions: Optional[str] = None):
+    def __init__(self, scope: NpmrcScope, token_instructions: Optional[str] = None):
         self.scope = scope
         self.npmrc_suggestion = get_npmrc_suggestion(scope)
-        tokenInstructionString = f"\n\n{tokenInstructions}" if tokenInstructions else ""
+        token_instruction_string = f"\n\n{token_instructions}" if token_instructions else ""
         self.suggestions = {
             OS.GENERIC: f"""Add the lines below to ~/.npmrc:
 
-{self.npmrc_suggestion}{tokenInstructionString}"""
+{self.npmrc_suggestion}{token_instruction_string}"""
         }
 
     def check(self) -> CheckResult:

daktari/checks/test_npmrc.py

@@ -72,14 +72,14 @@ class TestNpmrcHelpers(unittest.TestCase):
         self.assertFalse(npmrc_contains_auth_token(lines, TEST_REGISTRY))
 
     def test_npmrc_scope_is_configured_without_auth(self):
-        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, requireAuthToken=False)
+        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, require_auth_token=False)
         lines = [
             f"@{TEST_SCOPE_NAME}:registry={TEST_REGISTRY}\n",
         ]
         self.assertTrue(npmrc_scope_is_configured(lines, scope))
 
     def test_npmrc_scope_is_configured_with_auth_present(self):
-        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, requireAuthToken=True)
+        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, require_auth_token=True)
         lines = [
             f"@{TEST_SCOPE_NAME}:registry={TEST_REGISTRY}\n",
             f"//{TEST_REGISTRY_HOST}/:_authToken={TEST_AUTH_TOKEN}\n",
@@ -87,7 +87,7 @@ class TestNpmrcHelpers(unittest.TestCase):
         self.assertTrue(npmrc_scope_is_configured(lines, scope))
 
     def test_npmrc_scope_is_configured_with_auth_missing(self):
-        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, requireAuthToken=True)
+        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, require_auth_token=True)
         lines = [
             f"@{TEST_SCOPE_NAME}:registry={TEST_REGISTRY}\n",
         ]
@@ -101,12 +101,12 @@ class TestNpmrcHelpers(unittest.TestCase):
         self.assertFalse(npmrc_scope_is_configured(lines, scope))
 
     def test_get_npmrc_suggestion_without_auth(self):
-        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, requireAuthToken=False)
+        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, require_auth_token=False)
         suggestion = get_npmrc_suggestion(scope)
         self.assertEqual(suggestion, f"@{TEST_SCOPE_NAME}:registry={TEST_REGISTRY}")
 
     def test_get_npmrc_suggestion_with_auth(self):
-        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, requireAuthToken=True)
+        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, require_auth_token=True)
         suggestion = get_npmrc_suggestion(scope)
         expected = f"@{TEST_SCOPE_NAME}:registry={TEST_REGISTRY}\n//{TEST_REGISTRY_HOST}/:_authToken=UPDATE_WITH_TOKEN"
         self.assertEqual(suggestion, expected)
@@ -119,7 +119,7 @@ class TestNpmrcScopeConfigured(unittest.TestCase):
             f"@{TEST_SCOPE_NAME}:registry={TEST_REGISTRY}\n",
             f"//{TEST_REGISTRY_HOST}/:_authToken={TEST_AUTH_TOKEN}\n",
         ]
-        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, requireAuthToken=True)
+        scope = NpmrcScope(name=TEST_SCOPE_NAME, registry=TEST_REGISTRY, require_auth_token=True)
         result = NpmrcScopeConfigured(scope).check()
         self.assertEqual(result.status, CheckStatus.PASS)
 

{daktari-0.0.303.dist-info → daktari-0.0.306.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: daktari
-Version: 0.0.303
+Version: 0.0.306
 Summary: Assist in setting up and maintaining developer environments
 Author-email: Matt Russell <matthew.russell@sonocent.com>
 License: Copyright 2021 Sonocent Ltd
@@ -18,8 +18,8 @@ Requires-Dist: ansicolors==1.1.8
 Requires-Dist: distro==1.9.0
 Requires-Dist: pyfiglet==1.0.4
 Requires-Dist: importlib_resources==6.5.2
-Requires-Dist: packaging==25.0
-Requires-Dist: setuptools==80.9.0
+Requires-Dist: packaging==26.0
+Requires-Dist: setuptools==80.10.2
 Requires-Dist: requests==2.32.5
 Requires-Dist: responses==0.25.8
 Requires-Dist: semver==3.0.4
@@ -45,7 +45,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.303"
+version = "0.0.306"
 title = "My Project"
 
 checks = [

{daktari-0.0.303.dist-info → daktari-0.0.306.dist-info}/RECORD

@@ -1,4 +1,4 @@
-daktari/__init__.py,sha256=BDs1YTavXW5cEXxV1GC0G1gQi5n9pQ6qqvxpiQRcIqE,24
+daktari/__init__.py,sha256=7r1HzA9y9fwDMK01WA-_tQZsgGPDISub7vpgL7iq1KY,24
 daktari/__main__.py,sha256=iYwgtZZE2HD9Eh9Io6OliGQwCNZJSde_66jI6kF8xJU,1463
 daktari/asdf.py,sha256=fALVL6UTz1AYxuabw9MZeAES7J_CvImutUDD1Y2yWwM,509
 daktari/check.py,sha256=WzIiCrrdH7gCbElNwYbYkjhpmaOs_nUWfvkTBkfZlgs,4133
@@ -41,7 +41,7 @@ daktari/checks/java.py,sha256=vS4gfuLwLxuTLizvybRx2yYXnNLMTsSfmoYHp91rono,3542
 daktari/checks/kubernetes.py,sha256=BJjxAZzZ3y3t7oHBruUy8OxP41JaX0cxlLvTnFz-F8s,5886
 daktari/checks/misc.py,sha256=O9_cCkcbigMF7uoqUebDT7mMmmKzQ8EwmIQRBY6vZcc,10855
 daktari/checks/nodejs.py,sha256=KOCLNQqZqaCalxcIajoDQDom1Zi4_noV4mV_-YZv_4E,2873
-daktari/checks/npmrc.py,sha256=z-hyy4Zevv8q9AE8f5ua54PoSASMk7HLF39Hf2nDWvU,4546
+daktari/checks/npmrc.py,sha256=aqx08CIpYybEiMJogjJ9vto1G1ne_eBR8bh-yVrFgqs,4154
 daktari/checks/onepassword.py,sha256=C2HWNlypBDTUx4K4IrrEVIkMqivKzX97oE0rENP1xK4,4155
 daktari/checks/pnpm.py,sha256=alEmcc1F-T998ECZ7p7JJ4DaaznnzLwLFz--7mV33Dk,339
 daktari/checks/python.py,sha256=v6xuRwtFCjzTYMN3qRLu76Xm7Bn8NO7wVpI3d8dOBSc,658
@@ -51,7 +51,7 @@ daktari/checks/test_certs.py,sha256=LmwjzNBEJauGSFYYLGevJ5H3FRkaO0piezUm3P-hrbM,
 daktari/checks/test_intellij_idea.py,sha256=dJ7Nu0eVyv1cpo8h5wUJ6w1rmsbGg3yxslaQKHT3So4,3207
 daktari/checks/test_java.py,sha256=f-JFGI-J-pBD1WgY8a88BO7XeJhvD87QSZK0kDnflls,3613
 daktari/checks/test_misc.py,sha256=tTvaPaZORjNf1dV8wPUKXDI3-JksyfdOsnZXFs7SLLE,587
-daktari/checks/test_npmrc.py,sha256=mJG_kO5a7bqWx0NaBRrV6X_4_GKB5-6vU_6uKZQHAmU,7168
+daktari/checks/test_npmrc.py,sha256=Bv_Amx2S7-2frBtHObJqBaRryEPqCrl4O7I_z4h44zM,7180
 daktari/checks/test_onepassword.py,sha256=HLeNjkZd85ty1U4Ut3OSjWVa5msC1Fp1OF0IIWD69u4,1115
 daktari/checks/test_pnpm.py,sha256=mZJgQ149V91YtxU4nENtalyyHZBawg4lbtxcW3IoWI0,925
 daktari/checks/test_ssh.py,sha256=XJECzM9BNODSxfkK71P9TyavlBagzgkCfKWdhlOD7zU,930
@@ -61,9 +61,9 @@ daktari/checks/yarn.py,sha256=T8b_oOoZ4l96delmPgPfgtaTkiUS129hoWlGIBcU7Io,5534
 daktari/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 daktari/resources/daktari-local-template.yaml,sha256=ik7KzMcG1r90nxDOk7t5G7P-BSxQIl2PocGUVe14c44,503
 daktari/resources/mock_cert.pem,sha256=AIc9dZOVIuxm7KFLunP5WSA1-LDWLOwpfu48B9xQ_Wg,82
-daktari-0.0.303.dist-info/licenses/LICENSE.txt,sha256=sMo18UdnQ7rY1SYg9gmop08ubzEQOGO1URYXu1Hxdx0,1051
-daktari-0.0.303.dist-info/METADATA,sha256=CRag-PvQZ0oOqNhrYvrf8RSMV4XzhV4uoq6joGqjkR0,4557
-daktari-0.0.303.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-daktari-0.0.303.dist-info/entry_points.txt,sha256=mfQXkwKyloAzf7sv78icBo1PtRwf9hCP_816F6REf-I,50
-daktari-0.0.303.dist-info/top_level.txt,sha256=LW6kawKAAyxUbGqpAbdedKRUyVy2DBzEZOalp0qDdF8,8
-daktari-0.0.303.dist-info/RECORD,,
+daktari-0.0.306.dist-info/licenses/LICENSE.txt,sha256=sMo18UdnQ7rY1SYg9gmop08ubzEQOGO1URYXu1Hxdx0,1051
+daktari-0.0.306.dist-info/METADATA,sha256=fb4UJQ1uM-cGjNaxWKNP01kTteyo5yz02m3ID84dNU8,4558
+daktari-0.0.306.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+daktari-0.0.306.dist-info/entry_points.txt,sha256=mfQXkwKyloAzf7sv78icBo1PtRwf9hCP_816F6REf-I,50
+daktari-0.0.306.dist-info/top_level.txt,sha256=LW6kawKAAyxUbGqpAbdedKRUyVy2DBzEZOalp0qDdF8,8
+daktari-0.0.306.dist-info/RECORD,,