Merge pull request #25 from digitronik/move_to_rumel

remove pyyaml and introduce rumel.yaml

miqsel/config.py

@@ -1,7 +1,7 @@
 import os
 
 import click
-import yaml
+from ruamel.yaml import safe_load, safe_dump
 
 
 class Configuration(object):
@@ -14,11 +14,11 @@ def __init__(self, conf_file=None):
 
     def read(self):
         with open(self.conf_file, "r") as ymlfile:
-            return yaml.load(ymlfile)
+            return safe_load(ymlfile)
 
     def write(self, cfg):
         with open(self.conf_file, "w") as ymlfile:
-            return yaml.safe_dump(cfg, ymlfile, default_flow_style=False)
+            return safe_dump(cfg, ymlfile, default_flow_style=False)
 
 
 @click.command(help="Configure Miq Selenium Server")

miqsel/env.py

@@ -1,7 +1,7 @@
 import os
 
 import click
-import yaml
+from ruamel.yaml import safe_load, safe_dump
 
 from miqsel.config import Configuration
 
@@ -37,19 +37,19 @@ def env_file(self):
 
     @property
     def in_env(self):
-        """ Check env.local.yaml exist or not
+        """ Check we are in env or not.
         :return: return bool
         """
         proj_dir = os.path.dirname(self.env_file)
-        return os.path.isdir(proj_dir) and proj_dir == "conf"
+        return os.path.isdir(proj_dir)
 
     def read(self):
         """Read Environment file
 
         :return: dict
         """
         with open(self.env_file, "r") as ymlfile:
-            return yaml.load(ymlfile)
+            return safe_load(ymlfile)
 
     def write(self, cfg):
         """ Write Environment file
@@ -58,7 +58,7 @@ def write(self, cfg):
         """
         if self.in_env:
             with open(self.env_file, "w") as ymlfile:
-                return yaml.safe_dump(cfg, ymlfile, default_flow_style=False)
+                return safe_dump(cfg, ymlfile, default_flow_style=False)
         else:
             click.echo(
                 "Project directory need set or run from Project directory; 'env.yaml' not updated"

setup.py

@@ -8,7 +8,7 @@
 with open("README.md") as readme_file:
     readme = readme_file.read()
 
-install_requirements = ["Click>=5.0", "docker>=3.1", "PyYAML>=3.0"]
+install_requirements = ["Click>=5.0", "docker>=3.1", "ruamel.yaml~=0.15"]
 
 setup_requirements = ["setuptools_scm"]