metripy 0.2.7__tar.gz → 0.3.0__tar.gz

{metripy-0.2.7 → metripy-0.3.0}/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

{metripy-0.2.7 → metripy-0.3.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: metripy
-Version: 0.2.7
+Version: 0.3.0
 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://zimmer-yan.github.io/metripy/
+Project-URL: Repository, https://github.com/zimmer-yan/metripy
+Project-URL: Documentation, https://zimmer-yan.github.io/metripy/
+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 → metripy-0.3.0}/README.md

@@ -1,4 +1,4 @@
-# Codemetrics
+# Metripy
 A multilanguage, multi project code metrics analysis tool. 
 
 # Languages
@@ -63,8 +63,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
             }
         },
@@ -72,3 +72,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 → metripy-0.3.0}/metripy/Application/Analyzer.py

@@ -7,14 +7,15 @@ from metripy.Dependency.Dependency import Dependency
 from metripy.Dependency.Npm.Npm import Npm
 from metripy.Dependency.Pip.Pip import Pip
 from metripy.Git.GitAnalyzer import GitAnalyzer
+from metripy.Import.Json.JsonImporter import JsonImporter
 from metripy.LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
 from metripy.LangAnalyzer.Php.PhpAnalyzer import PhpAnalyzer
 from metripy.LangAnalyzer.Python.PythonAnalyzer import PythonAnalyzer
-from metripy.LangAnalyzer.Typescript.TypescriptAnalyzer import \
-    TypescriptAnalyzer
+from metripy.LangAnalyzer.Typescript.TypescriptAnalyzer import TypescriptAnalyzer
 from metripy.Metric.Code.FileMetrics import FileMetrics
 from metripy.Metric.Git.GitMetrics import GitMetrics
 from metripy.Metric.ProjectMetrics import ProjectMetrics
+from metripy.Trend.TrendAnalyzer import TrendAnalyzer
 
 
 class Analyzer:
@@ -85,6 +86,18 @@ class Analyzer:
 
         return dependencies
 
+    def add_trends(self, project_metrics: ProjectMetrics):
+        self.output.writeln("<info>Analyzing trends...</info>")
+        importer = JsonImporter(self.output)
+        historical_project_metrics = importer.import_data(self.config.history_path)
+        TrendAnalyzer().add_historical_file_trends(
+            project_metrics.file_metrics, historical_project_metrics.file_metrics
+        )
+        TrendAnalyzer().add_historical_project_trends(
+            project_metrics, historical_project_metrics
+        )
+        self.output.writeln("<success>Trends analyzed</success>")
+
     def run(self, files: list[str]) -> ProjectMetrics:
         git_stats = None
         if self.config.git:
@@ -103,4 +116,11 @@ class Analyzer:
         elif self.config.npm:
             packages = self.analyze_npm()
 
-        return ProjectMetrics(file_metrics, git_stats, packages)
+        if not self.config.history_path:
+            return ProjectMetrics(file_metrics, git_stats, packages)
+
+        # analyze trends
+        project_metrics = ProjectMetrics(file_metrics, git_stats, packages)
+        self.add_trends(project_metrics)
+
+        return project_metrics

{metripy-0.2.7 → metripy-0.3.0}/metripy/Application/Application.py

@@ -8,15 +8,30 @@ from metripy.Component.Output.CliOutput import CliOutput
 from metripy.Report.ReporterFactory import ReporterFactory
 from metripy.Report.ReporterInterface import ReporterInterface
 
+from metripy.Application.Info import Info
+
 
 class Application:
     def run(self, argv) -> None:
         output = CliOutput()
 
         # issues and debug
-        debugger = Debugger(output).enable()
+        debugger = Debugger(output)
 
         config = Parser().parse(argv)
+        if config.debug:
+            debugger.enable()
+
+        if config.version:
+            output.writeln(Info().get_version_info())
+            return
+
+        if config.help:
+            output.writeln(Info().get_help())
+            return
+
+        if config.quiet:
+            output.set_quiet(True)
 
         finder = Finder()
         files = finder.fetch(config.project_configs)

metripy-0.3.0/metripy/Application/Config/Config.py

