metripy 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

metripy/Application/Config/Parser.py

@@ -9,8 +9,8 @@ class Parser:
     def parse(self, argv: list[str]) -> Config:
         config = Config()
 
-        if argv[0] == "codemetrics.py" or argv[0] == "codemetrics":
-            # TODO, fix when path ends with codemetrics.py
+        if argv[0] == "metripy.py" or argv[0] == "metripy":
+            # TODO, fix when path ends with metripy.py
             pass
         argv.pop(0)
 

metripy/Dependency/Dependency.py

@@ -1,5 +1,7 @@
+from typing import Self
+
 class Dependency:
-    def __init__(self, name: str, version: str):
+    def __init__(self, name: str, version: str|None):
         self.name = name
         self.version = version
         self.latest: str = ""
@@ -28,3 +30,16 @@ class Dependency:
             "downloads_monthly": self.downloads_monthly,
             "licenses": ",".join(self.license),
         }
+
+    @staticmethod
+    def get_lisence_distribution(dependencies: list[Self]) -> dict[str, int]:
+        license_by_type = {}
+
+        dependency: Dependency
+        for dependency in dependencies:
+            for license_name in dependency.license:
+                if license_name not in license_by_type.keys():
+                    license_by_type[license_name] = 0
+                license_by_type[license_name] += 1
+
+        return license_by_type

metripy/Dependency/Pip/Pip.py

@@ -23,47 +23,38 @@ class Pip:
         return [item for item in packages if item is not None]
 
     def get_from_requirements_txt(self, path: str) -> list[Dependency]:
-        requirements = []
-
-        pattern = re.compile(r"([a-zA-Z0-9_\-]+)([<>=!~]+[^\s]+)?")
         with open(os.path.join(path, "requirements.txt"), "r") as file:
             lines = file.readlines()
-            for line in lines:
+            return self._parse_dependencies(lines)
 
-                line = line.strip()
-                if line and not line.startswith("#"):
-                    match = pattern.match(line)
-                    if match:
-                        name = match.group(1)
-                        version = match.group(2) if match.group(2) else None
-                        requirements.append(Dependency(name, version))
-        return requirements
+        return []
 
     def get_from_pyproject_toml(self, path: str) -> list[Dependency]:
-        dependencies = []
-
         with open(os.path.join(path, "pyproject.toml"), "r") as f:
             data = toml.load(f)
 
             # For PEP 621 / setuptools projects
             if "project" in data:
                 deps = data["project"].get("dependencies", [])
-                for dep in deps:
-                    # dep is a string like "requests>=2.32.5"
-                    # You can split it if needed
-                    if "==" in dep:
-                        name, version = dep.split("==")
-                    elif ">=" in dep:
-                        name, version = dep.split(">=")
-                    else:
-                        name, version = dep, None
-                    dependencies.append(
-                        Dependency(name.strip(), version.strip() if version else None)
-                    )
-
-        return dependencies
+                return self._parse_dependencies(deps)
 
+        return []
+    
+    def _parse_dependencies(self, lines: list[str]) -> list[Dependency]:
+        dependencies = []
+        for dep in lines:
+            dep = dep.strip()
+            if not dep or dep.startswith("#"):
+                continue
+            # dep is a string like "requests>=2.32.5"
+            if "==" in dep:
+                name, version = dep.split("==")
+            elif ">=" in dep:
+                name, version = dep.split(">=")
+            else:
+                name, version = dep, None
+            dependencies.append(
+                Dependency(name.strip(), version.strip() if version else None)
+            )
 
-if __name__ == "__main__":
-    pip = Pip()
-    pip.get_dependencies("./")
+        return dependencies

metripy/Metric/ProjectMetrics.py

@@ -3,6 +3,7 @@ from metripy.Metric.Code.AggregatedMetrics import AggregatedMetrics
 from metripy.Metric.Code.FileMetrics import FileMetrics
 from metripy.Metric.Code.SegmentedMetrics import SegmentedMetrics
 from metripy.Metric.Git.GitMetrics import GitMetrics
+from metripy.Dependency.Dependency import Dependency
 
 
 class ProjectMetrics:
@@ -53,3 +54,16 @@ class ProjectMetrics:
 
     def _avg(self, items: list[float | int]) -> float:
         return sum(items) / len(items)
