Add basic working command

This is not resolving anything yet, but all the basic parts are in
place.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

src/_packagedcode/models.py

@@ -12,23 +12,21 @@
 """
 
 PLAIN_URLS = (
-    'https://',
-    'http://',
+    "https://",
+    "http://",
 )
 
 VCS_URLS = (
-    'git://',
-    'git+git://',
-    'git+https://',
-    'git+http://',
-
-    'hg://',
-    'hg+http://',
-    'hg+https://',
-
-    'svn://',
-    'svn+https://',
-    'svn+http://',
+    "git://",
+    "git+git://",
+    "git+https://",
+    "git+http://",
+    "hg://",
+    "hg+http://",
+    "hg+https://",
+    "svn://",
+    "svn+https://",
+    "svn+http://",
 )
 
 
@@ -77,34 +75,35 @@ def normalize_vcs_url(repo_url, vcs_tool=None):
     if repo_url.startswith(VCS_URLS + PLAIN_URLS):
         return repo_url
 
-    if repo_url.startswith('git@'):
-        tool, _, right = repo_url.partition('@')
-        if ':' in repo_url:
-            host, _, repo = right.partition(':')
+    if repo_url.startswith("git@"):
+        tool, _, right = repo_url.partition("@")
+        if ":" in repo_url:
+            host, _, repo = right.partition(":")
         else:
             # git@github.com/Filirom1/npm2aur.git
-            host, _, repo = right.partition('/')
+            host, _, repo = right.partition("/")
 
-        if any(r in host for r in ('bitbucket', 'gitlab', 'github')):
-            scheme = 'https'
+        if any(r in host for r in ("bitbucket", "gitlab", "github")):
+            scheme = "https"
         else:
-            scheme = 'git'
+            scheme = "git"
 
-        return '%(scheme)s://%(host)s/%(repo)s' % locals()
+        return "%(scheme)s://%(host)s/%(repo)s" % locals()
 
     # FIXME: where these URL schemes come from??
-    if repo_url.startswith(('bitbucket:', 'gitlab:', 'github:', 'gist:')):
+    if repo_url.startswith(("bitbucket:", "gitlab:", "github:", "gist:")):
         hoster_urls = {
-            'bitbucket': 'https://bitbucket.org/%(repo)s',
-            'github': 'https://github.com/%(repo)s',
-            'gitlab': 'https://gitlab.com/%(repo)s',
-            'gist': 'https://gist.github.com/%(repo)s', }
-        hoster, _, repo = repo_url.partition(':')
+            "bitbucket": "https://bitbucket.org/%(repo)s",
+            "github": "https://github.com/%(repo)s",
+            "gitlab": "https://gitlab.com/%(repo)s",
+            "gist": "https://gist.github.com/%(repo)s",
+        }
+        hoster, _, repo = repo_url.partition(":")
         return hoster_urls[hoster] % locals()
 
-    if len(repo_url.split('/')) == 2:
+    if len(repo_url.split("/")) == 2:
         # implicit github, but that's only on NPM?
-        return f'https://github.com/{repo_url}'
+        return f"https://github.com/{repo_url}"
 
     return repo_url
 
@@ -113,14 +112,14 @@ def build_description(summary, description):
     """
     Return a description string from a summary and description
     """
-    summary = (summary or '').strip()
-    description = (description or '').strip()
+    summary = (summary or "").strip()
+    description = (description or "").strip()
 
     if not description:
         description = summary
     else:
         if summary and summary not in description:
-            description = '\n'.join([summary , description])
+            description = "\n".join([summary, description])
 
     return description
 
@@ -164,7 +163,7 @@ def find_root_resource(path, resource, codebase):
     """
     if not resource.path.endswith(path):
         return
-    for _seg in path.split('/'):
+    for _seg in path.split("/"):
         resource = resource.parent(codebase)
         if not resource:
             return
