Skip to content

Commit 023c452

Browse files
committed
Update GemfileParser #3072
* Add new step in GemfileParser.__init__() to determine the Ruby package that this gemfile.lock is for * Add new test Signed-off-by: Jono Yang <jyang@nexb.com>
1 parent 4c7bb33 commit 023c452

File tree

6 files changed

+288
-3248
lines changed

6 files changed

+288
-3248
lines changed

src/packagedcode/gemfile_lock.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -417,13 +417,10 @@ def refine(self):
417417

418418
def set_primary_gem(self):
419419
for gem in self.all_gems.values():
420-
if gem.type == PATH:
421-
self.primary_gem = Gem(
422-
gem.name,
423-
gem.version,
424-
gem.platform,
425-
)
426-
break
420+
if not gem.type == PATH:
421+
continue
422+
self.primary_gem = gem
423+
break
427424

428425
def get_or_create(self, name, version=None, platform=None):
429426
"""

src/packagedcode/rubygems.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def parse(cls, location):
270270
is_runtime=True,
271271
is_optional=False,
272272
is_resolved=True,
273-
) for dep in all_gems[1:]
273+
) for dep in all_gems if dep != primary_gem
274274
]
275275
urls = get_urls(primary_gem.name, primary_gem.version)
276276

0 commit comments

Comments
 (0)