Add oci-env edit-env command

client/oci_env/commands.py

@@ -2,7 +2,13 @@
 import os
 import pathlib
 
-from oci_env.utils import exit_if_failed, exit_with_error
+from oci_env.utils import (
+    exit_if_failed,
+    exit_with_error,
+    get_oci_env_path,
+    get_env_file,
+    get_config
+)
 from oci_env.templates import profile_templates
 
 
@@ -93,15 +99,17 @@ def pulpcore_manager(args, client):
     client.exec(["pulpcore-manager"] + args.command, interactive=True)
 
 
-def profile(args, client):
-    src_dir = client.config["SRC_DIR"]
+def profile(args):
+    path = get_oci_env_path()
+    config = get_config(get_env_file(path, args.env_file))
+    src_dir = config["SRC_DIR"]
 
     if args.action == "init":
         if args.plugin:
             profiles_dir = os.path.join(src_dir, args.plugin, "profiles")
             profile_name = f"{args.plugin}/{args.profile_name}"
         else:
-            profiles_dir = os.path.join(client.path, "profiles")
+            profiles_dir = os.path.join(path, "profiles")
             profile_name = args.profile_name
 
         new_profile_dir = os.path.join(profiles_dir, args.profile_name)
@@ -164,3 +172,9 @@ def poll(args, client):
 
 def pulp(args, client):
     client.exec(["pulp"] + args.command, interactive=True)
+
+
+
+def edit_env(args):
+    editor = os.getenv("EDITOR", "vim")
+    subprocess.call([editor, get_env_file(get_oci_env_path(), args.env_file)])

client/oci_env/main.py

@@ -11,7 +11,8 @@
     pulpcore_manager,
     profile,
     poll,
-    pulp
+    edit_env,
+    pulp,
 )
 
 from oci_env.utils import (
@@ -23,6 +24,7 @@ def get_parser():
     parser = argparse.ArgumentParser(description='Pulp OCI image developer environment.')
     parser.add_argument('-v', action='store_true', dest='is_verbose', help="Print extra debug information.")
     parser.add_argument('-e', type=str, default="", dest='env_file', help="Specify an environment file to use other than the default.")
+    parser.set_defaults(no_init_client=False)
 
     subparsers = parser.add_subparsers()
 
@@ -36,6 +38,7 @@ def get_parser():
     parse_profile_command(subparsers)
     parse_poll_command(subparsers)
     parse_pulp_cli_command(subparsers)
+    parse_edit_env(subparsers)
 
     return parser
 
@@ -107,6 +110,8 @@ def parse_profile_command(subparsers):
     docs.add_argument('profile', nargs="?", help='Profile to view.')
     docs.set_defaults(func=profile, action="docs")
 
+    parser.set_defaults(no_init_client=True)
+
 
 def parse_poll_command(subparsers):
     parser = subparsers.add_parser('poll', help='Poll the status API until it comes up.')
@@ -121,6 +126,17 @@ def parse_pulp_cli_command(subparsers):
     parser.set_defaults(func=pulp)
 
 
+def parse_edit_env(subparsers):
+    parser = subparsers.add_parser(
+        'edit-env', 
+        help=(
+            'Edit your current environment file in vim. To change the default editor, set the '
+            'EDITOR environment variable to the path for the binary of your choosing.'
+        )
+    )
+    parser.set_defaults(func=edit_env, no_init_client=True)
+
+
 def main():
     parser = get_parser()
     args = parser.parse_args()
@@ -129,9 +145,15 @@ def main():
         parser.print_help()
         exit()
 
-    client = Compose(args.is_verbose, args.env_file)
     try:
-        args.func(args, client)
+        # Initializing the client generates the .compiled/ directory and performs a lot of
+        # validation that's not necessary for some sub and may cause these commands to fail
+        # when the user has an invalid environment file set up.
+        if args.no_init_client:
+            args.func(args)
+        else:
+            client = Compose(args.is_verbose, args.env_file)
+            args.func(args, client)
     except KeyboardInterrupt:
         print()
         exit(1)