python editor interactive mode

lee212 · Oct 26, 2016 · 246105b · 246105b
1 parent 87e0f8b
commit 246105b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/simpleazure/azure_quickstart_templates.py b/simpleazure/azure_quickstart_templates.py
@@ -116,12 +116,12 @@ def get_templates_cli(self):
             nested = self.get_nested_cli(item)
             scripts = self.get_scripts_cli(item)
             templates[item] = Template({
-                    "azuredeploy": azuredeploy,
-                    "parameters": parameters,
-                    "metadata": meta,
-                    "nested": nested,
-                    "scripts": scripts,
-                    "etc": etc
+                    u"azuredeploy": azuredeploy,
+                    u"parameters": parameters,
+                    u"metadata": meta,
+                    u"nested": nested,
+                    u"scripts": scripts,
+                    u"etc": etc
                     })
             meta = azuredeploy = parameters = nested = scripts = etc = ""
         return templates
@@ -151,12 +151,12 @@ def get_templates_api(self):
             nested = self.get_nested_api(item['path'])
             scripts = self.get_scripts_api(item['path'])
             templates[item['name']] = Template({ 
-                    "azuredeploy": azuredeploy,
-                    "parameters": parameters,
-                    "metadata": meta,
-                    "nested": nested,
-                    "scripts": scripts,
-                    "etc": etc
+                    u"azuredeploy": azuredeploy,
+                    u"parameters": parameters,
+                    u"metadata": meta,
+                    u"nested": nested,
+                    u"scripts": scripts,
+                    u"etc": etc
                     })
             meta = azuredeploy = parameters = nested = scripts = etc = ""
         return templates

diff --git a/simpleazure/azure_resource_manager.py b/simpleazure/azure_resource_manager.py
@@ -205,7 +205,7 @@ def set_parameters(self, params):
         return self.parameters
 
     def _get_parameters_with_value(self, params):
-        parameters = {k: {'value': v} for k, v in params.items()}
+        parameters = {k: {u'value': v} for k, v in params.items()}
         return parameters
 
     def set_template(self, path_or_uri=None):
@@ -215,9 +215,10 @@ def set_template(self, path_or_uri=None):
         if urlparse(path_or_uri).scheme is not "":
             template = json.loads(urllib.urlopen(path_or_uri).read())
         else:
-            with open(path_or_uri, "r") as temp:
-                template = temp.read()
+            with open(os.path.expanduser(path_or_uri), "r") as temp:
+                template = json.loads(temp.read())
         self.template['azuredeploy'] = template
+        #self.set_parameters(template['parameters'])
 
     def load_template(self, template):
         self.template = template

diff --git a/simpleazure/template/template.py b/simpleazure/template/template.py
@@ -17,6 +17,10 @@
 import pandas as pd
 from collections import OrderedDict, defaultdict
 from itertools import islice, izip_longest
+import editor
+import json
+import datadiff
+from datadiff.tools import assert_equal
 
 class Templates(OrderedDict):
     _list = None
@@ -245,6 +249,19 @@ def _key_and_value(self, dict_with_value):
             pass
         return new_dict
 
+    def edit(self):
+        changed = json.loads(editor.edit(contents=json.dumps(self, indent=4)))
+        return Template(changed)
+
+    def diff(self, b):
+        try:
+            datadiff.tools.assert_equal(dict(self), dict(b))
+            equal=True
+        except AssertionError as e:
+            equal=False
+        if not equal:
+            print datadiff.diff(dict(self), dict(b))
+
 class Deploy(object):
     """Constructs a :class:`Deploy <Deploy>`.
     Returns :class:`Deploy <Deploy>` instance.