Add code to deal with raiagent overlay

scripts/powerline-release.py

@@ -5,8 +5,17 @@ from __future__ import (unicode_literals, division, absolute_import, print_funct
 import argparse
 import codecs
 import os
+import shutil
 
 from subprocess import check_output, check_call
+from getpass import getpass
+
+from github import Github
+
+
+OVERLAY_NAME = 'raiagent'
+OVERLAY = 'leycec/' + OVERLAY_NAME
+OVERLAY_BRANCH_FORMAT = 'powerline-release-{0}'
 
 
 def parse_version(s):
@@ -39,7 +48,7 @@ def parse_version(s):
 		return tuple(map(int, s.split('.')))
 
 
-def merge(version_string, rev):
+def merge(version_string, rev, **kwargs):
 	check_call(['git', 'checkout', 'master'])
 	check_call(['git', 'merge', '--no-ff', '--no-commit', '--log', rev])
 
@@ -60,36 +69,96 @@ def merge(version_string, rev):
 	check_call(['git', 'tag', '-m', 'Release ' + version_string, '-a', version_string])
 
 
-def push(version_string, rev):
+def push(version_string, **kwargs):
 	check_call(['git', 'push', 'upstream', 'master'])
 	check_call(['git', 'push', 'upstream', version_string])
 
 
-def upload(*args):
+def upload(**args):
 	check_call(['python', 'setup.py', 'sdist', 'upload'])
 	check_call(['python', 'setup.py', 'upload_docs'])
 
 
+gh = None
+
+
+def get_gh(user, password):
+	global gh
+	if not gh:
+		gh = Github(user, password)
+	return gh
+
+
+def create_ebuilds(version_string, overlay, user, **kwargs):
+	overlay_url = 'git://github.com/' + OVERLAY
+	if not os.path.isdir(overlay):
+		check_call(['git', 'clone', overlay_url, overlay])
+	check_call(['git', 'checkout', 'master'], cwd=overlay)
+	check_call(['git', 'pull', '--ff-only', overlay_url, 'master'], cwd=overlay)
+	branch = OVERLAY_BRANCH_FORMAT.format(version_string)
+	check_call(['git', 'branch', branch], cwd=overlay)
+	check_call(['git', 'checkout', branch], cwd=overlay)
+	new_files = []
+	for category, pn in (
+		('app-misc', 'powerline'),
+		('app-vim', 'powerline-python'),
+	):
+		pdir = os.path.join(overlay, category, pn)
+		v1_0 = os.path.join(pdir, '{0}-1.0.ebuild'.format(pn))
+		vcur = os.path.join(pdir, '{0}-{1}.ebuild'.format(pn, version_string))
+		shutil.copy2(v1_0, vcur)
+		check_call(['git', 'add', vcur], cwd=overlay)
+		new_files.append(vcur)
+	check_call(['git', 'commit'] + new_files + ['-m', 'powerline*: Release {0}'.format(version_string)],
+	           cwd=overlay)
+	check_call(['git', 'push', 'git@github.com:{0}/{1}'.format(user, OVERLAY_NAME), branch], cwd=overlay)
+
+
+def update_overlay(version_string, user, password, **kwargs):
+	gh = get_gh(user, password)
+	overlay = gh.get_repo(OVERLAY)
+	overlay.create_pull(
+		title='New powerline version: ' + version_string,
+		body='Add ebuilds for new powerline version\n\n---\n\nCreated automatically by release script',
+		base='master',
+		head=user + ':' + OVERLAY_BRANCH_FORMAT.format(version_string),
+	)
+
+
 stages = (
 	('merge', merge),
 	('push', push),
 	('upload', upload),
+	('create_ebuilds', create_ebuilds),
+	('update_overlay', update_overlay),
 )
 
 
-def create_release(version, rev, run_stages=None):
+def create_release(version, user, password=None, run_stages=None, **kwargs):
 	version_string = '.'.join((str(v) for v in version))
+	if not password:
+		password = getpass('Password for {0}: '.format(user))
 	for stname, stfunc in stages:
 		if run_stages is None or stname in run_stages:
-			stfunc(version_string, rev)
+			stfunc(version_string=version_string, user=user, password=password, **kwargs)
 
 
 p = argparse.ArgumentParser(description='Powerline release script')
-p.add_argument('-v', '--version', type=parse_version, metavar='VERSION', help='Use given version for the release. If version contains only `+\' signs then it will increase latest version number: one `+\' increases major version number (e.g. 1.2.3 -> 2.0), `++\' increases minor version number (e.g. 1.2.3 -> 1.3), `+++\' increases patch level (e.g. 1.2.3 -> 1.2.4). Defaults to `+++\'', default='+++')
+p.add_argument('-u', '--user', type=str, metavar='USER', help='Github username.', required=True)
+p.add_argument('-v', '--version', type=parse_version, metavar='VERSION', help='Use given version for the release. If version contains only `+\' signs then it will increase latest version number: one `+\' increases major version number (e.g. 1.2.3 -> 2.0), `++\' increases minor version number (e.g. 1.2.3 -> 1.3), `+++\' increases patch level (e.g. 1.2.3 -> 1.2.4). Defaults to `+++\'.', default='+++')
 p.add_argument('-r', '--rev', metavar='COMMIT', help='Use given revision for the release. Defaults to `develop\'.', default='develop')
 p.add_argument('-s', '--stages', action='append', metavar='STAGE', help='Only run one of the given stages (default to all).', choices=tuple((stname for stname, stfunc in stages)))
+p.add_argument('-p', '--password', type=str, metavar='PASS', help='Github password. You will be prompted if it is not supplied.')
+p.add_argument('-o', '--overlay', type=str, metavar='PATH', help='Location of the local clone of the {0} overlay. If provided directory does not exist it will be created by “git clone”. Defaults to /tmp/powerline-{0}.'.format(OVERLAY_NAME), default='/tmp/powerline-' + OVERLAY_NAME)
 
 
 if __name__ == '__main__':
 	args = p.parse_args()
-	create_release(args.version, args.rev, args.stages)
+	create_release(
+		version=args.version,
+		rev=args.rev,
+		user=args.user,
+		password=args.password,
+		overlay=args.overlay,
+		run_stages=args.stages,
+	)