@@ -176,6 +175,7 @@ def yield_dependencies_from_package_data(package_data, datafile_path, package_ui
     Yield a Dependency for each dependency from ``package_data.dependencies``
     """
     from _packagedcode import models
+
     dependent_packages = package_data.dependencies
     if dependent_packages:
         yield from models.Dependency.from_dependent_packages(
@@ -191,6 +191,7 @@ def yield_dependencies_from_package_resource(resource, package_uid=None):
     Yield a Dependency for each dependency from each package from``resource.package_data``
     """
     from _packagedcode import models
+
     for pkg_data in resource.package_data:
         pkg_data = models.PackageData.from_dict(pkg_data)
         yield from yield_dependencies_from_package_data(pkg_data, resource.path, package_uid)

src/_packagedcode/pypi.py

@@ -5,4 +5,4 @@
 # See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
 # See https://github.com/nexB/scancode-toolkit for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
-#
+#

src/_packagedcode/utils.py

@@ -20,12 +20,13 @@ class FileOptionType(click.File):
     """
 
     def convert(self, value, param, ctx):
-        known_opts = set(chain.from_iterable(
-            p.opts for p in ctx.command.params if isinstance(p, click.Option)))
+        known_opts = set(
+            chain.from_iterable(p.opts for p in ctx.command.params if isinstance(p, click.Option))
+        )
         if value in known_opts:
             self.fail(
-                'Illegal file name conflicting with an option name: '
-                f'{ os.fsdecode(value)}. '
+                "Illegal file name conflicting with an option name: "
+                f"{ os.fsdecode(value)}. "
                 'Use the special "-" file name to print results on screen/stdout.',
                 param,
                 ctx,

src/python_inspector/__init__.py

@@ -9,35 +9,42 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
+from packageurl import PackageURL
+from packaging.requirements import Requirement
+from pip_requirements_parser import InstallRequirement
+
 from _packagedcode import models
 from _packagedcode.pypi import PipRequirementsFileHandler
-from pip_requirements_parser import InstallRequirement
-from packaging.requirements import Requirement
-from packageurl import PackageURL
 
 """
 Utilities to resolve dependencies .
 """
 
+TRACE = False
+
 
 def get_dependencies_from_requirements(requirements_file="requirements.txt", *args, **kwargs):
     """
     Yield DependentPackage for each requirement in a `requirement`
     file.
     """
-    for packages_data in PipRequirementsFileHandler.parse(location=requirements_file):
-        for package_data in packages_data:
-            for dependent_package in package_data.dependencies:
-                yield dependent_package
+    for package_data in PipRequirementsFileHandler.parse(location=requirements_file):
+        for dependent_package in package_data.dependencies:
+            if TRACE:
+                print(
+                    "dependent_package.extracted_requirement:",
+                    dependent_package.extracted_requirement,
+                )
+            yield dependent_package
 
 
 def get_dependency(specifier, *args, **kwargs):
     """
     Return a DependentPackage given a requirement ``specifier`` string.
 
     For example:
-    >>> assert get_dependency("foo==1.2.3") == ("foo", "1.2.3")
-    >>> assert get_dependency("fooA==1.2.3.DEV1") == ("fooa", "1.2.3.dev1")
+    >>> dep = get_dependency("foo==1.2.3")
+    >>> assert dep.purl == "pkg:pypi/foo@1.2.3"
     """
     specifier = specifier and "".join(specifier.lower().split())
     assert specifier, f"specifier is required but empty:{specifier!r}"
@@ -50,14 +57,14 @@ def get_dependency(specifier, *args, **kwargs):
         requirement_line=specifier,
     )
 
-    scope = 'install'
+    scope = "install"
     is_runtime = True
     is_optional = False
 
     if ir.name:
         # will be None if not pinned
         version = ir.get_pinned_version
-        purl = PackageURL(type='pypi', name=ir.name, version=version)
+        purl = PackageURL(type="pypi", name=ir.name, version=version).to_string()
 
     return models.DependentPackage(
         purl=purl,