mirror of
https://github.com/erkin/ponysay.git
synced 2024-11-22 04:27:58 +01:00
Merge pull request #210 from Feuermurmel/setup
Fix for #209 and assorted enhancements.
This commit is contained in:
Mattias Andrée [mˈa.tːiː.ˌas ˈanː.drˌeː]
commit
9e555ff3e0
1 changed files with 135 additions and 91 deletions
128
setup.py
128
setup.py
|
|
@ -48,7 +48,7 @@ SYMBOLIC = 'symbolic'
|
|||
class Setup():
|
||||
def __init__(self):
|
||||
usage_script = '\033[34;1msetup.py\033[21;39m'
|
||||
usage_help = '(version | help)'
|
||||
usage_help = '(--version | --help)'
|
||||
usage_proc = '[\033[4mconfigurations\033[24m] ([build] | prebuilt | install | (uninstall|clean)[-old] | view)'
|
||||
|
||||
usage = '%s %s\n%s %s' % (usage_script, usage_help, usage_script, usage_proc)
|
||||
|
|
@ -240,16 +240,19 @@ class Setup():
|
|||
self.free = False
|
||||
def checkFreedom():
|
||||
if self.free is None:
|
||||
if (opts.opts['--version'] is None) and ((len(opts.files) != 1) or (opts.files[0] != 'version')):
|
||||
print('')
|
||||
print()
|
||||
print('You need to select your freedom, add --freedom=strict or --freedom=partial.')
|
||||
print('')
|
||||
print()
|
||||
print('--freedom=strict will install only ponies that are completely free.')
|
||||
print('--freedom=partial will install all ponies, even if they are not free.')
|
||||
print('')
|
||||
print('')
|
||||
print()
|
||||
print()
|
||||
exit(255)
|
||||
|
||||
def setup_config():
|
||||
self.viewconf(conf)
|
||||
os.umask(0o022)
|
||||
|
||||
if (opts.opts['---DESTDIR'] is not None) and (opts.opts['--dest-dir'] is None):
|
||||
destdir = opts.opts['---DESTDIR'][0]
|
||||
if len(destdir) > 0:
|
||||
|
|
@ -260,50 +263,58 @@ class Setup():
|
|||
if len(prefix) > 0:
|
||||
opts.opts['--prefix'] = [prefix]
|
||||
|
||||
if (len(opts.files) > 1) or (opts.opts['--help'] is not None) or ((len(opts.files) == 1) and (opts.files[0] == 'help')):
|
||||
if opts.opts['--help'] is not None:
|
||||
opts.help()
|
||||
elif (opts.opts['--version'] is not None) or ((len(opts.files) == 1) and (opts.files[0] == 'version')):
|
||||
elif opts.opts['--version'] is not None:
|
||||
print('Ponysay %s installer' % (PONYSAY_VERSION))
|
||||
elif len(opts.files) != 1:
|
||||
opts.print_fatal('A single command is expected on the command line.')
|
||||
opts.usage()
|
||||
else:
|
||||
if len(opts.files) == 0:
|
||||
opts.files = ['build']
|
||||
method = opts.files[0]
|
||||
if method == 'clean': self.clean()
|
||||
elif method == 'clean-old': self.cleanOld()
|
||||
else:
|
||||
conf = self.configure(opts.opts)
|
||||
self.viewconf(conf)
|
||||
os.umask(0o022)
|
||||
|
||||
if method == 'build':
|
||||
checkFreedom()
|
||||
setup_config()
|
||||
self.build(conf)
|
||||
|
||||
elif method == 'prebuilt':
|
||||
checkFreedom()
|
||||
setup_config()
|
||||
self.applyDestDir(conf)
|
||||
self.install(conf)
|
||||
|
||||
elif method == 'install':
|
||||
checkFreedom()
|
||||
setup_config()
|
||||
self.build(conf)
|
||||
self.applyDestDir(conf)
|
||||
self.install(conf)
|
||||
self.clean()
|
||||
|
||||
elif method == 'uninstall':
|
||||
setup_config()
|
||||
self.uninstall(conf)
|
||||
|
||||
elif method == 'uninstall-old':
|
||||
setup_config()
|
||||
self.uninstallOld(conf)
|
||||
|
||||
elif not method == 'view':
|
||||
opts.help()
|
||||
elif method == 'view':
|
||||
setup_config()
|
||||
else:
|
||||
opts.print_fatal('Unknown command: {}', method)
|
||||
opts.usage()
|
||||
|
||||
def viewconf(self, conf):
|
||||
'''
|
||||
Display configurations
|
||||
'''
|
||||
def viewconf(self, conf):
|
||||
|
||||
RED = '\033[31m%s\033[39m'
|
||||
GREEN = '%s\033[32m%s\033[39m'
|
||||
YELLOW = '\033[33m%s\033[39m'
|
||||
|
|
@ -352,10 +363,11 @@ class Setup():
|
|||
|
||||
print()
|
||||
|
||||
def build(self, conf):
|
||||
'''
|
||||
Compile ponysay
|
||||
'''
|
||||
def build(self, conf):
|
||||
|
||||
print('\033[1;34m::\033[39mCompiling...\033[21m')
|
||||
|
||||
def compressCommand(ext):
|
||||
|
|
@ -557,10 +569,11 @@ class Setup():
|
|||
|
||||
print()
|
||||
|
||||
def install(self, conf):
|
||||
'''
|
||||
Install compiled ponysay
|
||||
'''
|
||||
def install(self, conf):
|
||||
|
||||
print('\033[1;34m::\033[39mInstalling...\033[21m')
|
||||
|
||||
dests = []
|
||||
|
|
@ -643,10 +656,11 @@ class Setup():
|
|||
self.cp(False, file[0], [conf[file[0]]], Setup.validateFreedom if self.free else None)
|
||||
print()
|
||||
|
||||
def uninstall(self, conf):
|
||||
'''
|
||||
Uninstall ponysay
|
||||
'''
|
||||
def uninstall(self, conf):
|
||||
|
||||
print('\033[1;34m::\033[39mUninstalling...\033[21m')
|
||||
|
||||
(files, dirs, infos) = ([], [], [])
|
||||
|
|
@ -700,10 +714,11 @@ class Setup():
|
|||
self.removeLists(files, dirs)
|
||||
print()
|
||||
|
||||
def uninstallOld(self, conf):
|
||||
'''
|
||||
Uninstall file ponysay no longer uses
|
||||
'''
|
||||
def uninstallOld(self, conf):
|
||||
|
||||
print('\033[1;34m::\033[39mUninstalling old files...\033[21m')
|
||||
|
||||
instdir = conf['~prefix~'] + '/usr'
|
||||
|
|
@ -720,10 +735,11 @@ class Setup():
|
|||
self.removeLists(files, dirs)
|
||||
print()
|
||||
|
||||
def clean(self):
|
||||
'''
|
||||
Remove compiled files
|
||||
'''
|
||||
def clean(self):
|
||||
|
||||
print('\033[1;34m::\033[39mCleaning...\033[21m')
|
||||
|
||||
files = ['ponysay.info', 'ponysay.info.gz', 'ponysay.info.xz', 'ponysay.pdf.gz', 'ponysay.pdf.xz', 'ponysay.install', 'ponysay.zip']
|
||||
|
|
@ -746,10 +762,11 @@ class Setup():
|
|||
self.removeLists(files, dirs)
|
||||
print()
|
||||
|
||||
def cleanOld(self):
|
||||
'''
|
||||
Remove compiled files ponysay is no longer compiling
|
||||
'''
|
||||
def cleanOld(self):
|
||||
|
||||
print('\033[1;34m::\033[39mCleaning old files...\033[21m')
|
||||
|
||||
files = ['truncater', 'ponysaytruncater', 'ponysay.py.install', 'ponysay.install~', 'ponysay.zip']
|
||||
|
|
@ -764,10 +781,11 @@ class Setup():
|
|||
self.removeLists(files, dirs)
|
||||
print()
|
||||
|
||||
def removeLists(self, files, dirs):
|
||||
'''
|
||||
Removes listed files and directories
|
||||
'''
|
||||
def removeLists(self, files, dirs):
|
||||
|
||||
for file in files:
|
||||
if os.path.isfile(file) or os.path.islink(file):
|
||||
print('Unlinking file %s' % (file))
|
||||
|
|
@ -793,11 +811,12 @@ class Setup():
|
|||
else:
|
||||
break;
|
||||
|
||||
@staticmethod
|
||||
def validateFreedom(filename):
|
||||
'''
|
||||
Check whether a file is fully free
|
||||
'''
|
||||
@staticmethod
|
||||
def validateFreedom(filename):
|
||||
|
||||
if not os.path.isdir(filename):
|
||||
if filename.endswith('.pony') and (filename != '.pony') and not filename.endswith('/.pony'):
|
||||
with open(filename, 'rb') as file:
|
||||
|
|
@ -813,10 +832,11 @@ class Setup():
|
|||
return False
|
||||
return True
|
||||
|
||||
def cp(self, recursive, source, destinations, validatehook = None):
|
||||
'''
|
||||
Copys a files or directory to multiple destinations
|
||||
'''
|
||||
def cp(self, recursive, source, destinations, validatehook = None):
|
||||
|
||||
if validatehook is not None:
|
||||
if not validatehook(source):
|
||||
print('Ignoring installation of file %s (did not pass validation process made by setup settings)' % source)
|
||||
|
|
@ -891,10 +911,11 @@ class Setup():
|
|||
os.unlink(dest)
|
||||
self.symlink(target, dest)
|
||||
|
||||
def symlink(self, target, dest):
|
||||
'''
|
||||
Create a symlink with a relative path
|
||||
'''
|
||||
def symlink(self, target, dest):
|
||||
|
||||
if target.startswith('./') or target.startswith('../'):
|
||||
os.symlink(target, dest)
|
||||
elif '/' not in target:
|
||||
|
|
@ -914,10 +935,11 @@ class Setup():
|
|||
|
||||
os.symlink('/'.join(targets), dest)
|
||||
|
||||
def configure(self, opts):
|
||||
'''
|
||||
Parses configurations
|
||||
'''
|
||||
def configure(self, opts):
|
||||
|
||||
(defaults, conf) = ({}, {})
|
||||
|
||||
for command in commands:
|
||||
|
|
@ -1070,15 +1092,18 @@ class Setup():
|
|||
|
||||
ARGUMENTLESS = 0
|
||||
ARGUMENTED = 1
|
||||
'''
|
||||
Simple argument parser, a strip down of the one in ponysay and slitly modified
|
||||
'''
|
||||
|
||||
class ArgParser():
|
||||
'''
|
||||
Simple argument parser, a strip down of the one in ponysay and slitly modified
|
||||
'''
|
||||
|
||||
def __init__(self, program, description, usage, longdescription = None):
|
||||
'''
|
||||
Constructor.
|
||||
The short description is printed on same line as the program name
|
||||
'''
|
||||
def __init__(self, program, description, usage, longdescription = None):
|
||||
|
||||
self.__program = program
|
||||
self.__description = description
|
||||
self.__usage = usage
|
||||
|
|
@ -1086,27 +1111,30 @@ class ArgParser():
|
|||
self.__arguments = []
|
||||
(self.opts, self.optmap) = ({}, {})
|
||||
|
||||
def add_argumentless(self, alternatives, help = None):
|
||||
'''
|
||||
Add option that takes no arguments
|
||||
'''
|
||||
def add_argumentless(self, alternatives, help = None):
|
||||
|
||||
ARGUMENTLESS
|
||||
self.__arguments.append((ARGUMENTLESS, alternatives, None, help))
|
||||
(stdalt, self.opts[stdalt]) = (alternatives[0], None)
|
||||
for alt in alternatives: self.optmap[alt] = (stdalt, ARGUMENTLESS)
|
||||
|
||||
def add_argumented(self, alternatives, arg, help = None):
|
||||
'''
|
||||
Add option that takes one argument
|
||||
'''
|
||||
def add_argumented(self, alternatives, arg, help = None):
|
||||
|
||||
self.__arguments.append((ARGUMENTED, alternatives, arg, help))
|
||||
(stdalt, self.opts[stdalt]) = (alternatives[0], None)
|
||||
for alt in alternatives: self.optmap[alt] = (stdalt, ARGUMENTED)
|
||||
|
||||
def parse(self, argv = sys.argv):
|
||||
'''
|
||||
Parse arguments
|
||||
'''
|
||||
def parse(self, argv = sys.argv):
|
||||
|
||||
self.argcount = len(argv) - 1
|
||||
self.files = []
|
||||
(argqueue, optqueue, get) = ([], [], False)
|
||||
|
|
@ -1129,13 +1157,13 @@ class ArgParser():
|
|||
optqueue.append(arg_opt)
|
||||
argqueue.append(arg[arg.index('=') + 1:])
|
||||
else:
|
||||
sys.stderr.write('%s: fatal: unrecognised option %s. see --help or the manual\n' % (self.__program, arg))
|
||||
self.print_fatal('Unrecognized option {}. Use --help or consult the manual.', arg)
|
||||
exit(-1)
|
||||
elif (arg in self.optmap) and (self.optmap[arg][1] == ARGUMENTED):
|
||||
optqueue.append(arg)
|
||||
get = True
|
||||
else:
|
||||
sys.stderr.write('%s: fatal: unrecognised option %s. see --help or the manual\n' % (self.__program, arg))
|
||||
self.print_fatal('Unrecognized option {}. Use --help or consult the manual.', arg)
|
||||
exit(-1)
|
||||
else:
|
||||
self.files.append(arg)
|
||||
|
|
@ -1149,14 +1177,17 @@ class ArgParser():
|
|||
if (opt not in self.opts) or (self.opts[opt] is None):
|
||||
self.opts[opt] = [arg]
|
||||
else:
|
||||
sys.stderr.write('%s: fatal: duplicate option %s\n' % (self.__program, arg))
|
||||
self.print_fatal('duplicate option {}', arg)
|
||||
exit(-1)
|
||||
|
||||
def print_fatal(self, message, *args):
|
||||
sys.stderr.write('{}: fatal: {}\n'.format(self.__program, message.format(*args)))
|
||||
|
||||
def usage(self):
|
||||
'''
|
||||
Prints a colourful help message
|
||||
Print a short usage message.
|
||||
'''
|
||||
def help(self):
|
||||
print('\033[1m%s\033[21m - %s\n' % (self.__program, self.__description))
|
||||
|
||||
if self.__longdescription is not None:
|
||||
print(self.__longdescription)
|
||||
print()
|
||||
|
|
@ -1165,8 +1196,21 @@ class ArgParser():
|
|||
for line in self.__usage.split('\n'):
|
||||
if first: first = False
|
||||
else: print(' or', end='')
|
||||
print('\t%s' % (line))
|
||||
print('\n\033[1mCONFIGURATIONS:\033[21m\n')
|
||||
print('\t{}'.format(line))
|
||||
|
||||
print()
|
||||
|
||||
def help(self):
|
||||
'''
|
||||
Prints a colourful help message.
|
||||
'''
|
||||
|
||||
# The usage should be terse so this header is only included in the help command.
|
||||
print('\033[1m{}\033[21m - {}\n'.format(self.__program, self.__description))
|
||||
|
||||
self.usage()
|
||||
|
||||
print('\033[1mCONFIGURATIONS:\033[21m\n')
|
||||
for opt in self.__arguments:
|
||||
(opt_type, opt_alts, opt_arg, opt_help) = opt[0:4]
|
||||
if opt_help is not None:
|
||||
|
|
|
|||
Loading…
Reference in a new issue