daktari 0.0.224__py3-none-any.whl → 0.0.226__py3-none-any.whl

daktari/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.224"
+__version__ = "0.0.226"

daktari/checks/intellij_idea.py

@@ -1,6 +1,6 @@
 import json
 import logging
-import os.path
+import os
 from json.decoder import JSONDecodeError
 from pathlib import Path
 from typing import Optional
@@ -186,6 +186,33 @@ class IntelliJNodePackageManagerConfigured(XmlFileXPathCheck):
         return current_package_manager.__contains__(self.package_manager_path)
 
 
+class IntelliJTypescriptCompilerPathConfigured(XmlFileXPathCheck):
+    name = "intellij.typescriptCompilerPathConfigured"
+    file_path = ".idea/compiler.xml"
+    xpath_query = "./component[@name='TypeScriptCompiler']/option[@name='typeScriptServiceDirectory']"
+    depends_on = [IntelliJProjectImported]
+
+    def __init__(self, typescript_compiler_path: str):
+        self.typescript_compiler_path = typescript_compiler_path
+        resolved_path = typescript_compiler_path.replace("$PROJECT_DIR$", os.getcwd())
+        self.pass_fail_message = f"IntelliJ typescript compiler path has <not/> been set to {resolved_path}"
+
+        self.suggestions = {
+            OS.GENERIC: f"""
+                Follow the steps to set {resolved_path} as your typescript compiler path:
+                https://www.jetbrains.com/help/idea/typescript-support.html#ws_ts_use_ts_service_checkbox
+                """
+        }
+
+    def validate_query_result(self, result):
+        if result is None:
+            self.pass_fail_message = "IntelliJ typescript compiler path is <not/> set"
+            return False
+        current_typescript_compiler_path = result.get("value")
+        logging.debug(f"IntelliJ typescript compiler set to: {current_typescript_compiler_path}")
+        return current_typescript_compiler_path == self.typescript_compiler_path
+
+
 class IntelliJProjectSdkJavaVersion(XmlFileXPathCheck):
     name = "intellij.jdkVersionConfigured"
     file_path = ".idea/misc.xml"

daktari/checks/test_intellij_idea.py

@@ -3,7 +3,11 @@ import unittest
 from semver import VersionInfo
 
 from daktari.check import CheckStatus
-from daktari.checks.intellij_idea import IntelliJProjectSdkJavaVersion, get_intellij_version_from_product_info
+from daktari.checks.intellij_idea import (
+    IntelliJProjectSdkJavaVersion,
+    get_intellij_version_from_product_info,
+    IntelliJTypescriptCompilerPathConfigured,
+)
 
 
 class TestIntellijIdea(unittest.TestCase):
@@ -39,3 +43,24 @@ class TestIntellijIdea(unittest.TestCase):
         result = check.check()
         self.assertEqual(result.status, CheckStatus.PASS)
         self.assertEqual(result.summary, "IntelliJ Project SDK is set to Java 17: JDK_17")
+
+    def test_project_typescript_path_unset(self):
+        check = IntelliJTypescriptCompilerPathConfigured("$PROJECT_DIR$/node_modules/typescript")
+        check.file_path = "checks/test_resources/intellij_misc_no_ts_path.xml"
+        result = check.check()
+        self.assertEqual(result.status, CheckStatus.FAIL)
+        self.assertIn("IntelliJ typescript compiler path is not set", result.summary)
+
+    def test_project_typescript_path_set_wrong(self):
+        check = IntelliJTypescriptCompilerPathConfigured("/some/project/node_modules/typescript")
+        check.file_path = "checks/test_resources/intellij_misc_custom_ts_path.xml"
+        result = check.check()
+        self.assertEqual(result.status, CheckStatus.FAIL)
+        self.assertIn("IntelliJ typescript compiler path has not been set to", result.summary)
+
+    def test_project_typescript_path_set_correctly(self):
+        check = IntelliJTypescriptCompilerPathConfigured("$PROJECT_DIR$/node_modules/typescript")
+        check.file_path = "checks/test_resources/intellij_misc_custom_ts_path.xml"
+        result = check.check()
+        self.assertEqual(result.status, CheckStatus.PASS)
+        self.assertIn("IntelliJ typescript compiler path has been set to", result.summary)

