diff --git a/src/packagedcode/pubspec.py b/src/packagedcode/pubspec.py index bbc36038c0..593f9ea7db 100644 --- a/src/packagedcode/pubspec.py +++ b/src/packagedcode/pubspec.py @@ -208,17 +208,28 @@ def build_dep(name, version, scope, is_runtime=True, is_optional=False): # TODO: these can be more complex for SDKs # https://dart.dev/tools/pub/dependencies#dependency-sources - if isinstance(version, dict) and 'sdk' in version: - # {'sdk': 'flutter'} type of deps.... - # which is a wart that we keep as a requiremnet - version = ', '.join(': '.join([k, str(v)]) for k, v in version.items()) + extra_data = {} + extracted_requirement = None + is_pinned = False + + if isinstance(version, dict): + if 'sdk' in version: + # {'sdk': 'flutter'} type of deps.... + # which is a wart that we keep as a requiremnet + extracted_requirement = ', '.join(': '.join([k, str(v)]) for k, v in version.items()) + else: + extra_data = version + if 'version' in version and isinstance(version['version'], str): + extracted_requirement = version['version'] + elif isinstance(version, str): + extracted_requirement = version or None - if version.replace('.', '').isdigit(): + if extracted_requirement and isinstance(extracted_requirement, str) and extracted_requirement.replace('.', '').isdigit(): # version is pinned exactly if it is only made of dots and digits purl = PackageURL( type='pubspec', name=name, - version=version, + version=extracted_requirement, ) is_pinned = True else: @@ -230,11 +241,12 @@ def build_dep(name, version, scope, is_runtime=True, is_optional=False): dep = models.DependentPackage( purl=purl.to_string(), - extracted_requirement=version, + extracted_requirement=extracted_requirement, scope=scope, is_runtime=is_runtime, is_optional=is_optional, is_pinned=is_pinned, + extra_data=extra_data, ) return dep diff --git a/tests/packagedcode/test_pubspec.py b/tests/packagedcode/test_pubspec.py index f0a5b6d5e2..c88a7b9cb8 100644 --- a/tests/packagedcode/test_pubspec.py +++ b/tests/packagedcode/test_pubspec.py @@ -34,6 +34,55 @@ def test_parse_lock(self): package_data = pubspec.DartPubspecLockHandler.parse(test_loc) self.check_packages_data(package_data, expected_loc, regen=REGEN_TEST_FIXTURES) + def test_build_dep_non_string_versions(self): + dep_none = pubspec.build_dep('pkg_none', None, 'dependencies') + assert dep_none.purl == 'pkg:pubspec/pkg_none' + assert dep_none.extracted_requirement is None + assert dep_none.is_pinned is False + assert dep_none.extra_data == {} + + dep_path = pubspec.build_dep('pkg_path', {'path': '../local_pkg'}, 'dependencies') + assert dep_path.purl == 'pkg:pubspec/pkg_path' + assert dep_path.extracted_requirement is None + assert dep_path.is_pinned is False + assert dep_path.extra_data == {'path': '../local_pkg'} + + dep_git = pubspec.build_dep('pkg_git', {'git': {'url': 'git://github.com/foo/bar.git'}}, 'dependencies') + assert dep_git.purl == 'pkg:pubspec/pkg_git' + assert dep_git.extracted_requirement is None + assert dep_git.is_pinned is False + assert dep_git.extra_data == {'git': {'url': 'git://github.com/foo/bar.git'}} + + dep_hosted = pubspec.build_dep('pkg_hosted', {'hosted': 'http://pub.example.com', 'version': '^1.0.0'}, 'dependencies') + assert dep_hosted.purl == 'pkg:pubspec/pkg_hosted' + assert dep_hosted.extracted_requirement == '^1.0.0' + assert dep_hosted.is_pinned is False + assert dep_hosted.extra_data == {'hosted': 'http://pub.example.com', 'version': '^1.0.0'} + + def test_parse_pubspec_yaml_path_git_unversioned_dependencies(self): + test_file = self.get_temp_file('pubspec.yaml') + with open(test_file, 'w') as f: + f.write( + 'name: test_app\n' + 'version: 1.0.0\n' + 'dependencies:\n' + ' flutter:\n' + ' sdk: flutter\n' + ' my_local:\n' + ' path: ../my_local\n' + ' collection:\n' + ) + packages = list(pubspec.DartPubspecYamlHandler.parse(test_file)) + assert len(packages) == 1 + pkg = packages[0] + assert pkg.name == 'test_app' + deps = {d.purl: d for d in pkg.dependencies} + assert 'pkg:pubspec/flutter' in deps + assert 'pkg:pubspec/my_local' in deps + assert 'pkg:pubspec/collection' in deps + assert deps['pkg:pubspec/my_local'].extra_data == {'path': '../my_local'} + assert deps['pkg:pubspec/collection'].extracted_requirement is None + def pub_tester(location,): manifests = []