Merge pull request #3090 from nexB/3072-rubygem-parse-fix

Process Gemfile.lock processing #3072

Author: pombredanne

src/packagedcode/gemfile_lock.py

@@ -368,6 +368,9 @@ def __init__(self, lockfile):
         # the final tree of dependencies, keyed by name
         self.dependency_tree = {}
 
+        # the package that the gemfile.lock is for
+        self.primary_gem = None
+
         # a flat dict of all gems, keyed by name
         self.all_gems = {}
 
@@ -399,6 +402,9 @@ def __init__(self, lockfile):
         # finally refine the collected data
         self.refine()
 
+        # set primary gem
+        self.set_primary_gem()
+
     def reset_state (self):
         self.state = None
         self.current_options = {}
@@ -409,6 +415,13 @@ def refine(self):
         for gem in self.all_gems.values():
             gem.refine()
 
+    def set_primary_gem(self):
+        for gem in self.all_gems.values():
+            if not gem.type == PATH:
+                continue
+            self.primary_gem = gem
+            break
+
     def get_or_create(self, name, version=None, platform=None):
         """
         Return an existing gem if it exists or creates a new one.

src/packagedcode/rubygems.py

@@ -252,9 +252,39 @@ class GemfileLockHandler(BaseGemProjectHandler):
     @classmethod
     def parse(cls, location):
         gemfile_lock = GemfileLockParser(location)
-        dependencies = []
-        for _, gem in gemfile_lock.all_gems.items():
-            dependencies.append(
+        all_gems = list(gemfile_lock.all_gems.values())
+        if not all_gems:
+            return
+
+        primary_gem = gemfile_lock.primary_gem
+        if primary_gem:
+            deps = [
+                models.DependentPackage(
+                    purl=PackageURL(
+                        type='gem',
+                        name=dep.name,
+                        version=dep.version
+                    ).to_string(),
+                    extracted_requirement=', '.join(dep.requirements),
+                    scope='dependencies',
+                    is_runtime=True,
+                    is_optional=False,
+                    is_resolved=True,
+                ) for dep in all_gems if dep != primary_gem
+            ]
+            urls = get_urls(primary_gem.name, primary_gem.version)
+
+            yield models.PackageData(
+                datasource_id=cls.datasource_id,
+                primary_language=cls.default_primary_language,
+                type=cls.default_package_type,
+                name=primary_gem.name,
+                version=primary_gem.version,
+                dependencies=deps,
+                **urls
+            )
+        else:
+            deps = [
                 models.DependentPackage(
                     purl=PackageURL(
                         type='gem',
@@ -267,43 +297,14 @@ def parse(cls, location):
                     is_runtime=True,
                     is_optional=False,
                     is_resolved=True,
-                )
-            )
-
-        yield models.PackageData(
-            datasource_id=cls.datasource_id,
-            type=cls.default_package_type,
-            dependencies=dependencies,
-            primary_language=cls.default_primary_language,
-        )
-
-        for _, gem in gemfile_lock.all_gems.items():
-            deps = []
-            for _dep_name, dep in gem.dependencies.items():
-                deps.append(
-                    models.DependentPackage(
-                        purl=PackageURL(
-                            type='gem',
-                            name=dep.name,
-                            version=dep.version
-                        ).to_string(),
-                        extracted_requirement=', '.join(dep.requirements),
-                        scope='dependencies',
-                        is_runtime=True,
-                        is_optional=False,
-                        is_resolved=True,
-                    )
-                )
-            urls = get_urls(gem.name, gem.version)
+                ) for gem in all_gems
+            ]
 
             yield models.PackageData(
                 datasource_id=cls.datasource_id,
-                primary_language=cls.default_primary_language,
                 type=cls.default_package_type,
-                name=gem.name,
-                version=gem.version,
                 dependencies=deps,
-                **urls
+                primary_language=cls.default_primary_language,
             )