@@ -0,0 +1,46 @@
+from metripy.Application.Config.ProjectConfig import ProjectConfig
+
+
+class Config:
+    def __init__(self):
+        self.project_configs: list[ProjectConfig] = []
+        self.quiet: bool = False
+        self.version: bool = False
+        self.help: bool = False
+        self.debug: bool = False
+
+    def to_dict(self) -> dict:
+        return {
+            "project_configs": [
+                project_config.to_dict() for project_config in self.project_configs
+            ],
+        }
+
+    def set(self, param: str, value: any) -> None:
+        print(f"Setting {param} to {value}")
+        if param == "quiet":
+            self.quiet = value
+        elif param == "version":
+            self.version = value
+        elif param == "help":
+            self.help = value
+        elif param == "debug":
+            self.debug = value
+        elif param.startswith("configs."):
+            self._set_project_value(param[len("configs."):], value)
+        else:
+            # ignore unknown parameters
+            return
+
+    def _set_project_value(self, param: str, value: any) -> None:
+        keys = param.split(".")
+        project_name = keys[0]
+        project_config = next((pc for pc in self.project_configs if pc.name == project_name), None)
+        if not project_config:
+            project_config = ProjectConfig(project_name)
+            self.project_configs.append(project_config)
+        if len(keys) > 1:
+            project_config.set(keys[1:], value)
+        else:
+            # weird but okay
+            return

{metripy-0.2.7 → metripy-0.3.0}/metripy/Application/Config/File/ConfigFileReaderFactory.py

@@ -1,10 +1,10 @@
 import os
 import pathlib
 
-from metripy.Application.Config.File.ConfigFileReaderInterface import \
-    ConfigFileReaderInterface
-from metripy.Application.Config.File.JsonConfigFileReader import \
-    JsonConfigFileReader
+from metripy.Application.Config.File.ConfigFileReaderInterface import (
+    ConfigFileReaderInterface,
+)
+from metripy.Application.Config.File.JsonConfigFileReader import JsonConfigFileReader
 
 
 class ConfigFileReaderFactory:

{metripy-0.2.7 → metripy-0.3.0}/metripy/Application/Config/File/JsonConfigFileReader.py

@@ -2,8 +2,9 @@ import json
 import os
 
 from metripy.Application.Config.Config import Config
-from metripy.Application.Config.File.ConfigFileReaderInterface import \
-    ConfigFileReaderInterface
+from metripy.Application.Config.File.ConfigFileReaderInterface import (
+    ConfigFileReaderInterface,
+)
 from metripy.Application.Config.GitConfig import GitConfig
 from metripy.Application.Config.ProjectConfig import ProjectConfig
 from metripy.Application.Config.ReportConfig import ReportConfig
@@ -79,4 +80,8 @@ class JsonConfigFileReader(ConfigFileReaderInterface):
         if npm := json_data.get("npm"):
             project_config.npm = npm
 
+        # trends
+        if history_path := json_data.get("trends"):
+            project_config.history_path = self.resolve_path(history_path)
+
         return project_config

metripy-0.3.0/metripy/Application/Config/Parser.py

@@ -0,0 +1,46 @@
+import re
+
+from metripy.Application.Config.Config import Config
+from metripy.Application.Config.File.ConfigFileReaderFactory import (
+    ConfigFileReaderFactory,
+)
+
+
+class Parser:
+    def parse(self, argv: list[str]) -> Config:
+        config = Config()
+        print(argv)
+
+        if argv[0].endswith("metripy.py") or argv[0].endswith("metripy"):
+            argv.pop(0)
+
+        # check for a config file
+        key = 0
+        while key < len(argv):
+            arg = argv[key]
+            print(f"Key: {key} Arg: '{arg}'")
+            if matches := re.search(r"^--config=(.+)$", arg):
+                fileReader = ConfigFileReaderFactory.createFromFileName(
+                    matches.group(1)
+                )
+                fileReader.read(config)
+                argv.pop(key)
+
+            # arguments with options
+            elif matches := re.search(r"^--([\w]+(?:\.[\w]+)*)=(.*)$", arg):
+                param = matches.group(1)
+                value = matches.group(2)
+                config.set(param, value)
+                argv.pop(key)
+
+            # arguments without options
+            elif matches := re.search(r"^--([\w]+(?:\.[\w]+)*)$", arg):
+                param = matches.group(1)
+                config.set(param, True)
+                argv.pop(key)
+            else:
+                key += 1
+
+        # TODO handle remaining arguments
+
+        return config

