-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR deals with merging the configtools functionality into Pbench instead of using a VM to do so. Fixes #19 from configtools Repository
- Loading branch information
Showing
8 changed files
with
200 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| #! /usr/bin/env python3 | ||
| from __future__ import print_function | ||
|
|
||
| import sys | ||
| import os | ||
| import configtools | ||
| from optparse import make_option | ||
|
|
||
| def main(conf, args, opts): | ||
| if opts.all: | ||
| for sec in args: | ||
| if conf.has_section(sec): | ||
| print("[%s]" % (sec)) | ||
| items = conf.items(sec) | ||
| items.sort() | ||
| for (n, v) in items: | ||
| print("%s = %s" % (n, v)) | ||
| print() | ||
| return 0 | ||
|
|
||
| sep = ',' | ||
| if opts.list: | ||
| sep = ' ' | ||
|
|
||
| option = args[0] | ||
| for sec in args[1:]: | ||
| if conf.has_section(sec): | ||
| if conf.has_option(sec, option): | ||
| configtools.print_list(configtools.get_list(conf.get(sec, option)), sep) | ||
| return 0 | ||
| return 1 | ||
|
|
||
| options = [ | ||
| make_option("-a", "--all", action="store_true", dest="all", help="print all items in section"), | ||
| make_option("-d", "--dump", action="store_true", dest="dump", help="print everything and exit"), | ||
| make_option("-l", "--list", action="store_true", dest="list", help="print it as a shell list, translating commas to spaces"), | ||
| make_option("-L", "--listfiles", action="store_true", dest="listfiles", help="print the list of config files and exit"), | ||
| ] | ||
|
|
||
| if __name__ == '__main__': | ||
| opts, args = configtools.parse_args(options, usage='Usage: getconf.py [options] <item>|-a <section> [<section> ...]') | ||
| conf, files = configtools.init(opts) | ||
| if not conf: | ||
| sys.exit(1) | ||
| if opts.dump: | ||
| conf.write(sys.stdout) | ||
| sys.exit(0) | ||
|
|
||
| if opts.listfiles: | ||
| files.reverse() | ||
| print(files) | ||
| sys.exit(0) | ||
| if args: | ||
| status = main(conf, args, opts) | ||
| else: | ||
| status = 1 | ||
| sys.exit(status) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| """ Configtools """ | ||
| from __future__ import print_function | ||
|
|
||
| import os, sys | ||
|
|
||
| # python3 | ||
| from configparser import ConfigParser | ||
|
|
||
| from optparse import OptionParser | ||
|
|
||
| import logging | ||
|
|
||
| def uniq(l): | ||
| # uniquify the list without scrambling it | ||
| seen = set() | ||
| seen_add = seen.add | ||
| return [x for x in l if x not in seen and not seen_add(x)] | ||
|
|
||
| def file_list(root): | ||
| # read the root file, get its [config] section | ||
| # and use it to construct the file list. | ||
| conf = ConfigParser() | ||
| conf.read(root) | ||
| try: | ||
| dirlist = conf.get("config", "path").replace(' ', '').split(',') | ||
| except Exception: | ||
| dirlist = [] | ||
| try: | ||
| files = conf.get("config", "files").replace(' ', '').split(',') | ||
| except Exception: | ||
| files = [] | ||
|
|
||
| root = os.path.abspath(root) | ||
| # all relative pathnames will be relative to the rootdir | ||
| rootdir = os.path.dirname(root) | ||
| flist = [root] | ||
| dirlist = [os.path.abspath("%s/%s" % (rootdir, x)) if not os.path.isabs(x) else os.path.abspath(x) for x in dirlist] | ||
| # insert the directory of the root file at the beginning | ||
| dirlist.insert(0, rootdir) | ||
|
|
||
| # import pdb; pdb.set_trace() | ||
| for d in dirlist: | ||
| for f in files: | ||
| fnm = "%s/%s" % (d, f) | ||
| if fnm in flist: | ||
| continue | ||
| if os.access(fnm, os.F_OK): | ||
| fnmlist = file_list(fnm) | ||
| flist += fnmlist | ||
| return uniq(flist) | ||
|
|
||
| def init(opts): | ||
| """init""" | ||
| # config file | ||
| conf = ConfigParser() | ||
| if opts.filename: | ||
| conf_file = opts.filename | ||
| elif 'CONFIG' in os.environ: | ||
| conf_file= os.environ['CONFIG'] | ||
| else: | ||
| return (None, []) | ||
|
|
||
| conffiles = file_list(conf_file) | ||
| conffiles.reverse() | ||
| files = conf.read(conffiles) | ||
|
|
||
| return (conf, files) | ||
|
|
||
| def parse_args(options=[], usage=None): | ||
| """parse_args""" | ||
| if usage: | ||
| parser = OptionParser(usage=usage) | ||
| else: | ||
| parser = OptionParser() | ||
| # standard options | ||
| parser.add_option("-C", "--config", dest="filename", | ||
| help="config FILE", metavar="FILE") | ||
| parser.add_option("-D", "--debug", action="store_true", dest="debug", | ||
| help="commands logged but not executed") | ||
| # specific options | ||
| for o in options: | ||
| parser.add_option(o) | ||
|
|
||
| return parser.parse_args() | ||
|
|
||
| def get_list(s): | ||
| """get_list""" | ||
| if not s: | ||
| return [] | ||
| l = [x.strip().strip('\\\n') for x in s.split(',')] | ||
| try: | ||
| nl = [] | ||
| for x in l: | ||
| nl += expand_range(x) | ||
| return nl | ||
| except Exception: | ||
| return l | ||
|
|
||
| def get(conf, option, sections): | ||
| """get option from section list""" | ||
| for s in sections: | ||
| try: | ||
| return conf.get(s, option) | ||
| except Exception: | ||
| pass | ||
| return None | ||
|
|
||
| def print_list(l, sep): | ||
| print(sep.join([str(x) for x in l])) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters