class ConfigManager:
'''Class that manages the read of all the configuration files of salomeTools
'''
- def __init__(self, dataDir=None):
+ def __init__(self, datadir=None):
pass
- def _create_vars(self, application=None, command=None, dataDir=None):
+ def _create_vars(self, application=None, command=None, datadir=None):
'''Create a dictionary that stores all information about machine,
user, date, repositories, etc...
:param application str: The application for which salomeTools is called.
:param command str: The command that is called.
- :param dataDir str: The repository that contain external data
+ :param datadir str: The repository that contain external data
for salomeTools.
:return: The dictionary that stores all information.
:rtype: dict
var['srcDir'] = os.path.join(var['salometoolsway'], 'src')
var['sep']= os.path.sep
- # dataDir has a default location
- var['dataDir'] = os.path.join(var['salometoolsway'], 'data')
- if dataDir is not None:
- var['dataDir'] = dataDir
+ # datadir has a default location
+ var['datadir'] = os.path.join(var['salometoolsway'], 'data')
+ if datadir is not None:
+ var['datadir'] = datadir
var['personalDir'] = os.path.join(os.path.expanduser('~'),
'.salomeTools')
return over
def get_config(self, application=None, options=None, command=None,
- dataDir=None):
+ datadir=None):
'''get the config from all the configuration files.
:param application str: The application for which salomeTools is called.
:param options class Options: The general salomeToos
options (--overwrite or -l5, for example)
:param command str: The command that is called.
- :param dataDir str: The repository that contain
+ :param datadir str: The repository that contain
external data for salomeTools.
:return: The final config.
:rtype: class 'src.pyconf.Config'
# =====================================================================
# create VARS section
var = self._create_vars(application=application, command=command,
- dataDir=dataDir)
+ datadir=datadir)
# add VARS to config
cfg.VARS = src.pyconf.Mapping(cfg)
for variable in var:
# =====================================================================
# Load SITE config file
# search only in the data directory
- src.pyconf.streamOpener = ConfigOpener([cfg.VARS.dataDir])
+ src.pyconf.streamOpener = ConfigOpener([cfg.VARS.datadir])
try:
- site_cfg = src.pyconf.Config(open(os.path.join(cfg.VARS.dataDir,
+ site_cfg = src.pyconf.Config(open(os.path.join(cfg.VARS.datadir,
'site.pyconf')))
except src.pyconf.ConfigError as e:
raise src.SatException(_("Error in configuration file: "
exec('cfg.' + rule)
# =====================================================================
- # Load modules config files in MODULES section
+ # Load product config files in PRODUCTS section
# The directory containing the softwares definition
- modules_dir = os.path.join(cfg.VARS.dataDir, 'modules')
+ products_dir = os.path.join(cfg.VARS.datadir, 'products')
# Loop on all files that are in softsDir directory
# and read their config
- for fName in os.listdir(modules_dir):
+ for fName in os.listdir(products_dir):
if fName.endswith(".pyconf"):
- src.pyconf.streamOpener = ConfigOpener([modules_dir])
+ src.pyconf.streamOpener = ConfigOpener([products_dir])
try:
- mod_cfg = src.pyconf.Config(open(
- os.path.join(modules_dir, fName)))
+ prod_cfg = src.pyconf.Config(open(
+ os.path.join(products_dir, fName)))
except src.pyconf.ConfigError as e:
raise src.SatException(_(
- "Error in configuration file: %(soft)s\n %(error)s") % \
- {'soft' : fName, 'error': str(e) })
+ "Error in configuration file: %(prod)s\n %(error)s") % \
+ {'prod' : fName, 'error': str(e) })
except IOError as error:
e = str(error)
raise src.SatException( e );
- merger.merge(cfg.MODULES, mod_cfg)
+ merger.merge(cfg.PRODUCTS, prod_cfg)
# apply overwrite from command line if needed
- for rule in self.get_command_line_overrides(options, ["MODULES"]):
+ for rule in self.get_command_line_overrides(options, ["PRODUCTS"]):
exec('cfg.' + rule) # this cannot be factorized because of the exec
user_cfg.addMapping('USER', src.pyconf.Mapping(user_cfg), "")
#
- user_cfg.USER.addMapping('workDir', os.path.expanduser('~'),
+ user_cfg.USER.addMapping('workdir', os.path.expanduser('~'),
"This is where salomeTools will work. "
"You may (and probably do) change it.\n")
user_cfg.USER.addMapping('cvs_user', config.VARS.user,
"This is the user name used to access salome cvs base.\n")
user_cfg.USER.addMapping('svn_user', config.VARS.user,
"This is the user name used to access salome svn base.\n")
- user_cfg.USER.addMapping('output_level', 3,
- "This is the default output_level you want."
+ user_cfg.USER.addMapping('output_verbose_level', 3,
+ "This is the default output_verbose_level you want."
" 0=>no output, 5=>debug.\n")
user_cfg.USER.addMapping('publish_dir',
os.path.join(os.path.expanduser('~'),
