Add new handler for etc/os-release files

* Add new dependency on container-inspector
* Also cleanup and sync setup files

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

setup-mini.cfg

@@ -69,7 +69,8 @@ install_requires =
     chardet >= 3.0.0
     click >= 6.7, !=7.0
     colorama >= 0.3.9
-    commoncode >= 30.0.0
+    commoncode >= 30.1.1
+    container-inspector >= 30.0.0
     debian-inspector >= 30.0.0
     dparse2 >= 0.6.0
     fasteners
@@ -175,14 +176,13 @@ scancode_scan =
 # module for details and doc.
 scancode_post_scan =
     summary = summarycode.summarizer:ScanSummary
-    summary2 = summarycode.summarizer2:ScanSummary
-    summary-keeping-details = summarycode.summarizer:ScanSummaryWithDetails
-    summary-key-files = summarycode.summarizer:ScanKeyFilesSummary
-    summary-by-facet = summarycode.summarizer:ScanByFacetSummary
+    tallies = summarycode.tallies:Tallies
+    tallies-with-details = summarycode.tallies:TalliesWithDetails
+    tallies-key-files = summarycode.tallies:KeyFilesTallies
+    tallies-by-facet = summarycode.tallies:FacetTallies
     license-clarity-score = summarycode.score:LicenseClarityScore
     license-policy = licensedcode.plugin_license_policy:LicensePolicy
     mark-source = scancode.plugin_mark_source:MarkSource
-    classify-package = summarycode.classify:PackageTopAndKeyFilesTagger
     is-license-text = licensedcode.plugin_license_text:IsLicenseText
     filter-clues = cluecode.plugin_filter_clues:RedundantCluesFilter
     consolidate = summarycode.plugin_consolidate:Consolidator

setup.cfg

@@ -70,6 +70,7 @@ install_requires =
     click >= 6.7, !=7.0
     colorama >= 0.3.9
     commoncode >= 30.1.1
+    container-inspector >= 30.0.0
     debian-inspector >= 30.0.0
     dparse2 >= 0.6.0
     fasteners
@@ -184,7 +185,6 @@ scancode_post_scan =
     license-clarity-score = summarycode.score:LicenseClarityScore
     license-policy = licensedcode.plugin_license_policy:LicensePolicy
     mark-source = scancode.plugin_mark_source:MarkSource
-    classify-package = summarycode.classify:PackageTopAndKeyFilesTagger
     is-license-text = licensedcode.plugin_license_text:IsLicenseText
     filter-clues = cluecode.plugin_filter_clues:RedundantCluesFilter
     consolidate = summarycode.plugin_consolidate:Consolidator

src/packagedcode/distro.py

@@ -0,0 +1,66 @@
+#
+# Copyright (c) nexB Inc. and others. All rights reserved.
+# ScanCode is a trademark of nexB Inc.
+# SPDX-License-Identifier: Apache-2.0
+# 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.
+#
+
+from container_inspector.distro import Distro
+
+from packagedcode import models
+from packagedcode import utils
+
+"""
+Check for files to determine the Linux distro or operating system of a codebase.
+"""
+
+
+class EtcOsReleaseHandler(models.NonAssemblableDatafileHandler):
+    datasource_id = 'etc_os_release'
+    default_package_type = 'linux-distro'
+    path_patterns = ('*etc/os-release', '*usr/lib/os-release',)
+    description = 'Linux OS release metadata file'
+    documentation_url = 'https://www.freedesktop.org/software/systemd/man/os-release.html'
+
+    @classmethod
+    def parse(cls, location):
+        distro = Distro.from_os_release_file(location)
+        distro_identifier = distro.identifier
+        pretty_name = distro.pretty_name and distro.pretty_name.lower() or ''
+
+        if distro_identifier == 'debian':
+            namespace = 'debian'
+
+            if 'distroless' in pretty_name:
+                name = 'distroless'
+            elif pretty_name.startswith('debian'):
+                name = 'distroless'
+
+        elif distro_identifier == 'ubuntu' and distro.id_like == 'debian':
+            namespace = 'debian'
+            name = 'ubuntu'
+        else:
+            namespace = distro_identifier
+            name = 'ubuntu'
+
+        version = distro.version_id
+
+        yield models.PackageData(
+            datasource_id=cls.datasource_id,
+            type=cls.default_package_type,
+            namespace=namespace,
+            name=name,
+            version=version,
+        )
+
+    @classmethod
+    def find_linux_rootfs_root_resource(cls, resource, codebase):
+        """
+        Given a ``codebase`` ``resource`` for an "os-release" file, return the
+        resource for the root directory of this filesystem or None.
+        """
+        paths = ('etc/os-release', 'usr/lib/os-release',)
+        return utils.find_root_from_paths(paths, resource, codebase)
+