Skip to content

Commit a0ca559

Browse files
committed
Add create project cli and upload dev version
Add create project cli and upload dev version
1 parent 323f17d commit a0ca559

File tree

11 files changed

+37
-351
lines changed

11 files changed

+37
-351
lines changed

je_auto_control/__main__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from je_auto_control.utils.file_process.get_dir_file_list import \
1212
get_dir_files_as_list
1313
from je_auto_control.utils.json.json_file import read_action_json
14+
from je_auto_control.utils.project.create_project_structure import create_project_dir
1415

1516
if __name__ == "__main__":
1617
try:
@@ -25,6 +26,7 @@ def preprocess_execute_files(file_path: str):
2526
argparse_event_dict = {
2627
"execute_file": preprocess_execute_action,
2728
"execute_dir": preprocess_execute_files,
29+
"create_project": create_project_dir
2830
}
2931
parser = argparse.ArgumentParser()
3032
parser.add_argument(
@@ -35,6 +37,10 @@ def preprocess_execute_files(file_path: str):
3537
"-d", "--execute_dir",
3638
type=str, help="choose dir include action file to execute"
3739
)
40+
parser.add_argument(
41+
"-c", "--create_project",
42+
type=str, help="create project with template"
43+
)
3844
args = parser.parse_args()
3945
args = vars(args)
4046
for key, value in args.items():
Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from pathlib import Path
21
from os import getcwd
2+
from pathlib import Path
33
from threading import Lock
44

55
from je_auto_control.utils.json.json_file import write_action_json
@@ -20,43 +20,47 @@ def create_dir(dir_name: str) -> None:
2020
)
2121

2222

23-
def create_template(parent_name: str) -> None:
24-
keyword_dir_path = Path(getcwd() + "/" + parent_name + "/keyword")
25-
executor_dir_path = Path(getcwd() + "/" + parent_name + "/executor")
23+
def create_template(parent_name: str, project_path: str = None) -> None:
24+
if project_path is None:
25+
project_path = getcwd()
26+
keyword_dir_path = Path(project_path + "/" + parent_name + "/keyword")
27+
executor_dir_path = Path(project_path + "/" + parent_name + "/executor")
2628
lock = Lock()
2729
if keyword_dir_path.exists() and keyword_dir_path.is_dir():
28-
write_action_json(getcwd() + "/" + parent_name + "/keyword/keyword1.json", template_keyword_1)
29-
write_action_json(getcwd() + "/" + parent_name + "/keyword/keyword2.json", template_keyword_2)
30-
write_action_json(getcwd() + "/" + parent_name + "/keyword/bad_keyword_1.json", bad_template_1)
30+
write_action_json(project_path + "/" + parent_name + "/keyword/keyword1.json", template_keyword_1)
31+
write_action_json(project_path + "/" + parent_name + "/keyword/keyword2.json", template_keyword_2)
32+
write_action_json(project_path + "/" + parent_name + "/keyword/bad_keyword_1.json", bad_template_1)
3133
if executor_dir_path.exists() and keyword_dir_path.is_dir():
3234
lock.acquire()
3335
try:
34-
with open(getcwd() + "/" + parent_name + "/executor/executor_one_file.py", "w+") as file:
36+
with open(project_path + "/" + parent_name + "/executor/executor_one_file.py", "w+") as file:
3537
file.write(
3638
executor_template_1.replace(
3739
"{temp}",
38-
getcwd() + "/" + parent_name + "/keyword/keyword1.json"
40+
project_path + "/" + parent_name + "/keyword/keyword1.json"
3941
)
4042
)
41-
with open(getcwd() + "/" + parent_name + "/executor/executor_bad_file.py", "w+") as file:
43+
with open(project_path + "/" + parent_name + "/executor/executor_bad_file.py", "w+") as file:
4244
file.write(
4345
bad_executor_template_1.replace(
4446
"{temp}",
45-
getcwd() + "/" + parent_name + "/keyword/bad_keyword_1.json"
47+
project_path + "/" + parent_name + "/keyword/bad_keyword_1.json"
4648
)
4749
)
48-
with open(getcwd() + "/" + parent_name + "/executor/executor_folder.py", "w+") as file:
50+
with open(project_path + "/" + parent_name + "/executor/executor_folder.py", "w+") as file:
4951
file.write(
5052
executor_template_2.replace(
5153
"{temp}",
52-
getcwd() + "/" + parent_name + "/keyword"
54+
project_path + "/" + parent_name + "/keyword"
5355
)
5456
)
5557
finally:
5658
lock.release()
5759

5860

59-
def create_project_dir(parent_name: str) -> None:
60-
create_dir(getcwd() + "/" + parent_name + "/keyword")
61-
create_dir(getcwd() + "/" + parent_name + "/executor")
61+
def create_project_dir(parent_name: str, project_path: str = None) -> None:
62+
if project_path is None:
63+
project_path = getcwd()
64+
create_dir(project_path + "/" + parent_name + "/keyword")
65+
create_dir(project_path + "/" + parent_name + "/executor")
6266
create_template(parent_name)

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Rename to build stable version
2-
# This is stable version
1+
# Rename to build dev version
2+
# This is dev version
33
[build-system]
4-
requires = ["setuptools>=61.0"]
4+
requires = ["setuptools"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "je_auto_control"
9-
version = "0.0.130"
8+
name = "je_auto_control_dev"
9+
version = "0.0.67"
1010
authors = [
1111
{ name = "JE-Chen", email = "zenmailman@gmail.com" },
1212
]

dev.toml renamed to stable.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Rename to build dev version
2-
# This is dev version
1+
# Rename to build stable version
2+
# This is stable version
33
[build-system]
4-
requires = ["setuptools"]
4+
requires = ["setuptools>=61.0"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "je_auto_control_dev"
9-
version = "0.0.66"
8+
name = "je_auto_control"
9+
version = "0.0.131"
1010
authors = [
1111
{ name = "JE-Chen", email = "zenmailman@gmail.com" },
1212
]

test/unit_test/argparse/argparse_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
os.system("cd " + os.getcwd())
66
os.system("python je_auto_control --execute_file " + os.getcwd() + r"/test/unit_test/argparse/test1.json")
77
os.system("python je_auto_control --execute_dir " + os.getcwd() + r"/test/unit_test/argparse")
8+
os.system("python je_auto_control --create_project " + os.getcwd())

test/unit_test/create_project_file/My Test Project/executor/executor_bad_file.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

test/unit_test/create_project_file/My Test Project/executor/executor_folder.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/unit_test/create_project_file/My Test Project/executor/executor_one_file.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/unit_test/create_project_file/My Test Project/keyword/bad_keyword_1.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

test/unit_test/create_project_file/My Test Project/keyword/keyword1.json

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)