{daktari-0.0.224.dist-info → daktari-0.0.226.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: daktari
-Version: 0.0.224
+Version: 0.0.226
 Summary: Assist in setting up and maintaining developer environments
 Home-page: https://github.com/sonocent/daktari
 Author: Matt Russell
@@ -18,7 +18,7 @@ Requires-Dist: distro (==1.9.0)
 Requires-Dist: dpath (==2.2.0)
 Requires-Dist: importlib-resources (==6.4.5)
 Requires-Dist: packaging (==20.9)
-Requires-Dist: pyOpenSSL (==24.2.1)
+Requires-Dist: pyOpenSSL (==24.3.0)
 Requires-Dist: pyclip (==0.7.0)
 Requires-Dist: pyfiglet (==0.8.post1)
 Requires-Dist: python-hosts (==1.0.7)
@@ -34,7 +34,7 @@ Requires-Dist: types-tabulate (==0.9.0.20240106)
 Requires-Dist: urllib3 (<1.27)
 Requires-Dist: dataclasses (==0.8) ; python_version < "3.7"
 Requires-Dist: types-dataclasses (==0.1.5) ; python_version < "3.7"
-Requires-Dist: pyobjc-core (==10.3.1) ; sys_platform == "darwin"
+Requires-Dist: pyobjc-core (==10.3.2) ; sys_platform == "darwin"
 Requires-Dist: pyobjc-framework-Cocoa (==10.3.1) ; sys_platform == "darwin"
 
 **Daktari** is a tool to help the initial setup and ongoing maintenance of developer environments. It runs a series of checks (for example, that required software is installed) and provides suggestions on how to fix the issue if the check fails.
@@ -46,7 +46,7 @@ In the root of the project repository, create a `.daktari.py` configuration file
 ```python
 from daktari.checks.git import *
 
-version = "0.0.224"
+version = "0.0.226"
 title = "My Project"
 
 checks = [

{daktari-0.0.224.dist-info → daktari-0.0.226.dist-info}/RECORD

@@ -1,4 +1,4 @@
-daktari/__init__.py,sha256=bYFROgesnN_7BNf1oGOGGm3r05dR7GI232cLTf1snL4,24
+daktari/__init__.py,sha256=wdj_3fI5i5P-XMAm5HmCg8ZAFH7Fwi5tUBD5sVjJI1w,24
 daktari/__main__.py,sha256=iYwgtZZE2HD9Eh9Io6OliGQwCNZJSde_66jI6kF8xJU,1463
 daktari/asdf.py,sha256=fALVL6UTz1AYxuabw9MZeAES7J_CvImutUDD1Y2yWwM,509
 daktari/check.py,sha256=WzIiCrrdH7gCbElNwYbYkjhpmaOs_nUWfvkTBkfZlgs,4133
@@ -35,7 +35,7 @@ daktari/checks/files.py,sha256=E9REDXly96K6e4rVXIDbpNiXlgYiQmiS3CdlloxlqNo,2239
 daktari/checks/flutter.py,sha256=1TI19pIiLVrAuJvoPMXzgX1yOVq6Q5K0TwHNSAUdR_g,1536
 daktari/checks/git.py,sha256=yII22HkvhjGM4bpr3wiLvPxi1pSBPiQcxdTyjqPXji4,6508
 daktari/checks/google.py,sha256=pVbMVWe_mcZ5v-Y6COMwjpMIRopSqzVvgwAQVA4x_Tc,4643
-daktari/checks/intellij_idea.py,sha256=QZr5w-E-dBOevGsYVPfMEsOpLc5Kw2KPP8SYKFRGNnw,8461
+daktari/checks/intellij_idea.py,sha256=_8A3t5jIAzqyjkIAFjAFwKwYb4WdbPk4Ex02R6d7cFE,9792
 daktari/checks/java.py,sha256=vS4gfuLwLxuTLizvybRx2yYXnNLMTsSfmoYHp91rono,3542
 daktari/checks/kubernetes.py,sha256=BJjxAZzZ3y3t7oHBruUy8OxP41JaX0cxlLvTnFz-F8s,5886
 daktari/checks/misc.py,sha256=8-xvFvMCoZTaZIVCw5QWKtFT-wSkUSUXGBak02IB6yY,10489
@@ -45,7 +45,7 @@ daktari/checks/python.py,sha256=v6xuRwtFCjzTYMN3qRLu76Xm7Bn8NO7wVpI3d8dOBSc,658
 daktari/checks/ssh.py,sha256=NqFhO03u523yQaffCeemcRtnYowx6LDuufayzF1t5eQ,1285
 daktari/checks/terraform.py,sha256=fvA7VRRJftkISqcnEjbc9dUovfXEe0eXrQl2MvsnfSM,2476
 daktari/checks/test_certs.py,sha256=LmwjzNBEJauGSFYYLGevJ5H3FRkaO0piezUm3P-hrbM,1693
-daktari/checks/test_intellij_idea.py,sha256=SGohgXApjm1DzMC-r43FHJX04oimrIhijRmMjyinA_o,1905
+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_onepassword.py,sha256=HLeNjkZd85ty1U4Ut3OSjWVa5msC1Fp1OF0IIWD69u4,1115
@@ -56,9 +56,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.224.dist-info/LICENSE.txt,sha256=sMo18UdnQ7rY1SYg9gmop08ubzEQOGO1URYXu1Hxdx0,1051
-daktari-0.0.224.dist-info/METADATA,sha256=9TtOJLDZumDhylW7s3B9BNCeEdkrLY5n1d-H2W0pZrg,3844
-daktari-0.0.224.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-daktari-0.0.224.dist-info/entry_points.txt,sha256=Sqwxp-qsyRnWwGVHkd3hoeG7aPffCIRB4pouCD9BbYU,51
-daktari-0.0.224.dist-info/top_level.txt,sha256=LW6kawKAAyxUbGqpAbdedKRUyVy2DBzEZOalp0qDdF8,8
-daktari-0.0.224.dist-info/RECORD,,
+daktari-0.0.226.dist-info/LICENSE.txt,sha256=sMo18UdnQ7rY1SYg9gmop08ubzEQOGO1URYXu1Hxdx0,1051
+daktari-0.0.226.dist-info/METADATA,sha256=xvwit65xA1H9mAKC6Wr1gGTAtDMI-juvA2IbcBHHMYI,3844
+daktari-0.0.226.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+daktari-0.0.226.dist-info/entry_points.txt,sha256=Sqwxp-qsyRnWwGVHkd3hoeG7aPffCIRB4pouCD9BbYU,51
+daktari-0.0.226.dist-info/top_level.txt,sha256=LW6kawKAAyxUbGqpAbdedKRUyVy2DBzEZOalp0qDdF8,8
+daktari-0.0.226.dist-info/RECORD,,