release.py: use dateutil's parser

[empathy.git] / release.py

diff --git a/release.py b/release.py
index c7b773363d98c3fac6fc31b2623aee7f8911c420..59919e8f910d33275be1ece4e8815e6fe96c93be 100755 (executable)
--- a/release.py
+++ b/release.py
@@ -1,16 +1,14 @@
 #!/usr/bin/env python
 
 import os
-import re
 import urllib
 import csv
 import datetime
-import time
 from string import Template
 from optparse import OptionParser
+import dateutil.parser
 
-last_tag_patern = 'EMPATHY_2_27*'
-username = 'xclaesse'
+last_tag_pattern = 'EMPATHY_3_10*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
@@ -68,7 +66,7 @@ class Project:
                        version_dir = self.package_version[:second]
                self.package_dl_url = 'http://download.gnome.org/sources/%s/%s/' % (self.package_name.lower(), 
                                                                                    version_dir)
-               tags_str = self.exec_cmd('git tag -l %s' % (last_tag_patern))
+               tags_str = self.exec_cmd('git tag -l %s' % (last_tag_pattern))
                tags = tags_str.splitlines()
                self.last_tag = tags[len(tags)-1]
 
@@ -89,12 +87,9 @@ class Project:
        def get_md5sums(self):
                md5sums = ''
 
-               cmd = 'md5sum %s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+               cmd = 'md5sum %s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
                md5sums += self.exec_cmd(cmd)
 
-               cmd = 'md5sum %s-%s.tar.bz2' % (self.package_name.lower(), self.package_version)
-               md5sums += self.exec_cmd(cmd).strip()
-
                return md5sums
 
        def get_bugzilla_info(self):
@@ -110,10 +105,10 @@ class Project:
                end = s.find(s2, i + 1)
                description = s[start:end]
 
-               s1 = "GNOME SVN"
+               s1 = "homepage"
                i = s.find(s1)
                s1 = "href"
-               i = s.find(s1, i)        
+               i = s.rfind(s1, 0, i)
                start = i + 6
                s2 = '">'
                end = s.find(s2, start)
@@ -162,9 +157,10 @@ class Project:
                return translations
 
        def get_bug_author(self, bug_number):
-               cmd = 'git log %s.. | grep -B 20 -E "(bug %s|#%s)"' \
+               cmd = 'git log %s.. | grep -B 20 -E \
+                     "(bug %s|#%s)|bugzilla.gnome.org/show_bug.cgi\?id=%s"' \
                      ' | tac | grep ^Author: | head -1' \
-                     % (self.last_tag, bug_number, bug_number)
+                     % (self.last_tag, bug_number, bug_number, bug_number)
                line = self.exec_cmd (cmd)
                p1 = line.find(" ")
                p2 = line.find("<")
@@ -175,9 +171,9 @@ class Project:
                commit_str = self.exec_cmd('git show %s' % (self.last_tag))
                for line in commit_str.splitlines():
                        if line.startswith('Date:'):
-                               time_str = line[5:line.rfind('+')].strip()
-                               t = time.strptime(time_str)
-                               last_tag_date = time.strftime('%Y-%m-%d', t)
+                               time_str = line[5:]
+                               t = dateutil.parser.parse(time_str)
+                               last_tag_date = t.strftime('%Y-%m-%d')
                                break
 
                query = 'http://bugzilla.gnome.org/buglist.cgi?' \
@@ -220,7 +216,10 @@ class Project:
                        " - Updated %s Documentation translation (%s)\n")
                bugs = self.get_bugs()
 
-               news = 'NEW in '+ self.package_version + '\n==============\n'
+               news = 'NEW in '+ self.package_version
+               line = '=' * len(news)
+               today = datetime.date.today()
+               news += ' (%s)\n%s\n' % (today.strftime('%d/%m/%Y'),line)
                if bugs != '':
                        news += 'Bugs fixed:\n' + bugs + '\n'
                if translations != '':
@@ -246,8 +245,17 @@ class Project:
                          self.package_version.replace('.', '_')
                self.exec_cmd('git tag -m "Tagged for release %s." %s' % ( self.package_version, new_tag))
 
+       def _get_username(self):
+               username = os.environ.get('GNOME_ACCOUNT_NAME')
+               if username is not None:
+                       return username
+                       
+               return os.getlogin()
+               
+
        def upload_tarball(self):
-               tarball = '%s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+               username = self._get_username()
+               tarball = '%s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
 
                cmd = 'scp %s %s@%s:' % (tarball, username, upload_server)
                self.exec_cmd(cmd)
@@ -257,6 +265,7 @@ class Project:
 
        def send_email(self):
                notes = self.get_release_notes()
+                print notes
                cmd = 'xdg-email ' \
                      ' --cc telepathy@lists.freedesktop.org' \
                      ' --subject "ANNOUNCE: Empathy %s"' \