Merge pull request #83 from Integrated-Testing-Environment/dev

Dev

Author: JE-Chen

.idea/misc.xml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_auto_control_dev"
-version = "0.0.66"
+version = "0.0.68"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

.idea/workspace.xml

@@ -11,6 +11,7 @@
 from je_auto_control.utils.file_process.get_dir_file_list import \
     get_dir_files_as_list
 from je_auto_control.utils.json.json_file import read_action_json
+from je_auto_control.utils.project.create_project_structure import create_project_dir
 
 if __name__ == "__main__":
     try:
@@ -25,6 +26,7 @@ def preprocess_execute_files(file_path: str):
         argparse_event_dict = {
             "execute_file": preprocess_execute_action,
             "execute_dir": preprocess_execute_files,
+            "create_project": create_project_dir
         }
         parser = argparse.ArgumentParser()
         parser.add_argument(
@@ -35,6 +37,10 @@ def preprocess_execute_files(file_path: str):
             "-d", "--execute_dir",
             type=str, help="choose dir include action file to execute"
         )
+        parser.add_argument(
+            "-c", "--create_project",
+            type=str, help="create project with template"
+        )
         args = parser.parse_args()
         args = vars(args)
         for key, value in args.items():

dev.toml

@@ -1,12 +1,12 @@
-from pathlib import Path
 from os import getcwd
+from pathlib import Path
 from threading import Lock
 
 from je_auto_control.utils.json.json_file import write_action_json
 from je_auto_control.utils.project.template.template_executor import executor_template_1, \
-    executor_template_2
+    executor_template_2, bad_executor_template_1
 from je_auto_control.utils.project.template.template_keyword import template_keyword_1, \
-    template_keyword_2
+    template_keyword_2, bad_template_1
 
 
 def create_dir(dir_name: str) -> None:
@@ -20,35 +20,47 @@ def create_dir(dir_name: str) -> None:
     )
 
 
-def create_template(parent_name: str) -> None:
-    keyword_dir_path = Path(getcwd() + "/" + parent_name + "/keyword")
-    executor_dir_path = Path(getcwd() + "/" + parent_name + "/executor")
+def create_template(parent_name: str, project_path: str = None) -> None:
+    if project_path is None:
+        project_path = getcwd()
+    keyword_dir_path = Path(project_path + "/" + parent_name + "/keyword")
+    executor_dir_path = Path(project_path + "/" + parent_name + "/executor")
     lock = Lock()
     if keyword_dir_path.exists() and keyword_dir_path.is_dir():
-        write_action_json(getcwd() + "/" + parent_name + "/keyword/keyword1.json", template_keyword_1)
-        write_action_json(getcwd() + "/" + parent_name + "/keyword/keyword2.json", template_keyword_2)
+        write_action_json(project_path + "/" + parent_name + "/keyword/keyword1.json", template_keyword_1)
+        write_action_json(project_path + "/" + parent_name + "/keyword/keyword2.json", template_keyword_2)
+        write_action_json(project_path + "/" + parent_name + "/keyword/bad_keyword_1.json", bad_template_1)
     if executor_dir_path.exists() and keyword_dir_path.is_dir():
         lock.acquire()
         try:
-            with open(getcwd() + "/" + parent_name + "/executor/executor_one_file.py", "w+") as file:
+            with open(project_path + "/" + parent_name + "/executor/executor_one_file.py", "w+") as file:
                 file.write(
                     executor_template_1.replace(
                         "{temp}",
-                        getcwd() + "/" + parent_name + "/keyword/keyword1.json"
+                        project_path + "/" + parent_name + "/keyword/keyword1.json"
+                    )
+                )
+            with open(project_path + "/" + parent_name + "/executor/executor_bad_file.py", "w+") as file:
+                file.write(
+                    bad_executor_template_1.replace(
+                        "{temp}",
+                        project_path + "/" + parent_name + "/keyword/bad_keyword_1.json"
                     )
                 )
-            with open(getcwd() + "/" + parent_name + "/executor/executor_folder.py", "w+") as file:
+            with open(project_path + "/" + parent_name + "/executor/executor_folder.py", "w+") as file:
                 file.write(
                     executor_template_2.replace(
                         "{temp}",
-                        getcwd() + "/" + parent_name + "/keyword"
+                        project_path + "/" + parent_name + "/keyword"
                     )
                 )
         finally:
             lock.release()
 
 
-def create_project_dir(parent_name: str) -> None:
-    create_dir(getcwd() + "/" + parent_name + "/keyword")
-    create_dir(getcwd() + "/" + parent_name + "/executor")
+def create_project_dir(project_path: str = None, parent_name: str = "AutoControl") -> None:
+    if project_path is None:
+        project_path = getcwd()
+    create_dir(project_path + "/" + parent_name + "/keyword")
+    create_dir(project_path + "/" + parent_name + "/executor")
     create_template(parent_name)

je_auto_control/__main__.py

@@ -17,3 +17,15 @@
     )
 )
 """
+
+bad_executor_template_1: str = \
+    """
+# This example is primarily intended to remind users of the importance of verifying input.
+from je_auto_control import execute_action, read_action_json
+    
+execute_action(
+    read_action_json(
+        r"{temp}"
+    )
+)
+"""

je_auto_control/utils/project/create_project_structure.py

@@ -48,3 +48,9 @@
     ["generate_json_report"]
 ]
 
+bad_template_1 = [
+    ["set_record_enable", [True]],
+    ["add_package_to_executor", ["os"]],
+    ["os_system", ["python --version"]],
+    ["os_system", ["python -m pip --version"]],
+]

je_auto_control/utils/project/template/template_executor.py

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_auto_control"
-version = "0.0.130"
+version = "0.0.133"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

je_auto_control/utils/project/template/template_keyword.py

@@ -5,3 +5,4 @@
 os.system("cd " + os.getcwd())
 os.system("python je_auto_control --execute_file " + os.getcwd() + r"/test/unit_test/argparse/test1.json")
 os.system("python je_auto_control --execute_dir " + os.getcwd() + r"/test/unit_test/argparse")
+os.system("python je_auto_control --create_project " + os.getcwd())

pyproject.toml

@@ -1,3 +1,3 @@
 from je_auto_control import create_project_dir
 
-create_project_dir("My Test Project")
+create_project_dir()