suggestions applied

Signed-off-by: NucleonGodX <racerpro41@gmail.com>

Author: NucleonGodX

src/packagedcode/buildpack.py

@@ -38,27 +38,39 @@ def parse(cls, location, package_only=False):
 
         buildpack_id = buildpack.get("id")
         name = buildpack.get("name")
+        namespace = None
 
-        if buildpack_id:
+        if buildpack_id and "/" in buildpack_id:
             namespace, name = buildpack_id.split("/", 1)
+        version = buildpack.get("version")
+        if version and "{{" in version and "}}" in version:
+            version = None
 
         # Initialize common package data
         package_data = dict(
             datasource_id=cls.datasource_id,
             type=cls.default_package_type,
             name=name,
-            version=buildpack.get("version"),
+            namespace=namespace,
+            version=version,
             description=buildpack.get("description"),
             homepage_url=buildpack.get("homepage"),
             keywords=buildpack.get("keywords", []),
             extracted_license_statement=None,
-            dependencies=[],
-            extra_data={}
+            extra_data={},
         )
 
         if api_version:
             package_data["extra_data"]["api_version"] = api_version
 
+        if buildpack_id:
+            package_data["extra_data"]["id"] = buildpack_id
+
+        metadata = data.get("metadata", {})
+        include_files = metadata.get("include-files", [])
+        if include_files:
+            package_data["extra_data"]["include_files"] = include_files
+
         # Handle Paketo-specific fields if present
         if "api" in data:
             cls.handle_paketo_buildpack(data, buildpack, package_data)
@@ -71,12 +83,7 @@ def parse(cls, location, package_only=False):
 
     @staticmethod
     def handle_paketo_buildpack(data, buildpack, package_data):
-        buildpack_id = buildpack.get("id")
-        if buildpack_id:
-            package_data["extra_data"]["id"] = buildpack_id
-
         package_data.update({
-            "version": buildpack.get("version"),
             "description": buildpack.get("description"),
             "homepage_url": buildpack.get("homepage"),
             "keywords": buildpack.get("keywords", []),
@@ -91,7 +98,6 @@ def handle_paketo_buildpack(data, buildpack, package_data):
             ]
             package_data["extracted_license_statement"] = "\n".join(license_statements)
 
-
         dependencies = []
         metadata = data.get("metadata", {})
         metadata_dependencies = metadata.get("dependencies", [])
@@ -149,4 +155,4 @@ def handle_heroku_buildpack(data, buildpack, package_data):
         else:
             package_data["extra_data"]["ignore_files"] = []
 
-        package_data["description"] = f"Heroku buildpack for {buildpack.get('name')}"
+        package_data["description"] = f"Heroku buildpack for {buildpack.get('name')}"

tests/packagedcode/data/buildpack/heroku-buildpacks/heroku-buildpack-java/expectedbuildpack.json

@@ -0,0 +1,57 @@
+[
+  {
+    "type": "generic",
+    "namespace": null,
+    "name": "Java",
+    "version": null,
+    "qualifiers": {},
+    "subpath": null,
+    "primary_language": null,
+    "description": "Heroku buildpack for Java",
+    "release_date": null,
+    "parties": [],
+    "keywords": [],
+    "homepage_url": null,
+    "download_url": null,
+    "size": null,
+    "sha1": null,
+    "md5": null,
+    "sha256": null,
+    "sha512": null,
+    "bug_tracking_url": null,
+    "code_view_url": null,
+    "vcs_url": null,
+    "copyright": null,
+    "holder": null,
+    "declared_license_expression": null,
+    "declared_license_expression_spdx": null,
+    "license_detections": [],
+    "other_license_expression": null,
+    "other_license_expression_spdx": null,
+    "other_license_detections": [],
+    "extracted_license_statement": null,
+    "notice_text": null,
+    "source_packages": [],
+    "file_references": [],
+    "is_private": false,
+    "is_virtual": false,
+    "extra_data": {
+      "ignore_files": [
+        "etc/",
+        "spec/",
+        "test/",
+        ".gitignore",
+        ".github/",
+        "hatchet.json",
+        "Gemfile",
+        "Gemfile.lock"
+      ]
+    },
+    "dependencies": [],
+    "repository_homepage_url": null,
+    "repository_download_url": null,
+    "api_data_url": null,
+    "datasource_id": "buildpack_toml",
+    "purl": "pkg:generic/Java"
+  }
+]

tests/packagedcode/data/buildpack/heroku-buildpacks/heroku-buildpack-java/expectedoutput.json

@@ -0,0 +1,60 @@
+[
+  {
+    "type": "generic",
+    "namespace": null,
+    "name": "PHP",
+    "version": null,
+    "qualifiers": {},
+    "subpath": null,
+    "primary_language": null,
+    "description": "Heroku buildpack for PHP",
+    "release_date": null,
+    "parties": [],
+    "keywords": [],
+    "homepage_url": null,
+    "download_url": null,
+    "size": null,
+    "sha1": null,
+    "md5": null,
+    "sha256": null,
+    "sha512": null,
+    "bug_tracking_url": null,
+    "code_view_url": null,
+    "vcs_url": null,
+    "copyright": null,
+    "holder": null,
+    "declared_license_expression": null,
+    "declared_license_expression_spdx": null,
+    "license_detections": [],
+    "other_license_expression": null,
+    "other_license_expression_spdx": null,
+    "other_license_detections": [],
+    "extracted_license_statement": null,
+    "notice_text": null,
+    "source_packages": [],
+    "file_references": [],
+    "is_private": false,
+    "is_virtual": false,
+    "extra_data": {
+      "ignore_files": [
+        ".github/",
+        ".gitignore",
+        ".rspec_parallel",
+        "support/build/",
+        "support/devcenter/",
+        "test/",
+        "Gemfile",
+        "Gemfile.lock",
+        "hatchet.json",
+        "hatchet.lock",
+        "requirements.txt"
+      ]
+    },
+    "dependencies": [],
+    "repository_homepage_url": null,
+    "repository_download_url": null,
+    "api_data_url": null,
+    "datasource_id": "buildpack_toml",
+    "purl": "pkg:generic/PHP"
+  }
+]