+
+    def to_dict(self) -> dict:
+        data = {
+            "file_metrics": [m.to_dict() for m in self.file_metrics],
+            "aggregated": self.total_code_metrics.to_dict(),
+            "aggregated_segmented": self.total_code_metrics.to_dict_segmentation(),
+        }
+        if self.git_metrics:
+            data["git_metrics"] = self.git_metrics.to_dict()
+        if self.dependencies:
+            data["dependencies"] = [d.to_dict() for d in self.dependencies]
+            data["license_distribution"] = Dependency.get_lisence_distribution(self.dependencies)
+        return data

metripy/Report/Html/Reporter.py

@@ -10,6 +10,7 @@ from metripy.Component.Output.CliOutput import CliOutput
 from metripy.Metric.FileTree.FileTreeParser import FileTreeParser
 from metripy.Metric.ProjectMetrics import ProjectMetrics
 from metripy.Report.ReporterInterface import ReporterInterface
+from metripy.Dependency.Dependency import Dependency
 
 
 class Reporter(ReporterInterface):
@@ -71,10 +72,10 @@ class Reporter(ReporterInterface):
                 "segmentation_data": json.dumps(
                     metrics.total_code_metrics.to_dict_segmentation(), indent=4
                 ),
-                "project_name": "CodeMetrics",
+                "project_name": "Metripy",
                 "last_updated": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
                 "date": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
-                "author": "CodeMetrics",
+                "author": "Metripy",
                 "version": "1.0.0",
             },
         )
@@ -107,14 +108,8 @@ class Reporter(ReporterInterface):
 
         dependencies = metrics.dependencies if metrics.dependencies is not None else []
 
-        license_by_type = {}
-
         # TODO render a pie chart
-        for dependency in dependencies:
-            for license_name in dependency.license:
-                if license_name not in license_by_type.keys():
-                    license_by_type[license_name] = 0
-                license_by_type[license_name] += 1
+        license_by_type = Dependency.get_lisence_distribution(dependencies)
 
         print(json.dumps(license_by_type, indent=2))
 
@@ -122,7 +117,7 @@ class Reporter(ReporterInterface):
             "dependencies.html",
             {
                 "dependencies": [d.to_dict() for d in dependencies],
-                "project_name": "CodeMetrics",
+                "project_name": "Metripy",
                 "last_updated": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
             },
         )
@@ -148,7 +143,7 @@ class Reporter(ReporterInterface):
             {
                 "filetree": json.dumps(filetree.to_dict()),
                 "file_details": json.dumps(file_details),
-                "project_name": "CodeMetrics",
+                "project_name": "Metripy",
                 "last_updated": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
             },
         )
@@ -194,7 +189,7 @@ class Reporter(ReporterInterface):
                         "git_hotspots_data": metrics.git_metrics.get_hotspots_list()[
                             :10
                         ],  # hotspots list
-                        "project_name": "CodeMetrics",
+                        "project_name": "Metripy",
                         "last_updated": metrics.git_metrics.get_analysis_start_date(),
                     }
                 ),

metripy/Report/Json/GitJsonReporter.py

@@ -19,3 +19,4 @@ class GitJsonReporter(AbstractJsonReporter):
         }
 
         self.put_data(data)
+        self.output.writeln(f"<success>Create git json report in {self.config.path}</success>")

metripy/Report/Json/JsonReporter.py

@@ -1,12 +1,13 @@
 from metripy.Application.Config.Config import Config
 from metripy.Component.Output.CliOutput import CliOutput
 from metripy.Metric.ProjectMetrics import ProjectMetrics
+from metripy.Report.Json.AbstractJsonReporter import AbstractJsonReporter
 
-
-class JsonReporter:
+class JsonReporter(AbstractJsonReporter):
     def __init__(self, config: Config, output: CliOutput):
         self.config = config
         self.output = output
 
     def generate(self, metrics: ProjectMetrics):
-        raise NotImplementedError
+        self.put_data(metrics.to_dict())
+        self.output.writeln(f"<success>Create json report in {self.config.path}</success>")

metripy/Report/ReporterFactory.py

@@ -3,6 +3,7 @@ from metripy.Component.Output.CliOutput import CliOutput
 from metripy.Report import ReporterInterface
 from metripy.Report.Html.Reporter import Reporter as HtmlReporter
 from metripy.Report.Json.GitJsonReporter import GitJsonReporter
+from metripy.Report.Json.JsonReporter import JsonReporter
 
 
 class ReporterFactory:
@@ -11,7 +12,7 @@ class ReporterFactory:
         if config.type == "html":
             return HtmlReporter(config, output)
         elif config.type == "json":