metripy-0.3.0/metripy/Application/Config/ProjectConfig.py

@@ -0,0 +1,90 @@
+from metripy.Application.Config.GitConfig import GitConfig
+from metripy.Application.Config.ReportConfig import ReportConfig
+
+
+class ProjectConfig:
+    def __init__(self, name: str):
+        self.name: str = name
+        self.base_path: str = "./"
+        self.includes: list[str] = []
+        self.excludes: list[str] = []
+        self.extensions: list[str] = []
+        self.git: GitConfig | None = None
+        self.composer: bool = False
+        self.pip: bool = False
+        self.npm: bool = False
+        self.reports: list[ReportConfig] = []
+        self.history_path: str | None = None
+
+    def to_dict(self) -> dict:
+        return {
+            "name": self.name,
+            "base_path": self.base_path,
+            "includes": self.includes,
+            "excludes": self.excludes,
+            "extensions": self.extensions,
+            "composer": self.composer,
+            "pip": self.pip,
+            "npm": self.npm,
+            "git": self.git.to_dict() if self.git else None,
+            "reports": [report.to_dict() for report in self.reports],
+            "history_path": self.history_path,
+        }
+
+    @staticmethod
+    def str_to_bool(value):
+        if isinstance(value, bool):
+            return value
+        return str(value).lower() in ("true", "1", "yes")
+
+    def set(self, keys: list[str], value: any) -> None:
+        if len(keys) == 0:
+            return
+        primary_key = keys[0]
+        print(f"Setting primary {primary_key} to {value}")
+        # single value
+        if primary_key == "base_path":
+            self.base_path = value
+        elif primary_key == "pip":
+            self.pip = self.str_to_bool(value)
+        elif primary_key == "npm":
+            self.npm = self.str_to_bool(value)
+        elif primary_key == "composer":
+            self.composer = self.str_to_bool(value)
+        elif primary_key == "trends":
+            self.history_path = value
+        elif primary_key == "git":
+            self.git = GitConfig()
+            self.git.repo = self.base_path
+            self.git.branch = value
+
+        # list values
+        elif primary_key == "includes":
+            if value == "":
+                self.includes = []
+            else:
+                self.includes.append(value)
+        elif primary_key == "excludes":
+            if value == "":
+                self.excludes = []
+            else:
+                self.excludes.append(value)
+        elif primary_key == "extensions":
+            if value == "":
+                self.extensions = []
+            else:
+                self.extensions.append(value)
+
+        # dict values
+        elif primary_key == "reports":
+            if len(keys) == 1:
+                return
+            report_type = keys[1]
+            report_path = value
+            if value != "":
+                self.reports.append(ReportConfig(report_type, report_path))
+            else:
+                report_config = next((rc for rc in self.reports if rc.type == report_type), None)
+                if not report_config:
+                    return
+                self.reports.remove(report_config)

metripy-0.3.0/metripy/Application/Info.py

@@ -0,0 +1,29 @@
+import toml
+
+class Info:
+    def __init__(self):
+        data = self._get_data()
+        self.version = data["project"]["version"]
+        self.url = data["project"]["urls"]["Homepage"]
+
+    def _get_data(self) -> dict:
+        with open("pyproject.toml", "r") as file:
+            data = toml.load(file)
+        return data
+
+    def get_version_info(self) -> str:
+        return f"""
+Metripy {self.version}
+{self.url}
+"""
+
+    def get_help(self) -> str:
+        return self.get_version_info() + f"""
+Usage: metripy [options]
+Options:
+ --config=<file>    Use a custom config file
+ --version            Show the version and exit
+ --help               Show this help message and exit
+ --debug              Enable debug mode
+ --quiet              Disable output
+"""

{metripy-0.2.7 → metripy-0.3.0}/metripy/Dependency/Dependency.py

@@ -1,5 +1,8 @@
+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 +31,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-0.2.7 → metripy-0.3.0}/metripy/Dependency/Pip/Pip.py

@@ -1,5 +1,4 @@
 import os
