Merge pull request #1767 from mboersma/1749-no-pyyaml

ref(client): remove PyYAML dependency and save to ~/.deis/client.json

Author: mboersma

client/README.rst

@@ -78,7 +78,7 @@ you used to provision the server. You can make a symlink or shell alias for
 
 .. code-block:: console
 
-    $ pip install docopt==0.6.2 python-dateutil==2.2 PyYAML==3.11 requests==2.3.0
+    $ pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 termcolor==1.1.0
     $ sudo ln -fs $(pwd)/client/deis.py /usr/local/bin/deis
     $ deis
     Usage: deis <command> [<args>...]

client/deis.py

@@ -68,7 +68,6 @@
 from docopt import DocoptExit
 import requests
 from termcolor import colored
-import yaml
 
 __version__ = '0.12.0-dev'
 
@@ -180,18 +179,30 @@ class Settings(dict):
     """
     Settings backed by a file in the user's home directory
 
-    On init, settings are loaded from ~/.deis/client.yaml
+    On init, settings are loaded from ~/.deis/client.json
     """
 
     def __init__(self):
         path = os.path.expanduser('~/.deis')
         # Create the $HOME/.deis dir if it doesn't exist
         if not os.path.isdir(path):
             os.mkdir(path, 0700)
-        self._path = os.path.join(path, 'client.yaml')
+        self._path = os.path.join(path, 'client.json')
         if not os.path.exists(self._path):
+            settings = {}
+            # try once to convert the old settings file if it exists
+            # FIXME: this code can be removed in November 2014 or thereabouts, that's long enough.
+            old_path = os.path.join(path, 'client.yaml')
+            if os.path.exists(old_path):
+                try:
+                    with open(old_path, 'r') as f:
+                        txt = f.read().replace('{', '{"', 1).replace(':', '":', 1).replace("'", '"')
+                        settings = json.loads(txt)
+                        os.remove(old_path)
+                except:
+                    pass  # ignore errors, at least we tried to convert it
             with open(self._path, 'w') as f:
-                f.write(yaml.safe_dump({}))
+                json.dump(settings, f)
         # load initial settings
         self.load()
 
@@ -201,15 +212,15 @@ def load(self):
         """
         with open(self._path) as f:
             data = f.read()
-        settings = yaml.safe_load(data)
+        settings = json.loads(data)
         self.update(settings)
         return settings
 
     def save(self):
         """
         Serialize and save settings to the filesystem
         """
-        data = yaml.safe_dump(dict(self))
+        data = json.dumps(dict(self))
         with open(self._path, 'w') as f:
             f.write(data)
         return data

client/setup.py

@@ -57,9 +57,7 @@
       ],
       long_description=LONG_DESCRIPTION,
       install_requires=[
-          'docopt==0.6.2', 'python-dateutil==2.2',
-          'PyYAML==3.11', 'requests==2.3.0',
-          'termcolor==1.1.0'
+          'docopt==0.6.2', 'python-dateutil==2.2', 'requests==2.3.0', 'termcolor==1.1.0'
       ],
       zip_safe=True,
       **KWARGS)

controller/dev_requirements.txt

@@ -1,7 +1,6 @@
 # Deis client requirements
 docopt==0.6.2
 python-dateutil==2.2
-#PyYAML==3.11
 requests==2.3.0
 
 # PyInstaller builds client binaries

docs/docs_requirements.txt

@@ -20,13 +20,11 @@ docker-py==0.4.0
 gunicorn==18.0
 psycopg2==2.5.2
 python-etcd==0.3.0
-PyYAML==3.11
 South==1.0
 
 # Deis client requirements
 docopt==0.6.2
 python-dateutil==2.2
-#PyYAML==3.11
 requests==2.3.0
 termcolor==1.1.0
 

docs/installing_deis/register-admin-user.rst

@@ -19,7 +19,7 @@ you used to provision the server. You can make a symlink or shell alias for
 
 .. code-block:: console
 
-    $ pip install docopt==0.6.2 python-dateutil==2.2 PyYAML==3.11 requests==2.3.0
+    $ pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 termcolor==1.1.0
     $ sudo ln -fs $(pwd)/client/deis.py /usr/local/bin/deis
     $ deis
     Usage: deis <command> [<args>...]

docs/using_deis/install-client.rst

@@ -17,7 +17,7 @@ you used to provision the server. You can make a symlink or shell alias for
 
 .. code-block:: console
 
-    $ pip install docopt==0.6.2 python-dateutil==2.2 PyYAML==3.11 requests==2.3.0
+    $ pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 termcolor==1.1.0
     $ sudo ln -fs $(pwd)/client/deis.py /usr/local/bin/deis
     $ deis
     Usage: deis <command> [<args>...]

tests/bin/build-deis-cli.sh

@@ -4,5 +4,5 @@
 
 virtualenv --system-site-packages venv
 . venv/bin/activate
-pip install docopt==0.6.2 python-dateutil==2.2 PyYAML==3.11 requests==2.3.0 pyinstaller==2.1 termcolor==1.1.0
+pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 pyinstaller==2.1 termcolor==1.1.0
 make -C client/ client

tests/bin/test-integration.sh

@@ -31,7 +31,7 @@ set -e
 # Build updated Deis CLI and use it for testing
 virtualenv --system-site-packages venv
 . venv/bin/activate
-pip install docopt==0.6.2 python-dateutil==2.2 PyYAML==3.11 requests==2.3.0 pyinstaller==2.1 termcolor==1.1.0
+pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 pyinstaller==2.1 termcolor==1.1.0
 make -C client/ client
 chmod +x client/dist/deis
 export PATH=`pwd`/client/dist:$PATH