daktari 0.0.231__tar.gz → 0.0.233__tar.gz

{daktari-0.0.231/daktari.egg-info → daktari-0.0.233}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: daktari
-Version: 0.0.231
+Version: 0.0.233
 Summary: Assist in setting up and maintaining developer environments
 Home-page: https://github.com/sonocent/daktari
 Author: Matt Russell
@@ -22,7 +22,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.231"
+version = "0.0.233"
 title = "My Project"
 
 checks = [

{daktari-0.0.231 → daktari-0.0.233}/README.md

@@ -7,7 +7,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.231"
+version = "0.0.233"
 title = "My Project"
 
 checks = [

daktari-0.0.233/daktari/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.233"

{daktari-0.0.231 → daktari-0.0.233}/daktari/checks/intellij_idea.py

@@ -48,7 +48,7 @@ def get_intellij_idea_version_mac() -> Optional[VersionInfo]:
         version_str = sanitise_version_string(version_str)
         version = try_parse_semver(version_str)
 
-        logging.debug(f"IntelliJ IDEA version (via NSBundle): {version}")
+        logging.debug(f"IntelliJ IDEA version (via NSBundle): {version} ({version_str})")
         return version
 
 

{daktari-0.0.231 → daktari-0.0.233}/daktari/checks/onepassword.py

@@ -41,7 +41,10 @@ class OnePasswordAccountConfigured(Check):
         self.account_shorthand = account_shorthand
         self.account_url = f"{account_shorthand}.1password.com"
         self.suggestions = {
-            OS.GENERIC: f"<cmd>op signin --account {self.account_url}</cmd>",
+            OS.GENERIC: f"""
+            Use the 1Password desktop app integration: https://developer.1password.com/docs/cli/get-started/#sign-in
+            Otherwise:
+            <cmd>op signin -f --account {self.account_url}</cmd>""",
         }
 
     def check(self) -> CheckResult:

{daktari-0.0.231 → daktari-0.0.233}/daktari/test_config.py

@@ -138,8 +138,9 @@ class TestConfig(unittest.TestCase):
             self.assertEqual(expected_contents, actual_contents)
 
     def test_version_number_sanitised(self):
-        result = sanitise_version_string("9.22")
-        self.assertEqual("9.22.0", result)
+        self.assertEqual(sanitise_version_string("9.22"), "9.22.0")
+        self.assertEqual(sanitise_version_string("1.2.3"), "1.2.3")
+        self.assertEqual(sanitise_version_string("1.2.3.4"), "1.2.3")
 
     def test_local_config_template(self):
         template_text = get_resource(LOCAL_CONFIG_TEMPLATE)

{daktari-0.0.231 → daktari-0.0.233}/daktari/version_utils.py

@@ -27,5 +27,11 @@ def try_parse_semver(version_str: Optional[str]) -> Optional[VersionInfo]:
         return None
 
 
+# Coerce version strings into a standard semver format: major.minor.patch
 def sanitise_version_string(version_str: str) -> str:
-    return version_str + ".0" if version_str.count(".") == 1 else version_str
+    parts = version_str.split(".")
+    if len(parts) == 2:
+        return version_str + ".0"
+    elif len(parts) >= 4:
+        return ".".join(parts[:3])
+    return version_str

{daktari-0.0.231 → daktari-0.0.233/daktari.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: daktari
-Version: 0.0.231
+Version: 0.0.233
 Summary: Assist in setting up and maintaining developer environments
 Home-page: https://github.com/sonocent/daktari
 Author: Matt Russell
@@ -22,7 +22,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.231"
+version = "0.0.233"
 title = "My Project"
 
 checks = [

{daktari-0.0.231 → daktari-0.0.233}/setup.py

@@ -10,7 +10,7 @@ README = (HERE / "README.md").read_text()
 
 setuptools.setup(
     name="daktari",
-    version="0.0.231",
+    version="0.0.233",
     description="Assist in setting up and maintaining developer environments",
     long_description=README,
     long_description_content_type="text/markdown",

daktari-0.0.231/daktari/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.231"