Add indicators for sqaaas.json

data/software-tools/apptainer.json

@@ -11,11 +11,33 @@
   },
   "isAccessibleForFree": true,
   "hasQualityDimension": [
-    { "@id": "dim:compatibility", "@type": "@id" },
-    { "@id": "dim:flexibility", "@type": "@id" },
-    { "@id": "dim:reliability", "@type": "@id" },
-    { "@id": "dim:sustainability", "@type": "@id" }
+    {
+      "@id": "dim:compatibility",
+      "@type": "@id"
+    },
+    {
+      "@id": "dim:flexibility",
+      "@type": "@id"
+    },
+    {
+      "@id": "dim:reliability",
+      "@type": "@id"
+    },
+    {
+      "@id": "dim:sustainability",
+      "@type": "@id"
+    }
   ],
   "howToUse": ["command-line"],
-  "license": "https://opensource.org/license/bsd-3-clause"
+  "license": "https://opensource.org/license/bsd-3-clause",
+  "improvesQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/dependency_management",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
+      "@type": "@id"
+    }
+  ]
 }

data/software-tools/bearer.json

@@ -2,7 +2,10 @@
   "@context": "https://w3id.org/everse/rs#",
   "@id": "https://w3id.org/everse/tools/bearer",
   "@type": "SoftwareApplication",
-  "applicationCategory": { "@id": "rs:AnalysisCode", "@type": "@id" },
+  "applicationCategory": {
+    "@id": "rs:AnalysisCode",
+    "@type": "@id"
+  },
   "appliesToProgrammingLanguage": [
     "JavaScript",
     "TypeScript",
@@ -13,10 +16,27 @@
     "Python"
   ],
   "description": "Bearer CLI is a static application security testing (SAST) tool that scans your source code and analyzes your data flows to discover, filter and prioritize security and privacy risks.",
-  "hasQualityDimension": { "@id": "dim:security", "@type": "@id" },
+  "hasQualityDimension": {
+    "@id": "dim:security",
+    "@type": "@id"
+  },
   "howToUse": ["online-service"],
   "isAccessibleForFree": true,
   "license": "https://spdx.org/licenses/Elastic-2.0",
   "name": "bearer",
-  "url": "https://github.com/bearer/bearer"
+  "url": "https://github.com/bearer/bearer",
+  "measuresQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/no_critical_vulnerability",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/no_leaked_credentials",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/static_analysis_common_vulnerabilities",
+      "@type": "@id"
+    }
+  ]
 }

data/software-tools/creative-commons-license-chooser.json

@@ -7,10 +7,19 @@
     "@type": "@id"
   },
   "description": "A web-based tool to help users select an appropriate Creative Commons license for their work.",
-  "hasQualityDimension": { "@id": "dim:fairness", "@type": "@id" },
+  "hasQualityDimension": {
+    "@id": "dim:fairness",
+    "@type": "@id"
+  },
   "howToUse": ["command-line"],
   "isAccessibleForFree": true,
   "license": "https://creativecommons.org/publicdomain/zero/1.0",
   "name": "Creative Commons License Chooser",
-  "url": "https://chooser-beta.creativecommons.org/"
+  "url": "https://chooser-beta.creativecommons.org/",
+  "improvesQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/software_has_license",
+      "@type": "@id"
+    }
+  ]
 }

data/software-tools/doxygen.json

@@ -22,7 +22,7 @@
   "howToUse": ["CI/CD", "command-line"],
   "improvesQualityIndicator": [
     {
-      "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+      "@id": "https://w3id.org/everse/i/indicators/software_has_documentation",
       "@type": "@id"
     }
   ],

data/software-tools/gitlab-cicd.json

@@ -8,12 +8,46 @@
   },
   "description": "Integrated continuous integration and deployment platform that automates research software testing, building, and deployment workflows, improving software reliability and sustainability through comprehensive DevOps practices.",
   "hasQualityDimension": [
-    { "@id": "dim:sustainability", "@type": "@id" },
-    { "@id": "dim:reliability", "@type": "@id" }
+    {
+      "@id": "dim:sustainability",
+      "@type": "@id"
+    },
+    {
+      "@id": "dim:reliability",
+      "@type": "@id"
+    }
+  ],
+  "improvesQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/repository_workflows",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/software_has_tests",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/has_ci-tests",
+      "@type": "@id"
+    }
   ],
   "howToUse": ["CI/CD", "command-line", "online-service"],
   "isAccessibleForFree": false,
   "license": "https://spdx.org/licenses/MIT",
   "name": "GitLab CICD",
-  "url": "https://docs.gitlab.com/ci/"
+  "url": "https://docs.gitlab.com/ci/",
+  "improvesQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/repository_workflows",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/software_has_tests",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/has_ci-tests",
+      "@type": "@id"
+    }
+  ]
 }

data/software-tools/gitleaks.json

@@ -8,13 +8,34 @@
   "isAccessibleForFree": true,
   "license": "https://spdx.org/licenses/MIT",
   "applicationCategory": [
-    { "@id": "rs:PrototypeTool", "@type": "@id" },
-    { "@id": "rs:ResearchInfrastructureSoftware", "@type": "@id" },
-    { "@id": "rs:AnalysisCode", "@type": "@id" }
+    {
+      "@id": "rs:PrototypeTool",
+      "@type": "@id"
+    },
+    {
+      "@id": "rs:ResearchInfrastructureSoftware",
+      "@type": "@id"
+    },
+    {
+      "@id": "rs:AnalysisCode",
+      "@type": "@id"
+    }
   ],
   "hasQualityDimension": [
-    { "@id": "dim:security", "@type": "@id" },
-    { "@id": "dim:sustainability", "@type": "@id" }
+    {
+      "@id": "dim:security",
+      "@type": "@id"
+    },
+    {
+      "@id": "dim:sustainability",
+      "@type": "@id"
+    }
   ],
