Merge lp:~matiasb/pkgme-service/frameworks-from-manifest into lp:pkgme-service

[Matias Bordese]

Updated click job to add support for multiple frameworks data from manifest.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'src/djpkgme/tasks.py'
--- src/djpkgme/tasks.py	2014-03-26 12:59:09 +0000
+++ src/djpkgme/tasks.py	2014-04-08 15:33:10 +0000
@@ -385,6 +385,11 @@
             architecture = manifest['architecture']
             if isinstance(architecture, basestring):
                 manifest['architecture'] = [architecture]
+
+        if 'framework' in manifest:
+            frameworks = manifest['framework'].split(',')
+            manifest['framework'] = [f.strip() for f in frameworks]
+
         if 'icon' in manifest:
             manifest['icon'] = self.get_package_icon(package, manifest,
                                                      logger)

=== modified file 'src/djpkgme/tests/test_tasks.py'
--- src/djpkgme/tests/test_tasks.py	2014-03-26 12:59:09 +0000
+++ src/djpkgme/tests/test_tasks.py	2014-04-08 15:33:10 +0000
@@ -956,6 +956,39 @@
         self.assertEqual(set(info['architecture']),
                          set(['armhf', 'amd64']))
 
+    def test_get_package_info_with_no_framework_in_manifest(self):
+        mock_logger = Mock()
+        job = ClickPackageInfoJob()
+        package_name = 'some.package'
+        tempdir = self.useFixture(TempDir()).path
+        self.make_manifest_file(
+            dict(name=package_name, architecture='armhf'), tempdir)
+        info = job.get_package_info(tempdir, mock_logger)
+        self.assertNotIn('framework', info)
+
+    def test_get_package_info_with_single_framework_in_manifest(self):
+        mock_logger = Mock()
+        job = ClickPackageInfoJob()
+        package_name = 'some.package'
+        tempdir = self.useFixture(TempDir()).path
+        self.make_manifest_file(
+            dict(name=package_name, architecture='armhf',
+                 framework='ubuntu-sdk-13.10'), tempdir)
+        info = job.get_package_info(tempdir, mock_logger)
+        self.assertEqual(info['framework'], ['ubuntu-sdk-13.10'])
+
+    def test_get_package_info_with_multiple_frameworks_in_manifest(self):
+        mock_logger = Mock()
+        job = ClickPackageInfoJob()
+        package_name = 'some.package'
+        tempdir = self.useFixture(TempDir()).path
+        self.make_manifest_file(
+            dict(name=package_name, architecture='armhf',
+                 framework='ubuntu-sdk-13.10, ubuntu-sdk-14.04'), tempdir)
+        info = job.get_package_info(tempdir, mock_logger)
+        self.assertEqual(set(info['framework']),
+                         set(['ubuntu-sdk-13.10', 'ubuntu-sdk-14.04']))
+
     @patch('djpkgme.tasks.subprocess.check_output')
     @patch('djpkgme.tasks.ClickPackageInfoJob.download_package')
     @patch('djpkgme.tasks.TempDir')