metripy 0.3.2__py3-none-any.whl → 0.3.7__py3-none-any.whl

metripy/Application/Config/File/ConfigFileReaderInterface.py

@@ -16,7 +16,7 @@ class ConfigFileReaderInterface(ABC):
         pass
 
     def resolve_path(self, path: str) -> str:
-        return os.path.join(os.path.dirname(self.filename), path)
+        return path
 
     def parse_data(self, data: dict, config: Config) -> None:
         # configs

metripy/Application/Info.py

@@ -1,17 +1,42 @@
+from importlib.metadata import version, metadata
 import toml
 
 
 class Info:
     def __init__(self):
-        data = self._get_data()
-        self.version = data["project"]["version"]
-        self.url = data["project"]["urls"]["Homepage"]
+        self.version = self._get_version()
+        self.url = self._get_homepage_url()
 
-    def _get_data(self) -> dict:
+    def _get_pyproject_data(self) -> dict:
         with open("pyproject.toml", "r") as file:
             data = toml.load(file)
         return data
 
+    def _get_version(self) -> str:
+        """Get version from installed package metadata"""
+        try:
+            return version("metripy")
+        except Exception:
+            # Fallback for development if not installed
+            return self._get_pyproject_data()["project"]["version"]
+    
+    def _get_homepage_url(self) -> str:
+        """Get homepage URL from installed package metadata"""
+        try:
+            meta = metadata("metripy")
+            # Try to get Home-Page from metadata
+            homepage = meta.get("Home-Page")
+            if not homepage:
+                # Try Project-URL field
+                for line in meta.get_all("Project-URL") or []:
+                    if line.startswith("Homepage"):
+                        homepage = line.split(",", 1)[1].strip()
+                        break
+            return homepage or "no homepage found"
+        except Exception:
+            # Fallback
+            return self._get_pyproject_data()["project"]["urls"]["Homepage"]
+
     def get_version(self) -> str:
         return self.version
 

metripy/LangAnalyzer/Php/PhpAnalyzer.py

@@ -1,7 +1,10 @@
 import math
+import os
 from pathlib import Path
 
 import lizard
+import tempfile
+import re
 
 from metripy.Component.Output.ProgressBar import ProgressBar
 from metripy.LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
@@ -46,10 +49,29 @@ class PhpAnalyzer(AbstractLangAnalyzer):
             return f"{filename}:{item_name}"
         return f"{filename}:{class_name}:{item_name}"
 
+    def _create_lizard_analyzable_file(self, filename: str) -> str:
+        """
+        Because of a bug in lizard it cannot correctly analyze traits. 
+        See https://github.com/terryyin/lizard/issues/441
+        """
+        tmp_file = tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.php')
+        with open(filename, "r") as f:
+            code = f.readlines()
+            code = [re.sub(r'^(\s*)trait\s+', r'\1class ', line) for line in code]
+            tmp_file.writelines(code)
+            tmp_file.close()
+        return tmp_file.name
+
     def analyze(self, code: str, filename: str) -> None:
         file_stem = Path(filename).stem
         structure = PhpBasicAstParser.parse_php_structure(code)
 
+
+        is_tmp_file = False
+        if "trait" in filename.lower():
+            filename = self._create_lizard_analyzable_file(filename)
+            is_tmp_file = True
+
         lizard_result = lizard.analyze_file(filename)
         complexity_data = {
             func.name: {
@@ -60,6 +82,9 @@ class PhpAnalyzer(AbstractLangAnalyzer):
             for func in lizard_result.function_list
         }
 
+        if is_tmp_file:
+            os.unlink(filename)
+
         classes: dict[str, ClassNode] = {}
         functions: dict[str, FunctionNode] = {}
         for obj in structure:

metripy/Report/Html/DependencyPageRenderer.py

@@ -1,7 +1,7 @@
 from metripy.Dependency.Dependency import Dependency
 from metripy.Metric.ProjectMetrics import ProjectMetrics
 from metripy.Report.Html.PageRenderer import PageRenderer
-
+import json
 
 class DependencyPageRenderer(PageRenderer):
     def __init__(self, template_dir: str, output_dir: str, project_name: str):
@@ -16,6 +16,6 @@ class DependencyPageRenderer(PageRenderer):
             {
                 "has_dependencies_data": bool(metrics.dependencies),
                 "dependencies": [d.to_dict() for d in dependencies],
-                "license_distribution": license_by_type,
+                "license_distribution_json": json.dumps(license_by_type, indent=2),
             },
         )

metripy/Report/Html/IndexPageRenderer.py

