- --test option for reading from ini

- allow from-json to read from stdin with '-'

2 files changed, 9 insertions, 2 deletions

diff --git a/py/__init__.py b/py/__init__.py
index 3e4e760..8610e08 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -21,7 +21,7 @@ def _convert_version(tup):
     return ret_val
 
 
-version_info = (0, 9, 7)
+version_info = (0, 9, 8)
 __version__ = _convert_version(version_info)
 
 del _convert_version
diff --git a/py/yaml.py b/py/yaml.py
index 55ba187..2f64332 100644
--- a/py/yaml.py
+++ b/py/yaml.py
@@ -65,6 +65,9 @@ class YAML:
         errors = 0
         doc = []
         cfg = ConfigObj(open(self._args.file))
+        if self._args.test:
+            print(ruamel.yaml.dump(cfg))
+            return
         for line in configobj_walker(cfg):
             doc.append(line)
         joined = '\n'.join(doc)
@@ -217,7 +220,10 @@ class YAML:
         errors = 0
         docs = []
         for file_name in self._args.file:
-            inp = open(file_name).read()
+            if file_name == '-':
+                inp = sys.stdin.read()
+            else:
+                inp = open(file_name).read()
             loader = ruamel.yaml.Loader # RoundTripLoader
             docs.append(ruamel.yaml.load(inp, loader))
         dumper = ruamel.yaml.RoundTripDumper
@@ -449,6 +455,7 @@ class YAML_Cmd(ProgramBase):
     @option('--basename', '-b', action='store_true',
             help='re-use basename of file for .yaml file, instead of writing'
             ' to stdout')
+    @option('--test', action='store_true')
     @option('file')
     def ini(self):
         return self._yaml.from_ini()