Merge pull request #5307 from aboutcode-org/5306_fix_missing_argument_in_assemble_extracted_gem

Add back the missing argument for assemble_extracted_gem() #5306

Author: AyanSinhaMahapatra

src/packagedcode/rubygems.py

@@ -97,7 +97,7 @@ def parse(cls, location, package_only=False):
 
     @classmethod
     def assemble(cls, package_data, resource, codebase, package_adder):
-        yield from assemble_extracted_gem(cls, package_data, resource, codebase)
+        yield from assemble_extracted_gem(cls, package_data, resource, codebase, package_adder)
 
 
 class BaseGemProjectHandler(models.DatafileHandler):

tests/packagedcode/data/plugin/rubygems-package-expected.json

@@ -63,7 +63,7 @@
             {
               "license_expression": "mit",
               "license_expression_spdx": "MIT",
-              "from_file": "package/m2r-2.1.0.gem",
+              "from_file": "m2r-2.1.0.gem",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-spdx-id",
@@ -366,7 +366,7 @@
                 {
                   "license_expression": "mit",
                   "license_expression_spdx": "MIT",
-                  "from_file": "package/m2r-2.1.0.gem",
+                  "from_file": "m2r-2.1.0.gem",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -548,13 +548,6 @@
         "pkg:gem/m2r@2.1.0?uuid=fixed-uid-done-for-testing-5642512d1758"
       ],
       "scan_errors": []
-    },
-    {
-      "path": "m2r-2.1.0.gem.json",
-      "type": "file",
-      "package_data": [],
-      "for_packages": [],
-      "scan_errors": []
     }
   ]
 }