Merge branch 'master' of github.com:piranha/nomad

.travis.yml

@@ -3,5 +3,5 @@ python:
   - "2.6"
   - "2.7"
   - "3.3"
-install: "python setup.py install && pip install sqlalchemy cram"
+install: "python setup.py install && pip install sqlalchemy cram pyyaml"
 script: "make test"

nomad/utils.py

@@ -132,6 +132,17 @@ def get_ini(path):
         raise KeyError('%s not found in %s' % (path, fn))
 
 
+def get_yaml(path):
+    try:
+        import yaml
+    except ImportError:
+        abort('Please, install PyYAML to parse YAML config.')
+    fn, path = path.split(':')
+    obj = yaml.load(open(fn))
+    path = map(lambda x: int(x) if x.isdigit() else x, path.split('.'))
+    return reduce(lambda x, y: x[y], path, obj)
+
+
 URLTYPES = {
     'python': get_python,
     'py': get_python,
@@ -140,6 +151,7 @@ def get_ini(path):
     'cmd': get_command,
     'json': get_json,
     'ini': get_ini,
+    'yaml': get_yaml,
     }
 
 

tests/urls.t

@@ -122,6 +122,19 @@ URL from INI file::
     <SAEngine: sqlite:///test-ini.db>
     Uninitialized repository
 
+URL from YAML file::
+
+  $ echo 'db:\n    - url: sqlite:///test-yaml.db' > url.yaml
+  $ cat > nomad.ini <<EOF
+  > [nomad]
+  > engine = sqla
+  > url = yaml:url.yaml:db.0.url
+  > EOF
+  $ $NOMAD info
+  <Repository: .>:
+    <SAEngine: sqlite:///test-yaml.db>
+    Uninitialized repository
+
 Nothing defined::
 
   $ echo '[nomad]\nengine=sqla' > nomad.ini