Merge lp:~stevanr/linaro-license-protection/combined-build-info-files into lp:~linaro-automation/linaro-license-protection/trunk

[Stevan Radaković]

Add combined BUILD-INFO support.

[James Tunnicliffe (dooferlad)]

Looks good.

[James Tunnicliffe (dooferlad)]

Looks good. Now with the approve tag :-)

review: Approve

=== modified file 'license_protected_downloads/buildinfo.py'
--- license_protected_downloads/buildinfo.py	2013-02-26 08:38:32 +0000
+++ license_protected_downloads/buildinfo.py	2013-04-19 12:21:29 +0000
@@ -173,6 +173,21 @@
             for index in open_type:
                 self.file_info_array.pop(index)
 
+    @classmethod
+    def write_from_array(cls, build_info_array, file_path):
+        with open(file_path, "w") as outfile:
+            outfile.write("Format-Version: 0.1\n\n")
+            for key in build_info_array[0]:
+                if key != "format-version":
+                    outfile.write("Files-Pattern: %s\n" % key)
+                    for item in build_info_array[0][key][0]:
+                        text = build_info_array[0][key][0][item]
+                        if item == "license-text":
+                            text = text.replace("\n", "\n ")
+                        outfile.write("%s: %s\n" % (item, text))
+                    outfile.write("\n")
+
+
 if __name__ == "__main__":
     import sys
     bi = BuildInfo(sys.argv[1])

=== added file 'license_protected_downloads/splice_build_infos.py'
--- license_protected_downloads/splice_build_infos.py	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/splice_build_infos.py	2013-04-19 12:21:29 +0000
@@ -0,0 +1,49 @@
+import os
+
+from buildinfo import BuildInfo
+
+IGNORED_FILES = ["BUILD-INFO.txt", "EULA.txt", "OPEN-EULA.txt"]
+
+
+class SpliceBuildInfos:
+
+    def __init__(self, build_info_paths):
+        """Initiates a splice build info object.
+
+        :param build_info_paths: list of dir paths containing
+        the BUILD-INFO.txt files.
+        """
+        self.build_infos = []
+        for build_info_path in build_info_paths:
+            for path, subdirs, files in os.walk(build_info_path):
+                for filename in files:
+                    if path == build_info_path:
+                        if filename not in IGNORED_FILES:
+                            self.build_infos.append(
+                                BuildInfo(os.path.join(path, filename)))
+
+    def splice(self, build_info_path):
+
+        build_info_res = {}
+        for build_info in self.build_infos:
+            build_info_res[build_info.fname] = build_info.file_info_array
+
+        build_info_res = self.merge_duplicates(build_info_res)
+        BuildInfo.write_from_array(build_info_res, build_info_path)
+
+    @classmethod
+    def merge_duplicates(cls, build_info_dict):
+        build_info_res = {}
+        for key in build_info_dict:
+            if build_info_dict[key] in build_info_res.values():
+                found_key = [name for name, value in
+                             build_info_res.iteritems()
+                             if value == build_info_dict[key]][0]
+                if key != found_key:
+                    new_key = "%s, %s" % (found_key, key)
+                    build_info_res[new_key] = build_info_dict[key]
+                    del build_info_res[found_key]
+            else:
+                build_info_res[key] = build_info_dict[key]
+
+        return build_info_res

=== modified file 'license_protected_downloads/tests/__init__.py'
--- license_protected_downloads/tests/__init__.py	2012-11-28 12:30:30 +0000
+++ license_protected_downloads/tests/__init__.py	2013-04-19 12:21:29 +0000
@@ -2,6 +2,8 @@
     BuildInfoTests,
     FileNameMatchingTests,
     )
+from license_protected_downloads.tests.test_splicebuildinfos \
+  import SpliceBuildInfosTests
 from license_protected_downloads.tests.test_models import LicenseTestCase
 from license_protected_downloads.tests.test_pep8 import TestPep8
 from license_protected_downloads.tests.test_pyflakes import TestPyflakes
