aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2010-12-01 00:11:45 -0200
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2010-12-01 00:11:45 -0200
commitf9e5589a7e6aba55fa7ad5e29728fe8506cae851 (patch)
tree35b72d8a820551721c073afca337ac1c5cca3eea
parentadded checksum support to package database fetch (diff)
downloadg-octave-f9e5589a7e6aba55fa7ad5e29728fe8506cae851.tar.gz
g-octave-f9e5589a7e6aba55fa7ad5e29728fe8506cae851.tar.bz2
g-octave-f9e5589a7e6aba55fa7ad5e29728fe8506cae851.zip
rewrote g_octave.config
-rw-r--r--g_octave/config.py110
-rw-r--r--g_octave/exception.py4
-rw-r--r--tests/test_config.py4
3 files changed, 55 insertions, 63 deletions
diff --git a/g_octave/config.py b/g_octave/config.py
index 0b42c08..924bdb8 100644
--- a/g_octave/config.py
+++ b/g_octave/config.py
@@ -12,20 +12,22 @@
"""
from __future__ import absolute_import
-
-__all__ = ['Config']
-
-import json
import os
-from .compat import py3k, open
-from .exception import ConfigException
-
+# py3k compatibility
+from .compat import py3k
if py3k:
import configparser
else:
import ConfigParser as configparser
+__all__ = ['Config', 'ConfigException']
+
+
+class ConfigException(Exception):
+ pass
+
+
class Config(object):
_defaults = {
@@ -42,61 +44,59 @@ class Config(object):
}
_section_name = 'main'
- _env_namespace = 'GOCTAVE_'
-
- def __init__(self, fetch_phase=False, config_file=None, create_dirs=True):
+ _environ_namespace = 'GOCTAVE_'
- # Config Parser
- self._config = configparser.ConfigParser(self._defaults)
- self._fetch_phase = fetch_phase
-
- parsed_files = self._config.read([
- os.path.join(
- os.path.dirname(os.path.abspath(__file__)),
- '..', 'etc', 'g-octave.cfg'
- ),
- config_file or '/etc/g-octave.cfg',
- ])
+ def __init__(self, config_file=None):
+ # config Parser
+ self._config = configparser.ConfigParser(self._defaults)
+
+ # current directory
+ cwd = os.path.dirname(os.path.realpath(__file__))
+
+ # no configuration file provided as parameter
+ if config_file is None:
+
+ # we just want one of the following configuration files:
+ # '../etc/g-octave.cfg', '/etc/g-octave.cfg'
+ available_files = [
+ os.path.join(cwd, '..', 'etc', 'g-octave.cfg'),
+ os.path.join('/etc', 'g-octave.cfg'),
+ ]
+
+ # get the first one available
+ for my_file in available_files:
+ if os.path.exists(my_file):
+ config_file = my_file
+ break
+
+ # parse the wanted file using ConfigParser
+ parsed_files = self._config.read(config_file)
+
+ # no file to parsed
if len(parsed_files) == 0:
- raise ConfigException('Configuration file not found.')
+ raise ConfigException('File not found: %r' % config_file)
- _db = self._getattr('db')
- _overlay = self._getattr('overlay')
-
- for dir in [_db, _overlay]:
- if not os.path.exists(dir) and create_dirs:
- try:
- os.makedirs(dir, 0o755)
- except:
- # it's probably safe to ignore that
- pass
-
- self._cache = {}
- self._info = {}
-
- if not fetch_phase:
-
- # JSON
- json_file = os.path.join(_db, 'info.json')
- with open(json_file) as fp:
- self._info = json.load(fp)
+ def _evaluate_from_file(self, attr):
+ # return the value from the configuration file
+ try:
+ return self._config.get(self._section_name, attr)
+ except (configparser.NoSectionError, configparser.NoOptionError):
+ return None
+ def _evaluate_from_environ(self, attr):
+ # return the value from the environment variables namespace
+ return os.environ.get(self._environ_namespace + attr.upper(), None)
def __getattr__(self, attr):
-
+ # valid attribute?
if attr in self._defaults:
- return self._getattr(attr)
- elif attr in self._info:
- return self._info[attr]
+ # try the environment variable first
+ from_env = self._evaluate_from_environ(attr)
+ if from_env is not None:
+ return from_env
+ # default to the configuration file
+ return self._evaluate_from_file(attr)
else:
- raise ConfigException('Invalid option: %s' % attr)
-
-
- def _getattr(self, attr):
- from_env = os.environ.get(self._env_namespace + attr.upper(), None)
- if from_env is None:
- return self._config.get(self._section_name, attr)
- return from_env
-
+ raise ConfigException('Invalid option: %r' % attr)
diff --git a/g_octave/exception.py b/g_octave/exception.py
index a91b5cc..1025a20 100644
--- a/g_octave/exception.py
+++ b/g_octave/exception.py
@@ -12,7 +12,6 @@
"""
__all__ = [
- 'ConfigException',
'DescriptionException',
'DescriptionTreeException',
'EbuildException',
@@ -20,9 +19,6 @@ __all__ = [
]
-class ConfigException(Exception):
- pass
-
class DescriptionException(Exception):
pass
diff --git a/tests/test_config.py b/tests/test_config.py
index 6eeeee9..cad536a 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -26,15 +26,11 @@ class TestConfig(unittest.TestCase):
# object with the config file empty, should use the default values
self._empty_cfg = config.Config(
config_file = os.path.join(current_dir, 'files', 'g-octave_empty.cfg'),
- create_dirs = False,
- fetch_phase = True
)
# object with an example config file
self._cfg = config.Config(
config_file = os.path.join(current_dir, 'files', 'g-octave.cfg'),
- create_dirs = False,
- fetch_phase = True
)
def test_empty_config_attributes(self):