-            raise NotImplementedError
+            return JsonReporter(config, output)
         elif config.type == "csv":
             raise NotImplementedError
         elif config.type == "cli":

{metripy-0.2.7.dist-info → metripy-0.2.8.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: metripy
-Version: 0.2.7
+Version: 0.2.8
 Summary: A Python tool to generate multi project, multi language code metric reports
 Author-email: Yannick Zimmermann <yannick.zimmermann@proton.me>
 License: MIT
-Project-URL: Homepage, https://github.com/zimmer-yan/codemetrics
-Project-URL: Repository, https://github.com/zimmer-yan/codemetrics
-Project-URL: Documentation, https://github.com/zimmer-yan/codemetrics#readme
-Project-URL: Bug Tracker, https://github.com/zimmer-yan/codemetrics/issues
+Project-URL: Homepage, https://github.com/zimmer-yan/metripy
+Project-URL: Repository, https://github.com/zimmer-yan/metripy
+Project-URL: Documentation, https://github.com/zimmer-yan/metripy#readme
+Project-URL: Bug Tracker, https://github.com/zimmer-yan/metripy/issues
 Keywords: code metrics,multi-language,code analysis,git metrics,code visualization,software quality,static analysis,repository insights,developer productivity,codebase health,technical debt,language-agnostic
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -37,7 +37,7 @@ Requires-Dist: poethepoet==0.37.0; extra == "dev"
 Requires-Dist: isort==7.0.0; extra == "dev"
 Dynamic: license-file
 
-# Codemetrics
+# Metripy
 A multilanguage, multi project code metrics analysis tool. 
 
 # Languages
@@ -102,8 +102,8 @@ Sample configuraiton:
             "pip": true,
             // looks for base_path/requirements.txt or base_path/pyproject.toml and analyzes dependencies - for python projects
             "reports": {
-                "html": "./build/report/codemetrics", // report should be put into this directory
-                "json-git": "./build/json-report/codemetrics-git.json" // file where to put git json report
+                "html": "./build/report/metripy", // report should be put into this directory
+                "json-git": "./build/json-report/metripy-git.json" // file where to put git json report
                 // more types of reports TBA
             }
         },