@@ -19,6 +21,7 @@
 #starts the test suite
 __test__ = {
     'BuildInfoTests': BuildInfoTests,
+    'SpliceBuildInfosTests': SpliceBuildInfosTests,
     'FileNameMatchingTests': FileNameMatchingTests,
     'FileViewTests': FileViewTests,
     'HowtoViewTests': HowtoViewTests,

=== modified file 'license_protected_downloads/tests/test_buildinfo.py'
--- license_protected_downloads/tests/test_buildinfo.py	2013-02-26 08:38:32 +0000
+++ license_protected_downloads/tests/test_buildinfo.py	2013-04-19 12:21:29 +0000
@@ -286,6 +286,15 @@
 
         self.assertEquals(build_info.file_info_array, [{}])
 
+    def test_write_from_array(self):
+        build_info = BuildInfo(self.buildinfo_file_path)
+        file_path = THIS_DIRECTORY + \
+            '/testserver_root/build-info/write-test/BUILD-INFO.txt'
+        BuildInfo.write_from_array(build_info.build_info_array, file_path)
+        build_info_test = BuildInfo(file_path)
+        self.assertEquals(build_info_test.build_info_array,
+                          build_info.build_info_array)
+
 
 class FileNameMatchingTests(unittest.TestCase):
     def test_buildinfo_simple_filename(self):

=== added file 'license_protected_downloads/tests/test_splicebuildinfos.py'
--- license_protected_downloads/tests/test_splicebuildinfos.py	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/test_splicebuildinfos.py	2013-04-19 12:21:29 +0000
@@ -0,0 +1,35 @@
+_author__ = 'stevanr'
+
+import os
+import unittest
+from license_protected_downloads.splice_build_infos import SpliceBuildInfos
+
+THIS_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
+
+
+class SpliceBuildInfosTests(unittest.TestCase):
+    def setUp(self):
+        dir_path1 = THIS_DIRECTORY + \
+          '/testserver_root/build-info/splice-build-info/build-info-open'
+        dir_path2 = THIS_DIRECTORY + \
+          '/testserver_root/build-info/splice-build-info/build-info-protected'
+        self.splice_build_infos = SpliceBuildInfos([dir_path1, dir_path2])
+
+    def test_merge_duplicates(self):
+        build_info_dict = {
+            'test-protected.txt':
+            [{'license-type': 'protected',
+              'build-name': 'landing-protected',
+              'openid-launchpad-teams': 'linaro'}],
+            'test-protected-2.txt':
+            [{'license-type': 'protected',
+              'build-name': 'landing-protected',
+              'openid-launchpad-teams': 'linaro'}]}
+
+        result = {'test-protected.txt, test-protected-2.txt':
+                  [{'license-type': 'protected',
+                    'build-name': 'landing-protected',
+                    'openid-launchpad-teams': 'linaro'}]}
+
+        build_info_res = SpliceBuildInfos.merge_duplicates(build_info_dict)
+        self.assertEquals(build_info_res, result)

=== added directory 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info'
=== added directory 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-open'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-open/BUILD-INFO.txt'
--- license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-open/BUILD-INFO.txt	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-open/BUILD-INFO.txt	2013-04-19 12:21:29 +0000
@@ -0,0 +1,6 @@
+Format-Version: 0.1
+
+
+Files-Pattern: *.txt
+Build-Name: landing-open
+License-Type: open

=== added file 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-open/testfile.txt'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-open/testfile2.txt'
=== added directory 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-protected'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-protected/BUILD-INFO.txt'
--- license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-protected/BUILD-INFO.txt	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-protected/BUILD-INFO.txt	2013-04-19 12:21:29 +0000
@@ -0,0 +1,7 @@
+Format-Version: 0.1
+
+
+Files-Pattern: *, *.txt
+Build-Name: landing-protected
+License-Type: protected
+OpenID-Launchpad-Teams: linaro

=== added file 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-protected/test-protected-2.txt'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/splice-build-info/build-info-protected/test-protected.txt'
=== added directory 'license_protected_downloads/tests/testserver_root/build-info/write-test'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/write-test/BUILD-INFO.txt'
--- license_protected_downloads/tests/testserver_root/build-info/write-test/BUILD-INFO.txt	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/testserver_root/build-info/write-test/BUILD-INFO.txt	2013-04-19 12:21:29 +0000
@@ -0,0 +1,42 @@
+Format-Version: 0.1
+
+Files-Pattern: *openid*
+license-type: protected
+build-name: landing-protected
+openid-launchpad-teams: linaro
+
+Files-Pattern: *panda*
+license-type: open
+build-name: landing-panda
+
+Files-Pattern: *.txt
+license-type: protected
+build-name: landing-protected
+openid-launchpad-teams: 
+theme: stericsson
+collect-user-data: yes
+license-text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+   THIS IS A LEGALLY BINDING AGREEMENT
+ </p>
+
+Files-Pattern: *origen*
+theme: samsung
+license-type: protected
+build-name: landing-origen
+license-text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+  THIS IS A LEGALLY BINDING AGREEMENT BETWEEN YOU, an individual or a
+  legal entity, (“LICENSEE”) AND HAL 1000.
+ </p>
+
+Files-Pattern: *snowball*
+theme: stericsson
+license-type: protected
+build-name: landing-snowball
+license-text: <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
+ <p>
+  THIS IS A LEGALLY BINDING AGREEMENT BETWEEN YOU, an individual or a
+  legal entity, (“LICENSEE”) AND ME, THE TEST SERVER.
+ </p>
+