[FIX/FEATURE] Added in-script clone and status check of 'submodules' which aren't modules anymore. This fixes #97

Author: Seluj78

.gitignore

@@ -103,4 +103,5 @@ ENV/
 .my*
 libft_main.c
 libft_main.out
-deepthought
+deepthought
+testing_suites

.gitmodules

@@ -179,6 +179,10 @@ def main():
 
     check_args_rules(parser, args)
 
+    # Here we create the directory where the testing suites will be cloned
+    if not os.path.exists(root_path + '/testing_suites'):
+        os.makedirs(root_path + '/testing_suites')
+
     # Here we select the project and start the check based on the argument `--project`
     if args.project == "libft":
         libft.check(root_path, args)

42PyChecker.py

@@ -118,11 +118,11 @@ def check(root_path: str, args):
         print("Libft Part two: " + libftest_results[1])
         print("Libft Bonuses: " + libftest_results[2] + '\n')
     if not args.no_maintest:
-        print("Maintest: \n{} OKs and {} FAILs.".format(maintest_ok, maintest_fail))
+        print("Maintest: \n{} OKs and {} FAILs.".format(maintest_ok, maintest_fail) + '\n')
     if not args.no_libft_unit_test:
         if args.do_benchmark:
             # @todo: Strip useless chars from benchmark results
-            print('libft-unit-test: \n' + libft_unit_test_results + '\n\n' + benchmark_results)
+            print('libft-unit-test: \n' + libft_unit_test_results + '\n\n' + benchmark_results + '\n')
         else:
-            print('libft-unit-test: \n' + libft_unit_test_results)
+            print('libft-unit-test: \n' + libft_unit_test_results + '\n')
     return 0

PyChecker/projects/libft.py

@@ -4,7 +4,7 @@
 """
 
 import subprocess
-
+from PyChecker.utils import git
 
 def run(root_path: str, project_path: str):
     """
@@ -16,6 +16,11 @@ def run(root_path: str, project_path: str):
     print("*-------------------------fillit_checker------------------------*")
     print("*---------------------------------------------------------------*")
 
+    if "fatal: Not a git repository" in git.status(root_path + '/testing_suites/fillit_checker'):
+        git.clone("https://github.com/anisg/fillit_checker", root_path + '/testing_suites/fillit_checker')
+    else:
+        git.reset(root_path + '/testing_suites/fillit_checker')
+
     # @todo: Find a way to supress colors from output
     result = subprocess.run(['bash', root_path + "/testing_suites/fillit_checker/test.sh", project_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode('utf-8')
     print(result)

PyChecker/testing_suite/fillit_checker.py

@@ -7,9 +7,12 @@
 import subprocess
 import os
 import io
+from PyChecker.utils import git
 
 
 def run(root_path: str, args):
+
+
     print("*---------------------------------------------------------------*")
     print("*------------------------libft-unit-test------------------------*")
     print("*---------------------------------------------------------------*")
@@ -20,6 +23,11 @@ def run(root_path: str, args):
             file.write("Sorry, this testing suite can only be ran on Darwin computers (MacOS)\n")
         return "Sorry, this testing suite can only be ran on Darwin computers (MacOS)"
 
+    if "fatal: Not a git repository" in git.status(root_path + '/testing_suites/libft-unit-test'):
+        git.clone("https://github.com/alelievr/libft-unit-test.git", root_path + '/testing_suites/libft-unit-test')
+    else:
+        git.reset(root_path + '/testing_suites/libft-unit-test')
+
     with open(root_path + '/.mylibftunittest', 'w+') as file:
         result = subprocess.run(['make', 're', '-C', root_path + '/testing_suites/libft-unit-test', 'LIBFTDIR=' + args.path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode('utf-8')
         file.write(result)

PyChecker/testing_suite/libft_unit_test.py

@@ -5,7 +5,7 @@
 
 import os
 import subprocess
-
+from PyChecker.utils import git
 
 def replace_my_config(root_path: str, project_path: str):
     with open(root_path + "/testing_suites/libftest/my_config.sh", 'w+') as file:
@@ -28,6 +28,12 @@ def run(project_path: str, root_path: str):
 
     :param project_path: The path of the project you want to test.
     """
+
+    if "fatal: Not a git repository" in git.status(root_path + '/testing_suites/libftest'):
+        git.clone("https://github.com/jtoty/libftest.git", root_path + '/testing_suites/libftest')
+    else:
+        git.reset(root_path + '/testing_suites/libftest')
+
     print("*---------------------------------------------------------------*")
     print("*----------------------------Libftest---------------------------*")
     print("*---------------------------------------------------------------*")

PyChecker/testing_suite/libftest.py

@@ -7,7 +7,7 @@
 import re
 import subprocess
 import platform
-
+from PyChecker.utils import git
 
 def comment_define(source, destination, tokens):
     """
@@ -32,6 +32,12 @@ def run_libft(project_path: str, root_path: str):
 
     :param project_path: The path of the project you want to test.
     """
+
+    if "fatal: Not a git repository" in git.status(root_path + '/testing_suites/Maintest'):
+        git.clone("https://github.com/QuentinPerez/Maintest.git", root_path + '/testing_suites/Maintest')
+    else:
+        git.reset(root_path + '/testing_suites/Maintest')
+
     print("*---------------------------------------------------------------*")
     print("*----------------------------Maintest---------------------------*")
     print("*---------------------------------------------------------------*")

PyChecker/testing_suite/maintest.py

@@ -5,6 +5,8 @@
 
 import os
 import subprocess
+from PyChecker.utils import git
+
 
 def include_libft_bonuses(root_path: str):
     """
@@ -59,11 +61,16 @@ def execute_test(test_name: str, root_path: str):
 
 
 def run(project_path: str, has_libft_bonuses: bool, project: str, root_path: str):
+
+    if "fatal: Not a git repository" in git.status(root_path + '/testing_suites/moulitest'):
+        git.clone("https://github.com/yyang42/moulitest.git", root_path + '/testing_suites/moulitest')
+    else:
+        git.reset(root_path + '/testing_suites/moulitest')
+
     print("*---------------------------------------------------------------*")
     print("*--------------------------Moulitest----------------------------*")
     print("*---------------------------------------------------------------*")
     available_projects = ['ft_ls', 'ft_printf', 'gnl', 'libft', 'libftasm']
-
     #  Available projects checks if the given project corresponds to one the moulitest tests.
     if project not in available_projects:
         raise ValueError("given project not in moulitest available projects.")

PyChecker/testing_suite/moulitest.py

@@ -0,0 +1,44 @@
+"""
+    Copyright (C) 2018 Jules Lasne <jules.lasne@gmail.com>
+    See full notice in `LICENSE'
+"""
+
+import subprocess
+import shutil
+
+
+def clone(repo: str, path: str):
+    result = subprocess.run(['git', 'clone', repo, path, '--recursive'],
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT).stdout.decode('utf-8')
+    return result
+
+
+def status(path: str):
+    result = subprocess.run(['git', '--git-dir=' + path + '/.git', '--work-tree=' + path, 'status'],
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT).stdout.decode('utf-8')
+    # @todo: Parse git's output and return like 0/1
+    return result
+
+
+def reset(path: str):
+    result = subprocess.run(['git', '--git-dir=' + path + '/.git', '--work-tree=' + path, 'fetch', 'origin'],
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT).stdout.decode('utf-8')
+    result += subprocess.run(['git', '--git-dir=' + path + '/.git', '--work-tree=' + path, 'reset', '--hard', 'origin/master'],
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT).stdout.decode('utf-8')
+    result += subprocess.run(['git', '--git-dir=' + path + '/.git', '--work-tree=' + path, 'clean', '-f'],
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT).stdout.decode('utf-8')
+    return result
+
+
+def delete(path: str):
+    shutil.rmtree(path)
+    return
+
+
+def remove(path: str):
+    delete(path)