Add commands 'config dump --default' and 'config delete {name}'

Author: camilbancioiu

erdpy/cli_config.py

@@ -13,6 +13,7 @@ def setup_parser(subparsers: Any) -> Any:
     subparsers = parser.add_subparsers()
 
     sub = cli_shared.add_command_subparser(subparsers, "config", "dump", "Dumps configuration.")
+    sub.add_argument('--defaults', required=False, help='dump defaults instead of local config', action='store_true')
     sub.set_defaults(func=dump)
 
     sub = cli_shared.add_command_subparser(subparsers, "config", "get", "Gets a configuration value.")
@@ -24,6 +25,10 @@ def setup_parser(subparsers: Any) -> Any:
     sub.add_argument("value", help="the new value")
     sub.set_defaults(func=set_value)
 
+    sub = cli_shared.add_command_subparser(subparsers, "config", "delete", "Deletes a configuration value.")
+    _add_name_arg(sub)
+    sub.set_defaults(func=delete_value)
+
     sub = cli_shared.add_command_subparser(subparsers, "config", "new", "Creates a new configuration.")
     _add_name_arg(sub)
     sub.add_argument("--template", required=False, help="template from which to create the new config")
@@ -45,7 +50,11 @@ def _add_name_arg(sub: Any):
 
 
 def dump(args: Any):
-    data = config.get_active()
+    if args.defaults:
+        data = config.get_defaults()
+    else:
+        data = config.get_active()
+
     utils.dump_out_json(data, sys.stdout)
 
 
@@ -58,6 +67,10 @@ def set_value(args: Any):
     config.set_value(args.name, args.value)
 
 
+def delete_value(args: Any):
+    config.delete_value(args.name)
+
+
 def new_config(args: Any):
     config.create_new_config(name=args.name, template=args.template)
     dump(None)

erdpy/config.py

@@ -1,5 +1,3 @@
-from itertools import chain
-from logging import Logger
 import os.path
 from typing import Any, Dict, List
 
@@ -57,7 +55,8 @@ def get_dependency_url(key: str, tag: str, platform: str) -> str:
 def get_value(name: str) -> str:
     _guard_valid_name(name)
     data = get_active()
-    value = data.get(name, get_defaults()[name])
+    default_value = get_defaults()[name]
+    value = data.get(name, default_value)
     assert isinstance(value, str)
     return value
 
@@ -72,6 +71,16 @@ def set_value(name: str, value: Any):
     write_file(data)
 
 
+def delete_value(name: str):
+    _guard_valid_config_deletion(name)
+    data = read_file()
+    active_config = data.get("active", "default")
+    data.setdefault("configurations", {})
+    data["configurations"].setdefault(active_config, {})
+    del data["configurations"][active_config][name]
+    write_file(data)
+
+
 def get_active():
     data = read_file()
     configs = data.get("configurations", {})