Refactoring config in a class to have a testable environment

1 files changed, 15 insertions, 14 deletions

diff --git a/minishell_test/__main__.py b/minishell_test/__main__.py
index b5761d0..4ebaec3 100755
--- a/minishell_test/__main__.py
+++ b/minishell_test/__main__.py
@@ -18,7 +18,7 @@ import shutil
 import distutils.spawn
 import subprocess
 
-from minishell_test import config
+from minishell_test.config import Config
 from minishell_test import sandbox
 from minishell_test.args import parse_args
 from minishell_test.suite.suite import Suite, SuiteException
@@ -27,32 +27,33 @@ from minishell_test.test import Test
 
 
 def main(argv=None):
-    args = parse_args()
+    args = parse_args(sys.argv[1:])
+    Config.init(args)
 
     if args.list:
         Suite.list()
         sys.exit(0)
 
     # running ``make`` in minishell directory
-    if config.MAKE or args.make:
-        print("{:=^{width}}".format("MAKE", width=config.TERM_COLS))
+    if Config.make or args.make:
+        print("{:=^{width}}".format("MAKE", width=Config.term_cols))
         try:
             subprocess.run(
-                ["make", *config.MAKE_ARGS, "--no-print-directory", "-C", config.MINISHELL_DIR],
+                ["make", *Config.make_args, "--no-print-directory", "-C", Config.minishell_dir],
                 check=True,
                 env=os.environ,
             )
         except subprocess.CalledProcessError:
             sys.exit(1)
-        print("=" * config.TERM_COLS)
+        print("=" * Config.term_cols)
         if args.make:
             sys.exit(0)
 
     # setup available commands
-    if not config.SHELL_AVAILABLE_COMMANDS_DIR.exists():
-        config.SHELL_AVAILABLE_COMMANDS_DIR.mkdir(parents=True, exist_ok=True)
-    for cmd in config.SHELL_AVAILABLE_COMMANDS:
-        copied_path = config.SHELL_AVAILABLE_COMMANDS_DIR / cmd
+    if not Config.shell_available_commands_dir.exists():
+        Config.shell_available_commands_dir.mkdir(parents=True, exist_ok=True)
+    for cmd in Config.shell_available_commands:
+        copied_path = Config.shell_available_commands_dir / cmd
         if copied_path.exists():
             continue
         cmd_path = distutils.spawn.find_executable(cmd)
@@ -80,14 +81,14 @@ def main(argv=None):
 
     Suite.summarize()
     Suite.save_log()
-    print("See", config.LOG_PATH, "for more information")
-    if config.CHECK_LEAKS:
+    print("See", Config.log_path, "for more information")
+    if Config.check_leaks:
         print("HELP: Valgrind is really slow the -x and --range options could be useful"
               " ({} -h for more details)".format(sys.argv[0]))
 
-    if config.PAGER:
+    if Config.pager:
         # TODO {} replaced by filename in pager config var
-        subprocess.run([config.PAGER_PROG, config.LOG_PATH])
+        subprocess.run([Config.pager_prog, Config.log_path])
 
 
 if __name__ == "__main__":