@@ -111,3 +111,20 @@ Sample configuraiton:
     }
 }
 ```
+
+## Configuration for only git stats
+```json
+{
+    "configs": {
+        "metripy-git": {
+            "base_path": "./",
+            "git": {
+                "branch": "main"
+            },
+            "reports": {
+                "json-git": "./build/json-report/metripy-git.json"
+            }
+        }
+    }
+}
+```

{metripy-0.2.7.dist-info → metripy-0.2.8.dist-info}/RECORD

@@ -5,7 +5,7 @@ metripy/Application/Application.py,sha256=mmvb2Af3AsfcDVwhf5LB5xVWxE5XmKSSaW_IY7
 metripy/Application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metripy/Application/Config/Config.py,sha256=VyBBYtbVNkrdevxkIGlASSCgK7pmq2WLW6DVKUMb6B4,353
 metripy/Application/Config/GitConfig.py,sha256=4y676GYv-FH6QyLxh6IQn64gUG9xOQciMgkXH9pJtb4,220
-metripy/Application/Config/Parser.py,sha256=T5o17gYpIE1Njiik1vaITCcDgq9szTU6GcQcPl_ufUg,904
+metripy/Application/Config/Parser.py,sha256=ej3wT8AYtAVg-3q59FtkFb_-pxfy7Hvn4YswAVL8M4A,892
 metripy/Application/Config/ProjectConfig.py,sha256=N2xPkc10NF3mHywR36vpxsrcdJyw-VTFzbwQpLq5uHw,932
 metripy/Application/Config/ReportConfig.py,sha256=Vh3S1n2nyH5YNmt8JrfGRTcmYZuqLMxyFnFF5mmxu_4,259
 metripy/Application/Config/File/ConfigFileReaderFactory.py,sha256=K6p5x5TgF6I0acfq3dnU_wKWRWMD-e1EEa0_nrf7t8g,925
@@ -15,12 +15,12 @@ metripy/Component/Debug/Debugger.py,sha256=LhkHzUGNSEPvIvcjZJJob5Fjg5NQhk7Rs43y1
 metripy/Component/File/Finder.py,sha256=1vP3KD98zxBuIShNlfCOVVLbjOQPLJnrIsUvLzxnVnM,1399
 metripy/Component/Output/CliOutput.py,sha256=XJ5vJa7jxoukk4fRuj1UVV7GNkkZx-4Jb_Pl7ZYOSFk,1197
 metripy/Component/Output/ProgressBar.py,sha256=PmYQYwINXn9sYO0FKqT8tF-FaFLrPko-lJfi6jxbNsA,725
-metripy/Dependency/Dependency.py,sha256=6YSuNPEAbJY5MZ_8ZwMyppnWA_j84dwKx_hzm0eYmYc,1002
+metripy/Dependency/Dependency.py,sha256=Y2j3xIMvPStzaW_TmsNx122gUxTYTnOGuMIgoUgVLVs,1482
 metripy/Dependency/Composer/Composer.py,sha256=tOVo8-NJfn0bRK-K4-hhq394tfigOtE6-5ZXOPTb_jw,1033
 metripy/Dependency/Composer/Packegist.py,sha256=ioeIwNg6Yhz0bk13UpB7saq4eqB0-3Zy9PdfcE3CIbA,1980
 metripy/Dependency/Npm/Npm.py,sha256=OB05MZJ312dRw909Pj4Np4bqHQ5oVOylqnzdfXdRvhM,975
 metripy/Dependency/Npm/NpmOrg.py,sha256=9igY0dZRP2L36jcCsn8I8WgfxjWhJ2FShcIV9ph-Zfs,1551
-metripy/Dependency/Pip/Pip.py,sha256=4OydPjP-EK5PRWJfjL9vjFacyTRML1fYs_J9MuC_hrI,2318
+metripy/Dependency/Pip/Pip.py,sha256=b-XkyDGnLISfAchsD9Lo-M03rUZogGlvkhntC2h7WoI,1911
 metripy/Dependency/Pip/PyPi.py,sha256=Hqpk5rUw-sN23tgWVUaYMuLN43BR8LdbmNJzkKq9gEo,1612
 metripy/Git/GitAnalyzer.py,sha256=k1396AKkZHlCHZZTtlBHMNO73Cnhcte2ageXJo4ObVY,3071
 metripy/LangAnalyzer/AbstractLangAnalyzer.py,sha256=Wa7ucL7Wy6J8f13GyCOjRKYFgPuJPuZjE8t24fDUf2U,1896
@@ -37,7 +37,7 @@ metripy/LangAnalyzer/Typescript/TypescriptAstParser.py,sha256=6kEw3tm9_eIOXkBY_V
 metripy/LangAnalyzer/Typescript/TypescriptBasicComplexityAnalyzer.py,sha256=abQXNPywSoplozwwV1qm8tRKyPkCAhxBF8gHigECeZ0,3797
 metripy/LangAnalyzer/Typescript/TypescriptBasicLocAnalyzer.py,sha256=hxNqVGDUBb0Dy4cvQFTqfz5cCJTQ8B4uWu9hBnzSO2Y,2336
 metripy/LangAnalyzer/Typescript/TypescriptHalSteadAnalyzer.py,sha256=yOW_55R4PcTNA2BffCiugqkBH1ONuYkZCFo2No4hz0w,1278
-metripy/Metric/ProjectMetrics.py,sha256=dYAlObYrdIGV6qvcP0_amdRIL66vvVipDeuq2gMax0Y,2094
+metripy/Metric/ProjectMetrics.py,sha256=YE6-C4kdVyMBqrzTXmPl9HSDk0wqEeOKYGziIYI5Lw0,2735
 metripy/Metric/Code/AggregatedMetrics.py,sha256=fLAuvM6f_ToFICQMsxZ8azNv2OTBQvbzETCJ8vA9SQY,1559
 metripy/Metric/Code/FileMetrics.py,sha256=BnAhjHeJawBV8X4EOLtJ4-aL-VmfKj4AGXmEoRV-gQE,1150
 metripy/Metric/Code/ModuleMetrics.py,sha256=J0eKYFm_m3lIJUjU0YkoADPs6HvNxHkJXHr69QTKXl8,1185
@@ -48,19 +48,19 @@ metripy/Metric/Git/GitCodeHotspot.py,sha256=zdqmXZu9cELpJ7-KGTW3tbmD2so2R6c0w1gY
 metripy/Metric/Git/GitContributor.py,sha256=Sn3Rmds7tr1H6CsR8bJ2cfuwG7tRj0vVadD28dKa6OE,1172
 metripy/Metric/Git/GitKnowledgeSilo.py,sha256=arla_KR2zyfw9O5QPDhxBrkc-bfQ-pvQuA6GUgv2c44,946
 metripy/Metric/Git/GitMetrics.py,sha256=k-MOdHaT6nOgHjQlRjjhrjIk9UjKiPMNKfjNP2WcWjM,5769
-metripy/Report/ReporterFactory.py,sha256=JKjQVGShC0PPUT5HiIuJ2lgzloQ5lHNeA5SSK8AciWU,897
+metripy/Report/ReporterFactory.py,sha256=LzB2rMGaTUyEHQ0R3wy4MC8C3yVds16rpDe2TGExFoE,965
 metripy/Report/ReporterInterface.py,sha256=OZEE3SXpTKNOKQBzPytqxqViUFzPhlBUjkBTMlib0qE,543
 metripy/Report/Csv/Reporter.py,sha256=rC52vfJYavB_9yZ3-QA7aRF0Ez34lkiBOpw2mWll2m8,431
-metripy/Report/Html/Reporter.py,sha256=rHl8IYVJqy_GItGBPAdkEoLntIGB-pieIXMMdNnMv50,8638
+metripy/Report/Html/Reporter.py,sha256=ePKXp1ZEwRSb5s2a0kjSobtiYDkr0YZ2SYcDeF2lLL4,8457
 metripy/Report/Json/AbstractJsonReporter.py,sha256=yqpBOO6MAN2HdhwoWOZ7Ler38WbV8DcG5g2oASXe-i8,343
-metripy/Report/Json/GitJsonReporter.py,sha256=4mOmoBSuCDzMSnQRAoWRckI6MPGig_25IDVwklBfuvk,850
-metripy/Report/Json/JsonReporter.py,sha256=6r1dIoVyGVr-Jds34SGmdGa8SJihy9_qYpkxZZ4ECQ0,390
+metripy/Report/Json/GitJsonReporter.py,sha256=-kirTcruclxGnbEAMdE3waPO8jLoIaFCphJiKkFkQ9M,946
+metripy/Report/Json/JsonReporter.py,sha256=To9sr2OJ39OqaAO1ynhy1fm4SK8Pa69Ubaf-YV-uRns,584
 metripy/Tree/ClassNode.py,sha256=uh2JJ3s9H6sCcj_ppElODUvvA525oHVnuhrW-ktzMj8,916
 metripy/Tree/FunctionNode.py,sha256=c2T78uGVkNRF_c2jCVmtfAwNFeY3MgASbUApROAsl3c,1520
 metripy/Tree/ModuleNode.py,sha256=YHlkAJKWWjy1oAhg7IdrvYnTOxpBYnq_VJS_ykey5_Y,1238
-metripy-0.2.7.dist-info/licenses/LICENSE,sha256=RQUMdlYUkqBhJgf7iIlzqrlaYz8VGr6KAn60wkv3FzE,1067
-metripy-0.2.7.dist-info/METADATA,sha256=dzY1Cec6ZAMyfLNZRcY2yKkACKkQwekQU9A7u7zNT38,3879
-metripy-0.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-metripy-0.2.7.dist-info/entry_points.txt,sha256=vZI1vreNyXX9XGDUQlOnE2cSBRWNyXOlXXFnEBsVNIA,49
-metripy-0.2.7.dist-info/top_level.txt,sha256=Z-tn-27QGcxzNrsRq7BNPQv2BlXJnMCp8bp2sPdde1Y,8
-metripy-0.2.7.dist-info/RECORD,,
+metripy-0.2.8.dist-info/licenses/LICENSE,sha256=7I-LBXpo2Lveofzf06uDAmq0wPN7zbMwInrQZiQCiwc,1063
+metripy-0.2.8.dist-info/METADATA,sha256=XBX7suXhXc9RC_UeYDDx8LDaHdOAn_T5tTr0t9gcjiA,4168
+metripy-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+metripy-0.2.8.dist-info/entry_points.txt,sha256=vZI1vreNyXX9XGDUQlOnE2cSBRWNyXOlXXFnEBsVNIA,49
+metripy-0.2.8.dist-info/top_level.txt,sha256=Z-tn-27QGcxzNrsRq7BNPQv2BlXJnMCp8bp2sPdde1Y,8
+metripy-0.2.8.dist-info/RECORD,,

{metripy-0.2.7.dist-info → metripy-0.2.8.dist-info}/licenses/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 CodeMetrics
+Copyright (c) 2024 Metripy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal