Merge pull request #2433 from nexB/2432-reuse-copyrights

Detect copyrights in reuse-compliant code #2432

Author: pombredanne

src/cluecode/copyrights.py

@@ -411,6 +411,9 @@ def as_str(cls, node, ignores=frozenset(), include_allrights=False):
     (r'^AssemblyCopyright.?$', 'COPY'),
     (r'^AppCopyright?$', 'COPY'),
 
+    # SPDX-FileCopyrightText as defined by the FSFE Reuse project
+    (r'^[Ss][Pp][Dd][Xx]-[Ff]ile[Cc]opyright[Tt]ext', 'COPY'),
+
     ############################################################################
     # ALL Rights Reserved.
     ############################################################################
@@ -2722,6 +2725,7 @@ def refine_names(s, prefixes):
 
 
 def remove_dupe_copyright_words(c):
+    c = c.replace('SPDX-FileCopyrightText', 'Copyright')
     # from .net assemblies
     c = c.replace('AssemblyCopyright', 'Copyright')
     c = c.replace('AppCopyright', 'Copyright')

tests/cluecode/data/copyrights/spdx-reuse.c

@@ -0,0 +1,5 @@
+/*
+ * SPDX-FileCopyrightText: 2019 Jane Doe <[email protected]>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */

tests/cluecode/data/copyrights/spdx-reuse.c.yml

@@ -0,0 +1,7 @@
+what:
+  - copyrights
+  - holders
+copyrights:
+  - Copyright 2019 Jane Doe <[email protected]>
+holders:
+  - Jane Doe