-  "howToUse": ["CI/CD", "command-line"]
+  "howToUse": ["CI/CD", "command-line"],
+  "measuresQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/no_leaked_credentials",
+      "@type": "@id"
+    }
+  ]
 }

data/software-tools/howfairis.json

@@ -14,15 +14,15 @@
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/listed_in_a_registry",
+      "@id": "https://w3id.org/everse/i/indicators/listed_in_registry",
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/uses_citation",
+      "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/has_documentation",
+      "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
       "@type": "@id"
     },
     {

data/software-tools/resqui.json

@@ -34,19 +34,19 @@
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/software_has_ci_tests",
+      "@id": "https://w3id.org/everse/i/indicators/has_ci-tests",
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/software_human_code_review_requirement",
+      "@id": "https://w3id.org/everse/i/indicators/human_code_review_requirement",
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/software_has_published_package",
+      "@id": "https://w3id.org/everse/i/indicators/has_published_package",
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/software_has_no_security_leak",
+      "@id": "https://w3id.org/everse/i/indicators/no_leaked_credentials",
       "@type": "@id"
     }
   ],

data/software-tools/somef.json

@@ -14,19 +14,19 @@
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/listed_in_a_registry",
+      "@id": "https://w3id.org/everse/i/indicators/listed_in_registry",
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/uses_citation",
+      "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
       "@type": "@id"
     },
     {
       "@id": "https://w3id.org/everse/i/indicators/codemeta_completeness",
       "@type": "@id"
     },
     {
-      "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+      "@id": "https://w3id.org/everse/i/indicators/software_has_documentation",
       "@type": "@id"
     },
     {

data/software-tools/sonarqube.json

@@ -8,14 +8,37 @@
   },
   "description": "Continuous code quality platform that automatically detects bugs, vulnerabilities, and code smells across multiple programming languages, providing comprehensive static analysis to improve software maintainability, security, and reliability.",
   "hasQualityDimension": [
-    { "@id": "dim:maintainability", "@type": "@id" },
-    { "@id": "dim:security", "@type": "@id" },
-    { "@id": "dim:reliability", "@type": "@id" }
+    {
+      "@id": "dim:maintainability",
+      "@type": "@id"
+    },
+    {
+      "@id": "dim:security",
+      "@type": "@id"
+    },
+    {
+      "@id": "dim:reliability",
+      "@type": "@id"
+    }
   ],
   "howToUse": ["CI/CD", "online-service"],
   "isAccessibleForFree": true,
   "license": "https://spdx.org/licenses/GPL-3.0-only",
   "name": "SonarQube",
   "appliesToProgrammingLanguage": ["Java", "Python", "JavaScript", "C#", "C++"],
-  "url": "https://www.sonarqube.org/"
+  "url": "https://www.sonarqube.org/",
+  "improvesQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/no_critical_vulnerability",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/no_leaked_credentials",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/static_analysis_common_vulnerabilities",
+      "@type": "@id"
+    }
+  ]
 }

data/software-tools/sqaaas.json

@@ -2,12 +2,52 @@
   "@context": "https://w3id.org/everse/rs#",
   "@id": "https://w3id.org/everse/tools/sqaaas",
   "@type": "SoftwareApplication",
-  "applicationCategory": { "@id": "rs:AnalysisCode", "@type": "@id" },
+  "applicationCategory": {
+    "@id": "rs:AnalysisCode",
+    "@type": "@id"
+  },
   "description": "Software Quality Assessment as a Service platform that analyzes completeness against FAIR4RS reference criteria for research software releases, providing comprehensive quality assessment and awarding capabilities for research software projects.",
-  "hasQualityDimension": { "@id": "dim:fairness", "@type": "@id" },
+  "hasQualityDimension": {
+    "@id": "dim:fairness",
+    "@type": "@id"
+  },
   "howToUse": ["online-service", "CI/CD"],
   "isAccessibleForFree": true,
   "license": "https://spdx.org/licenses/AGPL-3.0-or-later",
   "name": "SQAaas",
-  "url": "https://sqaaas.eosc-synergy.eu/"
+  "url": "https://sqaaas.eosc-synergy.eu/",
+  "measuresQualityIndicator": [
+    {
+      "@id": "https://w3id.org/everse/i/indicators/listed_in_registry",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/software_has_documentation",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/software_has_license",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/no_leaked_credentials",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/software_has_tests",
+      "@type": "@id"
+    },
+    {
+      "@id": "https://w3id.org/everse/i/indicators/has_no_linting_issues",
+      "@type": "@id"
+    }
+  ]
 }

tests/README.md

@@ -0,0 +1,19 @@
+# Tests
+
+Validation tests for EVERSE TechRadar tool and service JSON files.
+
+## Running Tests
+
+```bash
+# Run all tests
+python -m pytest tests/
+
+# Run specific test
+python -m pytest tests/test_tools.py -v
+```
+
+## Dependencies
+
+```bash
+pip install -r tests/requirements.txt
+```