@@ -3,6 +3,8 @@ import json
 from metripy.Metric.ProjectMetrics import ProjectMetrics
 from metripy.Report.Html.PageRenderer import PageRenderer
 
+from metripy.Dependency.Dependency import Dependency
+
 
 class IndexPageRenderer(PageRenderer):
     def __init__(self, template_dir: str, output_dir: str, project_name: str):
@@ -13,10 +15,15 @@ class IndexPageRenderer(PageRenderer):
         if metrics.git_metrics:
             git_stats_data = metrics.git_metrics.get_commit_stats_per_month()
 
+
+        dependencies = metrics.dependencies if metrics.dependencies is not None else []
+        license_by_type = Dependency.get_lisence_distribution(dependencies)
+
         self.render_template(
             "index.html",
             {
                 "git_stats_data": json.dumps(git_stats_data, indent=4),
+                "license_distribution_json": json.dumps(license_by_type, indent=2),
                 "total_code_metrics": metrics.total_code_metrics.to_dict(),
                 "has_total_code_metrics_trend": metrics.total_code_metrics.trend
                 is not None,

metripy/Report/Html/Reporter.py

@@ -1,6 +1,8 @@
 import os
 import shutil
+import sys
 from datetime import datetime
+from pathlib import Path
 
 
 from metripy.Application.Config.ReportConfig import ReportConfig
@@ -16,7 +18,16 @@ class Reporter(ReporterInterface):
     ):
         self.config: ReportConfig = config
         self.output = output
-        self.template_dir = os.path.join(os.getcwd(), "templates/html_report")
+        
+        # Find templates directory - works both in development and when installed
+        template_dir = self._find_template_dir()
+        if not template_dir.exists():
+            raise FileNotFoundError(
+                f"Could not find templates directory. Searched in: "
+                f"{template_dir}"
+            )
+            
+        self.template_dir = str(template_dir)
         self.project_name = project_name
 
         self.page_renderer_factory = PageRendererFactory(
@@ -27,6 +38,28 @@ class Reporter(ReporterInterface):
             "project_name": project_name,
             "last_updated": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
         }
+    
+    def _find_template_dir(self) -> Path:
+        """Find the templates directory, checking multiple possible locations"""
+        package_dir = Path(__file__).parent.parent.parent  # metripy package root
+        
+        # List of possible locations to check
+        possible_locations = [
+            # Development: templates at project root
+            package_dir.parent / "templates" / "html_report",
+            # Alternative: templates inside metripy package
+            package_dir / "templates" / "html_report",
+            # System install location
+            Path(sys.prefix) / "share" / "metripy" / "templates" / "html_report",
+            # Fallback to cwd (for development)
+            Path.cwd() / "metripy" / "templates" / "html_report",
+        ]
+        
+        for location in possible_locations:
+            if location.exists() and (location / "index.html").exists():
+                return location
+        
+        return possible_locations[0]
 
     def generate(self, metrics: ProjectMetrics):
 
@@ -63,12 +96,6 @@ class Reporter(ReporterInterface):
         )
         # shutil.copytree(os.path.join(self.template_dir, "fonts"), os.path.join(self.config.path, "fonts"), dirs_exist_ok=True)
 
-        # copy logo, lies 2 down from the templates directory
-        shutil.copy(
-            os.path.join(self.template_dir, "../..", "logo.svg"),
-            os.path.join(self.config.path, "images", "logo.svg"),
-        )
-
         # Render main pages
         self.render_index_page(metrics)
         self.render_files_page(metrics)

metripy/Report/Html/TrendsPageRenderer.py

@@ -22,6 +22,29 @@ class TrendsPageRenderer(PageRenderer):
         }
 
     def render(self, metrics: ProjectMetrics):
+        if metrics.total_code_metrics.trend is None:
+            self.render_template(
+                "trends.html",
+                {
+                    "has_trend_data": False,
+                    "trend_data": {
+                        "top_improved_complexity": [],
+                        "top_improved_maintainability": [],
+                        "top_worsened_complexity": [],
+                        "top_worsened_maintainability": [],
+                        "loc_segments_current": {},
+                        "loc_segments_prev": {},
+                        "complexity_segments_current": {},
+                        "complexity_segments_prev": {},
+                        "maintainability_segments_current": {},
+                        "maintainability_segments_prev": {},
+                        "method_size_segments_current": {},
+                        "method_size_segments_prev": {},
+                    },
+                },
+            )
+            return
+
         # Top improved complexity (complexity went down - negative delta)
         top_improved_complexity = [
             x