Merge pull request #5 from jet-dev-team/improve-cli

Improve cli and code styling

Author: svicervlad

drupal_dockerizer/__init__.py

@@ -6,13 +6,13 @@
 from drupal_dockerizer.cli import cli
 
 __all__ = [
-    'AppConfig',
-    'DockerizerConfig',
-    'check_tool',
-    'Pull',
-    'findConfigPath',
-    'check_socket',
-    'getNetworkId',
-    'checkLocalhostPort',
-    'cli'
-    ]
+    "AppConfig",
+    "DockerizerConfig",
+    "check_tool",
+    "Pull",
+    "findConfigPath",
+    "check_socket",
+    "getNetworkId",
+    "checkLocalhostPort",
+    "cli",
+]

drupal_dockerizer/appconfig.py

@@ -3,11 +3,12 @@
 from pathlib import Path
 import yaml
 
-config_dir_name = 'drupal_dockerizer'
-config_file_name = 'config.yml'
+config_dir_name = "drupal_dockerizer"
+config_file_name = "config.yml"
 user_config_dir = appdirs.user_config_dir()
 
-class AppConfig():
+
+class AppConfig:
     data = {}
 
     def __init__(self) -> None:
@@ -17,37 +18,46 @@ def __init__(self) -> None:
         self.config_file_path = str(config_file_path)
 
         if not os.path.exists(str(config_dir_path)):
-          os.mkdir(str(config_dir_path))
+            os.mkdir(str(config_dir_path))
 
         if not os.path.exists(self.config_file_path):
-          self.data = {
-              'is_check_requirements_tools': False,
-              'version': 0.1,
-              'projects': {}
-          }
-          self.save()
+            self.data = {
+                "is_check_requirements_tools": False,
+                "version": "0.0.4",
+                "instances": {},
+            }
+            self.save()
         self.load()
 
     def save(self):
-      file_config = open(self.config_file_path, 'w')
-      yaml.safe_dump(self.data, file_config, sort_keys=True)
-      file_config.close()
+        file_config = open(self.config_file_path, "w")
+        yaml.safe_dump(self.data, file_config, sort_keys=True)
+        file_config.close()
 
     def load(self):
-      file_config = open(self.config_file_path, 'r')
-      self.data = dict(yaml.full_load(file_config))
-      file_config.close()
-
-    def addProject(self, project_conf):
-        self.data['projects'][project_conf.data['compose_project_name']] = {
-            'project': project_conf.data['compose_project_name'],
-            'root_dir': project_conf.data['drupal_root_dir'],
-            'domain': project_conf.data['domain_name'] if project_conf.data['advanced_networking'] else 'http://localhost',
-            'status': 'up',
+        file_config = open(self.config_file_path, "r")
+        self.data = dict(yaml.full_load(file_config))
+        file_config.close()
+
+    def addInstance(self, instance_conf):
+        self.data["instances"][instance_conf.data["compose_project_name"]] = {
+            "instance": instance_conf.data["compose_project_name"],
+            "root_dir": instance_conf.data["drupal_root_dir"],
+            "domain": instance_conf.data["domain_name"]
+            if instance_conf.data["advanced_networking"]
+            else "http://localhost",
+            "status": "up",
         }
 
-    def stopProject(self, project_conf):
-      self.data['projects'][project_conf.data['compose_project_name']]['status'] = 'stop'
+    def stopInstance(self, instance_conf):
+        self.data["instances"][instance_conf.data["compose_project_name"]][
+            "status"
+        ] = "stop"
+
+    def upInstance(self, instance_conf):
+        self.data["instances"][instance_conf.data["compose_project_name"]][
+            "status"
+        ] = "up"
 
-    def removeProject(self, project_conf):
-      del self.data['projects'][project_conf.data['compose_project_name']]
+    def removeInstance(self, instance_conf):
+        del self.data["instances"][instance_conf.data["compose_project_name"]]