Merge remote-tracking branch 'origin/22_collect_redistributable_src'

into develop

Author: chinyeungli

docs/CHANGELOG.rst

@@ -5,6 +5,7 @@
     * Fixed #443 and #444 issue with multiple licenses/license_files
     * Fixed #442 no special characters allowed for `license_key`, `license_name` and `license_expression`
     * Fixed #446 Better error handling
+    * Add support to collect redistributable sources #22
 
 2020-08-11
     Release 5.0.0

tests/test_util.py

@@ -628,3 +628,37 @@ def test_copy_license_notice_files(self):
         assert len(licenses) == len(copied_files)
         for license in licenses:
             assert license in copied_files
+
+    def test_copy_file(self):
+        des = get_temp_dir()
+        test_file = get_test_loc('test_util/licenses/mit.LICENSE')
+        licenses = ['mit.LICENSE']
+        err = util.copy_file(test_file, des)
+        from os import listdir
+        copied_files = listdir(des)
+        assert len(licenses) == len(copied_files)
+        assert err == []
+        for license in licenses:
+            assert license in copied_files
+
+    def test_copy_file_with_dir(self):
+        des = get_temp_dir()
+        test_dir = get_test_loc('test_util/licenses/')
+        licenses = ['mit.LICENSE', 'mit2.LICENSE', 'public-domain.LICENSE']
+        err = util.copy_file(test_dir, des)
+        assert err == []
+
+        import os
+        files_list = []
+        dir_list = []
+        # Get the directories and files in the 'des' recursively
+        for root, dir, files in os.walk(des):
+            for d in dir:
+                dir_list.append(d)
+            for f in files:
+                files_list.append(f)
+
+        #assert dir_list == [u'licenses']
+        assert len(licenses) == len(files_list)
+        for license in licenses:
+            assert license in files_list

tests/testdata/test_cmd/help/about_help.txt

@@ -13,9 +13,12 @@ Options:
   -h, --help  Show this message and exit.
 
 Commands:
-  attrib     Generate an attribution document from .ABOUT files.
-  check      Validate that the format of .ABOUT files is correct and report
-             errors and warnings.
-  gen        Generate .ABOUT files from an inventory as CSV or JSON.
-  inventory  Collect the inventory of .ABOUT files to a CSV or JSON file.
-  transform  Transform a CSV/JSON by applying renamings, filters and checks.
+  attrib              Generate an attribution document from .ABOUT files.
+  check               Validate that the format of .ABOUT files is correct and
+                      report errors and warnings.
+  collect_redist_src  Collect redistributable sources.
+  gen                 Generate .ABOUT files from an inventory as CSV or JSON.
+  inventory           Collect the inventory of .ABOUT files to a CSV or JSON
+                      file.
+  transform           Transform a CSV/JSON by applying renamings, filters and
+                      checks.

tests/testdata/test_model/redistribution/test/subdir/test.ABOUT

@@ -0,0 +1,3 @@
+about_resource: .
+name: test
+redistribute: x

tests/testdata/test_model/redistribution/test/subdir/test.c

@@ -0,0 +1,4 @@
+about_resource: this.c
+version: 0.11.0
+name: this.c
+redistribute: x

tests/testdata/test_model/redistribution/this.ABOUT

@@ -0,0 +1,4 @@
+about_resource: this2.c
+name: this2.c
+version: 0.11.0
+redistribute: N