-import re
 
 import toml
 
@@ -23,47 +22,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 self._parse_dependencies(deps)
 
-        return dependencies
+        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-0.2.7 → metripy-0.3.0}/metripy/Dependency/Pip/PyPi.py

@@ -16,6 +16,7 @@ class PyPi:
             print(f"Package '{dependency.name}' has no info section")
             return dependency
 
+        dependency.type = "pip"
         dependency.description = info.get("summary")
         dependency.repository = info.get("project_url") or info.get("home_page")
         if info.get("license"):

{metripy-0.2.7 → metripy-0.3.0}/metripy/Git/GitAnalyzer.py

@@ -9,8 +9,6 @@ from metripy.Metric.Git.GitMetrics import GitMetrics
 
 class GitAnalyzer:
     def __init__(self, git_config: GitConfig):
-        print(git_config.repo)
-        print(git_config.branch)
         self.repo = Repo(git_config.repo)
         self.branch_name = git_config.branch
 
@@ -22,7 +20,6 @@ class GitAnalyzer:
         first_of_month_last_year = datetime(now.year - 1, now.month, 1)
         # first_of_month_last_year = datetime(now.year, now.month, 1)
         after_date = first_of_month_last_year.strftime("%Y-%m-%d")
-        print(f"analyzing from {after_date}")
 
         return self.get_metrics(after_date)
 

metripy-0.3.0/metripy/Import/Json/JsonImporter.py

@@ -0,0 +1,17 @@
+import json
+
+from metripy.Component.Output.CliOutput import CliOutput
+from metripy.Metric.ProjectMetrics import ProjectMetrics
+
+
+class JsonImporter:
+    def __init__(self, output: CliOutput):
+        self.output = output
+
+    def import_data(self, path: str) -> ProjectMetrics:
+        self.output.writeln(f"<info>Importing data from {path}...</info>")
+        with open(path, "r") as file:
+            data = json.load(file)
+            project_metrics = ProjectMetrics.from_dict(data)
+        self.output.writeln("<success>Data imported successfuly</success>")
+        return project_metrics

{metripy-0.2.7 → metripy-0.3.0}/metripy/LangAnalyzer/AbstractLangAnalyzer.py

@@ -40,13 +40,13 @@ class AbstractLangAnalyzer(ABC):
             full_name = module.full_name
 
             if len(module.functions) > 0:
-                avgCcPerFunction = sum(
-                    function.complexity for function in module.functions
-                ) / len(module.functions)
+                totalCc = sum(function.complexity for function in module.functions)
+                avgCcPerFunction = totalCc / len(module.functions)
                 avgLocPerFunction = (
                     module.lloc - module.comments - len(module.functions)
                 ) / len(module.functions)
             else:
+                totalCc = 0
                 avgCcPerFunction = 0
                 avgLocPerFunction = 0
             maintainabilityIndex = module.maintainability_index
@@ -54,6 +54,7 @@ class AbstractLangAnalyzer(ABC):
             file_metric = FileMetrics(
                 full_name=full_name,
                 loc=module.loc,
+                totalCc=totalCc,
                 avgCcPerFunction=avgCcPerFunction,
                 maintainabilityIndex=maintainabilityIndex,
                 avgLocPerFunction=avgLocPerFunction,

{metripy-0.2.7 → metripy-0.3.0}/metripy/LangAnalyzer/Php/PhpAnalyzer.py

@@ -131,7 +131,7 @@ class PhpAnalyzer(AbstractLangAnalyzer):
 
         code_lines = code.split("\n")
         for func_name, function_node in functions.items():
-            lines = code_lines[function_node.lineno:function_node.line_end]
+            lines = code_lines[function_node.lineno : function_node.line_end]
             function_metrics = self.halstead_analyzer.calculate_halstead_metrics(
                 "\n".join(lines)
             )
@@ -147,6 +147,7 @@ class PhpAnalyzer(AbstractLangAnalyzer):
             function_node.calculated_length = function_metrics["calculated_length"]
             function_node.bugs = function_metrics["bugs"]
             function_node.time = function_metrics["time"]
+            function_node.calc_mi()
 
         maintainability_index = self._calculate_maintainability_index(
             functions.values(), module_node