Merge pull request #6 from git-mastery/woojiahao/refactor

Cleaning up codebase

Author: woojiahao

app/cli.py

@@ -6,7 +6,13 @@
 
 from app.commands import check, download, progress, setup, verify
 from app.commands.version import version
-from app.utils.click import warn
+from app.utils.click import ClickColor, CliContextKey, warn
+from app.utils.gitmastery import (
+    find_exercise_root,
+    find_gitmastery_root,
+    read_gitmastery_config,
+    read_exercise_config,
+)
 from app.utils.version import Version
 from app.version import __version__
 
@@ -24,20 +30,36 @@ def invoke(self, ctx: click.Context) -> None:
 def cli(ctx, verbose) -> None:
     """Git-Mastery app"""
     ctx.ensure_object(dict)
-    ctx.obj["VERBOSE"] = verbose
+
+    # Attempt to load both Git-Mastery root config and exercise config where possible
+    gitmastery_root = find_gitmastery_root()
+    if gitmastery_root is not None:
+        root_path, cds = gitmastery_root
+        gitmastery_root_config = read_gitmastery_config(root_path, cds)
+        ctx.obj[CliContextKey.GITMASTERY_ROOT_CONFIG] = gitmastery_root_config
+
+    exercise_root = find_exercise_root()
+    if exercise_root is not None:
+        root_path, cds = exercise_root
+        exercise_root_config = read_exercise_config(root_path, cds)
+        ctx.obj[CliContextKey.GITMASTERY_EXERCISE_CONFIG] = exercise_root_config
+
+    ctx.obj[CliContextKey.VERBOSE] = verbose
+
     current_version = Version.parse_version_string(__version__)
+    ctx.obj[CliContextKey.VERSION] = current_version
     latest_version = (
         requests.get(
             "https://github.com/git-mastery/app/releases/latest", allow_redirects=False
         )
         .headers["Location"]
         .rsplit("/", 1)[-1]
     )
-    if current_version.is_behind(latest_version):
+    if current_version.is_behind(Version.parse_version_string(latest_version)):
         warn(
             click.style(
                 f"Your version of Git-Mastery app {current_version} is behind the latest version {latest_version}.",
-                fg="bright_red",
+                fg=ClickColor.BRIGHT_RED,
             )
         )
         warn("We strongly recommend upgrading your app.")
@@ -47,10 +69,7 @@ def cli(ctx, verbose) -> None:
 
 
 def start() -> None:
-    cli.add_command(check)
-    cli.add_command(download)
-    cli.add_command(progress)
-    cli.add_command(setup)
-    cli.add_command(verify)
-    cli.add_command(version)
+    commands = [check, download, progress, setup, verify, version]
+    for command in commands:
+        cli.add_command(command)
     cli(obj={})

app/commands/check/git.py

@@ -1,24 +1,21 @@
 import click
 
 from app.utils.click import error, info, success
-from app.utils.git_cli import get_git_config, is_git_installed
+from app.utils.git import get_git_config, is_git_installed
 
 
 @click.command()
-@click.pass_context
-def git(ctx: click.Context) -> None:
+def git() -> None:
     """
     Verifies if Git is installed and setup for Git-Mastery.
     """
-    verbose = ctx.obj["VERBOSE"]
-
     info("Checking that you have Git installed and configured")
-    if is_git_installed(verbose):
+    if is_git_installed():
         info("Git is installed")
     else:
         error("Git is not installed")
 
-    config_user_name = get_git_config("user.name", verbose)
+    config_user_name = get_git_config("user.name")
     if not config_user_name:
         error(
             f"You do not have {click.style('user.name', bold=True)} yet. Run {click.style('git config --global user.name <name>', bold=True, italic=True)}."
@@ -28,7 +25,7 @@ def git(ctx: click.Context) -> None:
             f"You have set {click.style('user.name', bold=True)} as {click.style(config_user_name, bold=True, italic=True)}"
         )
 
-    config_user_email = get_git_config("user.email", verbose)
+    config_user_email = get_git_config("user.email")
     if not config_user_email:
         error(
             f"You do not have {click.style('user.email', bold=True)} yet. Run {click.style('git config --global user.email <email>', bold=True, italic=True)}."

app/commands/check/github.py

@@ -1,34 +1,31 @@
 import click
 
 from app.utils.click import error, info, success
-from app.utils.gh_cli import (
+from app.utils.github_cli import (
     has_delete_repo_scope,
     is_authenticated,
     is_github_cli_installed,
 )
 
 
 @click.command()
-@click.pass_context
-def github(ctx: click.Context) -> None:
+def github() -> None:
     """
     Verifies if Github and Github CLI is installed and setup for Git-Mastery.
     """
-    verbose = ctx.obj["VERBOSE"]
-
     info("Checking that you have Github CLI is installed and configured")
 
-    if is_github_cli_installed(verbose):
+    if is_github_cli_installed():
         info("Github CLI is installed")
     else:
         error("Github CLI is not installed yet")
 
-    if is_authenticated(verbose):
+    if is_authenticated():
         info("You have authenticated Github CLI")
     else:
         error("You have not authenticated Github CLI")
 
-    if has_delete_repo_scope(verbose):
+    if has_delete_repo_scope():
         info("You have authenticated Github CLI with the 'delete_repo' scope")
     else:
         error(