Merge pull request #2838 from nexB/1816-spdx-filecontributor

Detect SPDX-FileContributor tags as authors

Author: pombredanne

src/cluecode/copyrights.py

@@ -639,6 +639,9 @@ def build_detection_from_node(
     # SPDX-FileCopyrightText as defined by the FSFE Reuse project
     (r'^[Ss][Pp][Dd][Xx]-[Ff]ile[Cc]opyright[Tt]ext', 'COPY'),
 
+    # SPDX-FileContributor as defined in SPDX and seen used in KDE
+    (r'^[Ss][Pp][Dd][Xx]-[Ff]ile[Cc]ontributor', 'SPDX-CONTRIB'),
+
     ############################################################################
     # ALL Rights Reserved.
     ############################################################################
@@ -2566,6 +2569,9 @@ def build_detection_from_node(
 # Authors
 #######################################
 
+    # SPDX-FileContributor special case
+    AUTHOR: {<SPDX-CONTRIB> <CCOMPANY|NAME|NAME-EMAIL|NAME-YEAR|EMAIL> <COMPANY|NAME|NAME-EMAIL|NAME-YEAR|EMAIL|NN>? }        #264000
+
     # developed by Project Mayo.
     AUTHOR: {<AUTH2>+ <BY> <COMPANY> <NNP>}        #2645-1
 
@@ -2923,6 +2929,7 @@ def refine_names(s, prefixes):
         'authors,',
         'authorship',
         'or',
+        'spdx-filecontributor',
     ])
 ))
 

src/cluecode/copyrights_hint.py

@@ -61,6 +61,7 @@
     'right',
     'reserv',
     'auth',
+    'filecontributor',
     'devel',
     '<s>',
     '</s>',

tests/cluecode/data/copyrights/spdx-copy-contrib.txt

@@ -0,0 +1,4 @@
+ * SPDX-FileCopyrightText: 2008 Red Hat Inc.
+ * SPDX-FileContributor: Adam Jackson <ajax@redhat.com>
+ * SPDX-FileContributor: Bill Nottingham <notting@redhat.com>
+ * SPDX-FileContributor: Ray Strode <rstrode@redhat.com>

tests/cluecode/data/copyrights/spdx-copy-contrib.txt.yml

@@ -0,0 +1,14 @@
+what:
+  - copyrights
+  - holders
+  - authors
+
+copyrights:
+    - Copyright 2008 Red Hat Inc.
+holders:
+    - Red Hat Inc.
+authors:
+    - Adam Jackson <ajax@redhat.com>
+    - Bill Nottingham <notting@redhat.com>
+    - Ray Strode <rstrode@redhat.com>
+