Merge lp:~jml/pkgme-service/set-debemail into lp:pkgme-service

[Jonathan Lange]

Set the DEBEMAIL based on a configuration setting.

This branch adds a config field called PKGME_MAINTAINER_EMAIL and uses that config field to set the DEBEMAIL environment variable while pkgme is running.

This in turn causes pkgme to use PKGME_MAINTAINER_EMAIL as the value of the maintainer field in the changelog entry that it creates. Of course, this relies on https://code.launchpad.net/~jml/pkgme/default-maintainer/+merge/99299 to actually work.

I haven't updated any configs because I'm not exactly sure which ones to update. We'll want to set the production value to the email address of https://launchpad.net/~ca-pkgme-service-bot, which a full name like "pkgme-service production bot" or something. I guess it would be nice to use a different email address in development environments.

[James Westby (james-w)]

Hi,

I think I would have done this using the devportal-metadata.json as I find
environment variables to be a little distasteful, but I have no problem with
merging this.

Given that this assumes that the setting is set, I would add it to the main.cfg
so it is always set to start with. I think it has to be added to the configglue
schema as well.

Thanks,

James

review: Approve

Unmerged revisions

80. By Jonathan Lange on 2012-03-26

Add a setting PKGME_MAINTAINER_EMAIL and use that to set the maintainer
for packages made by pkgme.

=== modified file 'django_project/schema.py'
--- django_project/schema.py	2012-02-28 19:09:58 +0000
+++ django_project/schema.py	2012-03-26 13:01:20 +0000
@@ -28,6 +28,7 @@
         myapps_token = schema.StringOption()
         myapps_token_secret = schema.StringOption()
         myapps_base_url = schema.StringOption()
+        pkgme_maintainer_email = schema.StringOption()
         pkgme_output_directory = schema.StringOption()
         pkgme_output_url = schema.StringOption()
         extra_installed_apps = schema.ListOption(item=schema.StringOption())

=== modified file 'src/djpkgme/tasks.py'
--- src/djpkgme/tasks.py	2012-03-12 16:35:10 +0000
+++ src/djpkgme/tasks.py	2012-03-26 13:01:20 +0000
@@ -26,6 +26,7 @@
     download_file,
     )
 from fixtures import (
+    EnvironmentVariableFixture,
     TempDir,
     )
 from pkgme import write_packaging
@@ -343,8 +344,11 @@
             working_path = self.prepare_file(download_path, output_dir)
             metadata_filename = self.write_metadata(metadata, working_path)
             # Run pkgme: generate the packaging and build a source package.
-            write_packaging(
-                working_path, allowed_backend_names=ALLOWED_BACKEND_NAMES)
+            debemail = settings.PKGME_MAINTAINER_EMAIL
+            with EnvironmentVariableFixture('DEBEMAIL', debemail):
+                write_packaging(
+                    working_path,
+                    allowed_backend_names=ALLOWED_BACKEND_NAMES)
             # XXX: This duplicates work done by write_packaging. However, we
             # need the package_name in order to create the tarball in a way
             # that looks good.

=== modified file 'src/djpkgme/tests/test_integration.py'
--- src/djpkgme/tests/test_integration.py	2012-03-05 11:07:58 +0000
+++ src/djpkgme/tests/test_integration.py	2012-03-26 13:01:20 +0000
@@ -15,7 +15,6 @@
     TempDir,
     )
 from pkgme.run_script import ScriptFailed
-from testtools import run_test_with
 from testtools.content import (
     Content,
     text_content,

=== modified file 'src/djpkgme/tests/test_tasks.py'
--- src/djpkgme/tests/test_tasks.py	2012-03-12 14:33:13 +0000
+++ src/djpkgme/tests/test_tasks.py	2012-03-26 13:01:20 +0000
@@ -8,6 +8,10 @@
 import tarfile
 import traceback
 
+# In lucid, python-debian exports its package as 'debian_bundle'.
+from testtools import try_imports
+changelog = try_imports(['debian.changelog', 'debian_bundle.changelog'])
+
 from devportalbinary.metadata import MetadataBackend
 from django.conf import settings
 from fixtures import TempDir
@@ -626,3 +630,29 @@
         basename = os.path.basename(output_tar_path)
         cleaned_package_name = PackageName.clean(name)
         self.assertEqual("%s.tar.gz" % cleaned_package_name, basename)
+
+    def test_uses_pkgme_maintainer_email(self):
+        unpack_dir = self.useFixture(TempDir()).path
+        metadata = self.factory.make_metadata()
+        debemail = 'Dude <[e-mail]>'
+        with patch_settings(PKGME_MAINTAINER_EMAIL=debemail):
+            output_tar_path = self.run_task(
+                metadata, self.factory.make_packagable_tarball())
+        output_tar = tarfile.open(output_tar_path, 'r:gz')
+        try:
+            output_tar.extractall(unpack_dir)
+        finally:
+            output_tar.close()
+        package_name = metadata['package_name']
+        package_tarball_path = os.path.join(
+            unpack_dir, '%s_0.tar.gz' % (package_name,))
+        t = tarfile.open(package_tarball_path)
+        try:
+            t.extractall(unpack_dir)
+        finally:
+            t.close()
+        debian_dir = os.path.join(unpack_dir, package_name, 'debian')
+        changelog_path = os.path.join(debian_dir, 'changelog')
+        cl = changelog.Changelog(open(changelog_path).read())
+        [change_block] = list(cl)
+        self.assertEqual(debemail, change_block.author)