Fix multiple podspec handling

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/packagedcode/cocoapods.py

@@ -9,6 +9,9 @@
 
 import hashlib
 import json
+import os
+import logging
+from struct import pack
 
 import saneyaml
 from packageurl import PackageURL
@@ -26,6 +29,24 @@
 See https://cocoapods.org
 """
 
+TRACE = os.environ.get('SCANCODE_DEBUG_PACKAGE', False)
+
+def logger_debug(*args):
+    pass
+
+
+logger = logging.getLogger(__name__)
+
+if TRACE:
+    import sys
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(
+            ' '.join(isinstance(a, str) and a or repr(a) for a in args)
+        )
+
 # TODO: consider merging Gemfile.lock and Podfile.lock in one module: this is the same format
 
 # TODO: override the license detection to detect declared_license correctly.
@@ -96,7 +117,7 @@ class BasePodHandler(models.DatafileHandler):
     @classmethod
     def assemble(cls, package_data, resource, codebase):
         """
-        Assemble pod packages and dependencies and handle the specifc cases where
+        Assemble pod packages and dependencies and handle the specific cases where
         there are more than one podspec in the same directory.
         This is designed to process .podspec, Podfile and Podfile.lock
         """
@@ -114,13 +135,15 @@ def assemble(cls, package_data, resource, codebase):
             has_single_podspec = siblings_counts == 1
             has_multiple_podspec = siblings_counts > 1
 
+            datafile_name_patterns = (
+                'Podfile.lock',
+                'Podfile',
+            )
+
             if has_single_podspec:
                 # we can treat all podfile/spec as being for one package
-                datafile_name_patterns = (
-                    sibling_podspecs[0].name,
-                    'Podfile.lock',
-                    'Podfile',
-                )
+                datafile_name_patterns = (sibling_podspecs[0].name,) + datafile_name_patterns
+
                 yield from models.DatafileHandler.assemble_from_many_datafiles(
                     datafile_name_patterns=datafile_name_patterns,
                     directory=parent,
@@ -131,24 +154,29 @@ def assemble(cls, package_data, resource, codebase):
                 # treat each of podspec and podfile alone without meraging
                 # as we cannot determine easily which podfile is for which
                 # podspec
-                yield from models.DatafileHandler.assemble(package_data, resource, codebase)
+                podspec = sibling_podspecs.pop()
+                datafile_name_patterns = (podspec.name,) + datafile_name_patterns
 
-                datafile_name_patterns = (
-                    'Podfile.lock',
-                    'Podfile',
-                )
                 yield from models.DatafileHandler.assemble_from_many_datafiles(
                     datafile_name_patterns=datafile_name_patterns,
                     directory=parent,
                     codebase=codebase,
                 )
 
+                for resource in sibling_podspecs:
+                    datafile_path = resource.path
+                    yield resource
+                    for package_data in resource.package_data:
+                        package_data = models.PackageData.from_dict(package_data)
+                        package = models.Package.from_package_data(
+                            package_data=package_data,
+                            datafile_path=datafile_path,
+                        )
+                        cls.assign_package_to_resources(package, resource, codebase)
+                        yield package
+
             else:
                 # has_no_podspec:
-                datafile_name_patterns = (
-                    'Podfile.lock',
-                    'Podfile',
-                )
                 yield from models.DatafileHandler.assemble_from_many_datafiles(
                     datafile_name_patterns=datafile_name_patterns,
                     directory=parent,

src/packagedcode/models.py

@@ -10,6 +10,7 @@
 import os
 import uuid
 from fnmatch import fnmatchcase
+import logging
 
 import attr
 from packageurl import normalize_qualifiers
@@ -107,21 +108,20 @@
 TRACE = SCANCODE_DEBUG_PACKAGE_API
 TRACE_UPDATE = SCANCODE_DEBUG_PACKAGE_API
 
+def logger_debug(*args):
+    pass
+
+logger = logging.getLogger(__name__)
+
 if TRACE or TRACE_UPDATE:
-    use_print = True
-    if use_print:
-        prn = print
-    else:
-        import logging
-        import sys
-        logger = logging.getLogger(__name__)
-        # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
-        logging.basicConfig(stream=sys.stdout)
-        logger.setLevel(logging.DEBUG)
-        prn = logger.debug
+    import sys
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return prn(' '.join(isinstance(a, str) and a or repr(a) for a in args))
+        return logger.debug(
+            ' '.join(isinstance(a, str) and a or repr(a) for a in args)
+        )
 
 
 class ModelMixin:
@@ -1090,6 +1090,9 @@ def assemble_from_many_datafiles(cls, datafile_name_patterns, directory, codebas
                         pkgdata_resources.append((package_data, sibling,))
 
         if pkgdata_resources:
+            if TRACE:
+                logger_debug(f' assemble_from_many_datafiles: pkgdata_resources: {pkgdata_resources!r}')
+
             yield from cls.assemble_from_many(
                 pkgdata_resources=pkgdata_resources,
                 codebase=codebase,

src/packagedcode/plugin_package.py

@@ -10,6 +10,7 @@
 import attr
 import click
 import os
+import logging
 import sys
 
 from commoncode.cliutils import PluggableCommandLineOption
@@ -24,25 +25,25 @@
 from packagedcode.models import Package
 from packagedcode.models import PackageData
 
+
 TRACE = os.environ.get('SCANCODE_DEBUG_PACKAGE', False)
 
-if TRACE:
 
-    use_print = True
+def logger_debug(*args):
+    pass
 
-    if use_print:
-        printer = print
-    else:
-        import logging
 
-        logger = logging.getLogger(__name__)
-        # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
-        logging.basicConfig(stream=sys.stdout)
-        logger.setLevel(logging.DEBUG)
-        printer = logger.debug
+logger = logging.getLogger(__name__)
+
+if TRACE:
+    import sys
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return printer(' '.join(isinstance(a, str) and a or repr(a) for a in args))
+        return logger.debug(
+            ' '.join(isinstance(a, str) and a or repr(a) for a in args)
+        )
 
 
 def print_packages(ctx, param, value):
@@ -171,7 +172,7 @@ def create_package_and_deps(codebase, **kwargs):
 
             for item in items:
                 if TRACE:
-                    logger_debug('    create_package_and_deps: item:', item,)
+                    logger_debug('    create_package_and_deps: item:', item)
 
                 if isinstance(item, Package):
                     packages_top_level.append(item)
@@ -181,6 +182,8 @@ def create_package_and_deps(codebase, **kwargs):
 
                 elif isinstance(item, Resource):
                     seen_resource_ids.add(item.rid)
+                    if TRACE:
+                        logger_debug('    create_package_and_deps: seen_resource_ids:', seen_resource_ids,)
 
                 else:
                     raise Exception(f'Unknown package assembly item type: {item!r}')