diff options
| -rwxr-xr-x | tools/export.py | 281 | ||||
| -rwxr-xr-x | tools/export2.py | 244 |
2 files changed, 207 insertions, 318 deletions
diff --git a/tools/export.py b/tools/export.py index 2885625d5..fa75686b6 100755 --- a/tools/export.py +++ b/tools/export.py @@ -1,12 +1,16 @@ #!/usr/bin/env python +# encoding: utf-8 """ -First attempt to make our export script more portable than export.sh +Second attempt to make our export script more portable than export.sh + """ import fileinput from subprocess import Popen, PIPE import sys +# This will need to be replaced with argsparse when we make a 2.7+/3.2+ version +import optparse # py3k compatibility try: @@ -14,22 +18,28 @@ try: except ImportError: from email.utils import formatdate +# In lieu of a config file +help_message = '''This script creates a tag in the Bcfg2 git repo and exports a tar file of the code +at that tag. + +This script must be run at the top of your git repository. +''' + + pkgname = 'bcfg2' ftphost = 'terra.mcs.anl.gov' ftpdir = '/mcs/ftp/pub/bcfg' -# py3k compatibility -try: - version = raw_input("Please enter the version you are tagging (e.g. 1.0.0): ") -except NameError: - version = input("Please enter the version you are tagging (e.g. 1.0.0): ") -tarname = '/tmp/%s-%s.tar.gz' % (pkgname, version) - def run(command): return Popen(command, shell=True, stdout=PIPE).communicate() -def find_and_replace(f, iftest, rline, startswith=False): - for line in fileinput.input(f, inplace=1): +def find_and_replace(f, iftest, rline, startswith=False, dryrun=False): + if dryrun: + inplace=0 + print "*** dry-run: New '%s' will look like this:" % f + else: + inplace=1 + for line in fileinput.input(f, inplace): if startswith: if line.startswith(iftest): line = line.replace(line, rline) @@ -38,74 +48,197 @@ def find_and_replace(f, iftest, rline, startswith=False): if iftest in line and line != "Version: %{version}\n": line = line.replace(line, rline) sys.stdout.write(line) + if dryrun: + print "*** End '%s'" % f -# update the version -majorver = version[:5] -minorver = version[5:] -# py3k compatibility -try: - name = raw_input("Your name: ") - email = raw_input("Your email: ") -except NameError: - name = input("Your name: ") - email = input("Your email: ") -newchangelog = \ +def main(argv=None): + # This is where the options are set up + p = optparse.OptionParser(description = help_message, + prog = 'export2.py', + version = '0.1', + usage = '%prog [-h|--help] [-v|--version] [-n|--dry-run] [-d|--debug]') + p.add_option('--verbose', '-v', + action = 'store_true', + help = 'turns on verbose mode', + default = False, + dest = 'verbose') + p.add_option('--dry-run', '-n', + action = 'store_true', + help = 'run in dry-run mode; no changes will be made to the system', + default = False, + dest = 'dryrun') + p.add_option('--debug', '-d', + action = 'store_true', + help = 'run in debun mode', + default = False, + dest = 'debug') + p.add_option('--paranoid', '-P', + action = 'store_true', + help = 'run in paranoid mode, make changes but do not commit to repository', + default = False, + dest = 'paranoid') + options, arguments = p.parse_args() + + if options.debug: + print options + print "What should debug mode do?" + + # py3k compatibility + try: + version = raw_input("Please enter the Bcfg2 version you are tagging (e.g. 1.0.0): ") + name = raw_input("Your name: ") + email = raw_input("Your email: ") + except NameError: + version = input("Please enter the Bcfg2 version you are tagging (e.g. 1.0.0): ") + name = input("Your name: ") + email = input("Your email: ") + + # parse version into Major.Minor.MicroBuild and validate + vkeys = ["major", "minor", "microbuild"] + try: + version_info = dict(zip(vkeys,version.split("."))) + if not version_info["major"].isdigit() or not version_info["minor"].isdigit(): + raise VersionError('isdigit() test failed') + except: + print """Version must be of the form Major.Minor.MicroBuild, +where Major and Minor are integers and +Micro is a single digit optionally followed by Build (i.e. pre##) +E.G. 1.2.0pre1 is a valid version. + """ + quit() + + version_info["micro"] = version_info["microbuild"][0:1] + version_info["build"] = version_info["microbuild"][1:] + version_release = "%s.%s.%s" % (version_info['major'], version_info['minor'], version_info['micro']) + + if options.debug: + print "version is %s" % version + print "version_info is %s" % version_info + print "version_release is %s" % version_release + + tarname = '/tmp/%s-%s.tar.gz' % (pkgname, version) + + newchangelog = \ """bcfg2 (%s%s-0.0) unstable; urgency=low * New upstream release -- %s <%s> %s -""" % (majorver, minorver, name, email, formatdate(localtime=True)) -# write out the new debian changelog -with open('debian/changelog', 'r+') as f: - old = f.read() - f.seek(0) - f.write(newchangelog + old) -f.close() -# Update redhat directory versions -with open('redhat/VERSION', 'w') as f: - f.write("%s\n" % majorver) -f.close() -with open('redhat/RELEASE', 'w') as f: - f.write("0.0%s\n" % minorver) -f.close() -# update solaris version -find_and_replace('solaris/Makefile', 'VERS=', - 'VERS=%s-1\n' % version, startswith=True) -find_and_replace('solaris/pkginfo.bcfg2', 'VERSION=', - 'VERSION="%s"\n' % version, startswith=True) -find_and_replace('solaris/pkginfo.bcfg2-server', 'VERSION=', - 'VERSION="%s"\n' % version, startswith=True) -# set new version in setup.py -find_and_replace('setup.py', 'version=', ' version="%s",\n' % version) -# replace version in misc/bcfg2.spec -find_and_replace('misc/bcfg2.spec', 'Version:', - 'Version: %s\n' % version) -# update the version in reports -find_and_replace('src/lib/Server/Reports/reports/templates/base.html', - 'Bcfg2 Version', ' <span>Bcfg2 Version %s</span>\n' % version) -# update the version in the docs -find_and_replace('doc/conf.py', 'version =', - 'version = \'%s\'\n' % majorver[0:3], startswith=True) -find_and_replace('doc/conf.py', 'release =', - 'release = \'%s\'\n' % (majorver), startswith=True) - -# tag the release -#FIXME: do this using python-dulwich -cmd = "git commit -asm 'Version bump to %s'" % version -output = run(cmd)[0].strip() -# NOTE: This will use the default email address key. If you want to sign the tag -# using a different key, you will need to set 'signingkey' to the proper -# value in the [user] section of your git configuration. -cmd = "git tag -s v%s -m 'tagged %s release'" % (version, version) -output = run(cmd)[0].strip() -cmd = "git archive --format=tar --prefix=%s-%s/ v%s | gzip > %s" % \ - (pkgname, version, version, tarname) -output = run(cmd)[0].strip() -cmd = "gpg --armor --output %s.gpg --detach-sig %s" % (tarname, tarname) -output = run(cmd)[0].strip() - -# upload release to ftp -cmd = "scp %s* terra.mcs.anl.gov:/mcs/ftp/pub/bcfg/" % tarname -output = run(cmd)[0].strip() +""" % (version_release, version_info['build'], name, email, formatdate(localtime=True)) + + + # write out the new debian changelog + if options.dryrun: + print "*** Add the following to the top of debian/changelog:\n%s" % newchangelog + print "\n" + else: + try: + with open('debian/changelog', 'r+') as f: + old = f.read() + f.seek(0) + f.write(newchangelog + old) + f.close() + except: + print "Problem opening debian/changelog" + print help_message + quit() + + # Update redhat directory versions + if options.dryrun: + print "*** Replace redhat/VERIONS content with '%s'." % version_release + print "*** Replace redhat/RELEASE content with '%s'." % version_info['build'] + else: + with open('redhat/VERSION', 'w') as f: + f.write("%s\n" % version_release) + f.close() + with open('redhat/RELEASE', 'w') as f: + f.write("0.0%s\n" % version_info['build']) + f.close() + + # update solaris version + find_and_replace('solaris/Makefile', 'VERS=', + 'VERS=%s-1\n' % version, + startswith=True, + dryrun=options.dryrun) + find_and_replace('solaris/pkginfo.bcfg2', 'VERSION=', + 'VERSION="%s"\n' % version, + startswith=True, + dryrun=options.dryrun) + find_and_replace('solaris/pkginfo.bcfg2-server', 'VERSION=', + 'VERSION="%s"\n' % version, + startswith=True, + dryrun=options.dryrun) + # set new version in setup.py + find_and_replace('setup.py', 'version=', ' version="%s",\n' % version, + dryrun=options.dryrun) + # replace version in misc/bcfg2.spec + find_and_replace('misc/bcfg2.spec', 'Version:', + 'Version: %s\n' % version, + dryrun=options.dryrun) + # update the version in reports + find_and_replace('src/lib/Server/Reports/reports/templates/base.html', + 'Bcfg2 Version', ' <span>Bcfg2 Version %s</span>\n' % version, + dryrun=options.dryrun) + # update the version in the docs + find_and_replace('doc/conf.py', 'version =', + 'version = \'%s.%s\'\n' % (version_info['major'], version_info['minor']), + startswith=True, + dryrun=options.dryrun) + find_and_replace('doc/conf.py', 'release =', + 'release = \'%s\'\n' % (version_release), + startswith=True, + dryrun=options.dryrun) + # update osx Makefile + find_and_replace('osx/Makefile', 'BCFGVER =', + 'BCFGVER = %s\n' % (version), + startswith=True, + dryrun=options.dryrun) + find_and_replace('osx/Makefile', 'MAJOR =', + 'MAJOR = %s\n' % (version_info['major']), + startswith=True, + dryrun=options.dryrun) + find_and_replace('osx/Makefile', 'MINOR =', + 'MINOR = %s.%s\n' % (version_info['minor'], version_info['micro']), + startswith=True, + dryrun=options.dryrun) + + # tag the release + #FIXME: do this using python-dulwich + commando = {} + + commando["vcs_diff"] = "git diff" + + commando["vcs_commit"] = "git commit -asm 'Version bump to %s'" % version + + # NOTE: This will use the default email address key. If you want to sign the tag + # using a different key, you will need to set 'signingkey' to the proper + # value in the [user] section of your git configuration. + commando["vcs_tag"] = "git tag -s v%s -m 'tagged %s release'" % (version, version) + + commando["create_archive"] = "git archive --format=tar --prefix=%s-%s/ v%s | gzip > %s" % \ + (pkgname, version, version, tarname) + + commando["gpg_encrypt"] = "gpg --armor --output %s.gpg --detach-sig %s" % (tarname, tarname) + + # upload release to ftp + commando["scp_archive"] = "scp %s* terra.mcs.anl.gov:/mcs/ftp/pub/bcfg/" % tarname + + # Execute the commands + if options.paranoid: + commando_orders = ["vcs_diff"] + else: + commando_orders = ["vcs_commit","vcs_tag","create_archive","gpg_encrypt","scp_archive"] + + if options.dryrun: + for cmd in commando_orders: + print "*** dry-run: %s" % commando[cmd] + else: + for cmd in commando_orders: + output = run(commando[cmd])[0].strip() + if options.verbose: + print output + print "Ran '%s' with above output." % cmd + +if __name__ == '__main__': + sys.exit(main()) diff --git a/tools/export2.py b/tools/export2.py deleted file mode 100755 index fa75686b6..000000000 --- a/tools/export2.py +++ /dev/null @@ -1,244 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 - -""" -Second attempt to make our export script more portable than export.sh - -""" - -import fileinput -from subprocess import Popen, PIPE -import sys -# This will need to be replaced with argsparse when we make a 2.7+/3.2+ version -import optparse - -# py3k compatibility -try: - from email.Utils import formatdate -except ImportError: - from email.utils import formatdate - -# In lieu of a config file -help_message = '''This script creates a tag in the Bcfg2 git repo and exports a tar file of the code -at that tag. - -This script must be run at the top of your git repository. -''' - - -pkgname = 'bcfg2' -ftphost = 'terra.mcs.anl.gov' -ftpdir = '/mcs/ftp/pub/bcfg' - -def run(command): - return Popen(command, shell=True, stdout=PIPE).communicate() - -def find_and_replace(f, iftest, rline, startswith=False, dryrun=False): - if dryrun: - inplace=0 - print "*** dry-run: New '%s' will look like this:" % f - else: - inplace=1 - for line in fileinput.input(f, inplace): - if startswith: - if line.startswith(iftest): - line = line.replace(line, rline) - sys.stdout.write(line) - else: - if iftest in line and line != "Version: %{version}\n": - line = line.replace(line, rline) - sys.stdout.write(line) - if dryrun: - print "*** End '%s'" % f - -def main(argv=None): - # This is where the options are set up - p = optparse.OptionParser(description = help_message, - prog = 'export2.py', - version = '0.1', - usage = '%prog [-h|--help] [-v|--version] [-n|--dry-run] [-d|--debug]') - p.add_option('--verbose', '-v', - action = 'store_true', - help = 'turns on verbose mode', - default = False, - dest = 'verbose') - p.add_option('--dry-run', '-n', - action = 'store_true', - help = 'run in dry-run mode; no changes will be made to the system', - default = False, - dest = 'dryrun') - p.add_option('--debug', '-d', - action = 'store_true', - help = 'run in debun mode', - default = False, - dest = 'debug') - p.add_option('--paranoid', '-P', - action = 'store_true', - help = 'run in paranoid mode, make changes but do not commit to repository', - default = False, - dest = 'paranoid') - options, arguments = p.parse_args() - - if options.debug: - print options - print "What should debug mode do?" - - # py3k compatibility - try: - version = raw_input("Please enter the Bcfg2 version you are tagging (e.g. 1.0.0): ") - name = raw_input("Your name: ") - email = raw_input("Your email: ") - except NameError: - version = input("Please enter the Bcfg2 version you are tagging (e.g. 1.0.0): ") - name = input("Your name: ") - email = input("Your email: ") - - # parse version into Major.Minor.MicroBuild and validate - vkeys = ["major", "minor", "microbuild"] - try: - version_info = dict(zip(vkeys,version.split("."))) - if not version_info["major"].isdigit() or not version_info["minor"].isdigit(): - raise VersionError('isdigit() test failed') - except: - print """Version must be of the form Major.Minor.MicroBuild, -where Major and Minor are integers and -Micro is a single digit optionally followed by Build (i.e. pre##) -E.G. 1.2.0pre1 is a valid version. - """ - quit() - - version_info["micro"] = version_info["microbuild"][0:1] - version_info["build"] = version_info["microbuild"][1:] - version_release = "%s.%s.%s" % (version_info['major'], version_info['minor'], version_info['micro']) - - if options.debug: - print "version is %s" % version - print "version_info is %s" % version_info - print "version_release is %s" % version_release - - tarname = '/tmp/%s-%s.tar.gz' % (pkgname, version) - - newchangelog = \ -"""bcfg2 (%s%s-0.0) unstable; urgency=low - - * New upstream release - - -- %s <%s> %s - -""" % (version_release, version_info['build'], name, email, formatdate(localtime=True)) - - - # write out the new debian changelog - if options.dryrun: - print "*** Add the following to the top of debian/changelog:\n%s" % newchangelog - print "\n" - else: - try: - with open('debian/changelog', 'r+') as f: - old = f.read() - f.seek(0) - f.write(newchangelog + old) - f.close() - except: - print "Problem opening debian/changelog" - print help_message - quit() - - # Update redhat directory versions - if options.dryrun: - print "*** Replace redhat/VERIONS content with '%s'." % version_release - print "*** Replace redhat/RELEASE content with '%s'." % version_info['build'] - else: - with open('redhat/VERSION', 'w') as f: - f.write("%s\n" % version_release) - f.close() - with open('redhat/RELEASE', 'w') as f: - f.write("0.0%s\n" % version_info['build']) - f.close() - - # update solaris version - find_and_replace('solaris/Makefile', 'VERS=', - 'VERS=%s-1\n' % version, - startswith=True, - dryrun=options.dryrun) - find_and_replace('solaris/pkginfo.bcfg2', 'VERSION=', - 'VERSION="%s"\n' % version, - startswith=True, - dryrun=options.dryrun) - find_and_replace('solaris/pkginfo.bcfg2-server', 'VERSION=', - 'VERSION="%s"\n' % version, - startswith=True, - dryrun=options.dryrun) - # set new version in setup.py - find_and_replace('setup.py', 'version=', ' version="%s",\n' % version, - dryrun=options.dryrun) - # replace version in misc/bcfg2.spec - find_and_replace('misc/bcfg2.spec', 'Version:', - 'Version: %s\n' % version, - dryrun=options.dryrun) - # update the version in reports - find_and_replace('src/lib/Server/Reports/reports/templates/base.html', - 'Bcfg2 Version', ' <span>Bcfg2 Version %s</span>\n' % version, - dryrun=options.dryrun) - # update the version in the docs - find_and_replace('doc/conf.py', 'version =', - 'version = \'%s.%s\'\n' % (version_info['major'], version_info['minor']), - startswith=True, - dryrun=options.dryrun) - find_and_replace('doc/conf.py', 'release =', - 'release = \'%s\'\n' % (version_release), - startswith=True, - dryrun=options.dryrun) - # update osx Makefile - find_and_replace('osx/Makefile', 'BCFGVER =', - 'BCFGVER = %s\n' % (version), - startswith=True, - dryrun=options.dryrun) - find_and_replace('osx/Makefile', 'MAJOR =', - 'MAJOR = %s\n' % (version_info['major']), - startswith=True, - dryrun=options.dryrun) - find_and_replace('osx/Makefile', 'MINOR =', - 'MINOR = %s.%s\n' % (version_info['minor'], version_info['micro']), - startswith=True, - dryrun=options.dryrun) - - # tag the release - #FIXME: do this using python-dulwich - commando = {} - - commando["vcs_diff"] = "git diff" - - commando["vcs_commit"] = "git commit -asm 'Version bump to %s'" % version - - # NOTE: This will use the default email address key. If you want to sign the tag - # using a different key, you will need to set 'signingkey' to the proper - # value in the [user] section of your git configuration. - commando["vcs_tag"] = "git tag -s v%s -m 'tagged %s release'" % (version, version) - - commando["create_archive"] = "git archive --format=tar --prefix=%s-%s/ v%s | gzip > %s" % \ - (pkgname, version, version, tarname) - - commando["gpg_encrypt"] = "gpg --armor --output %s.gpg --detach-sig %s" % (tarname, tarname) - - # upload release to ftp - commando["scp_archive"] = "scp %s* terra.mcs.anl.gov:/mcs/ftp/pub/bcfg/" % tarname - - # Execute the commands - if options.paranoid: - commando_orders = ["vcs_diff"] - else: - commando_orders = ["vcs_commit","vcs_tag","create_archive","gpg_encrypt","scp_archive"] - - if options.dryrun: - for cmd in commando_orders: - print "*** dry-run: %s" % commando[cmd] - else: - for cmd in commando_orders: - output = run(commando[cmd])[0].strip() - if options.verbose: - print output - print "Ran '%s' with above output." % cmd - -if __name__ == '__main__': - sys.exit(main()) |