Skip to content

Commit 3603e8d

Browse files
d4rkstarfrancescotimperi
authored andcommitted
nuvolaris config from package.json
1 parent fd77bbe commit 3603e8d

File tree

1 file changed

+47
-11
lines changed

1 file changed

+47
-11
lines changed

ide/deploy/scan.py

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,70 @@
1717

1818
from glob import glob
1919
from .deploy import *
20+
from .client import get_nuvolaris_config
21+
2022

2123
def scan():
2224
# first look for requirements.txt and build the venv (add in set)
2325
deployments = set()
2426
packages = set()
2527

2628
print("> Scan:")
27-
reqs = glob("packages/*/*/requirements.txt") + glob("packages/*/*/package.json")
29+
30+
# => REQUIREMENTS
31+
default_reqs_globs = ["packages/*/*/requirements.txt",
32+
"packages/*/*/package.json",
33+
"packages/*/*/composer.json",
34+
"packages/*/*/go.mod"]
35+
36+
package_globs = get_nuvolaris_config("requirements", default_reqs_globs)
37+
reqs = list()
38+
39+
for pkg_glob in package_globs:
40+
items = glob(pkg_glob)
41+
# extend first list without duplicates
42+
reqs.extend(x for x in items if x not in reqs)
43+
2844
# req = reqs[0]
2945
# from util.deploy.deploy import *
3046
for req in reqs:
3147
print(">> Requirements:", req)
3248
sp = req.split("/")
33-
act = build_zip(sp[1],sp[2])
49+
act = build_zip(sp[1], sp[2])
3450
deployments.add(act)
3551
packages.add(sp[1])
36-
37-
mains = glob("packages/*/*/index.js") + glob("packages/*/*/__main__.py")
52+
53+
# => MAINS
54+
default_mains_globs = ["packages/*/*/index.js",
55+
"packages/*/*/__main__.py",
56+
"packages/*/*/index.php",
57+
"packages/*/*/main.go"]
58+
mains_globs = get_nuvolaris_config("mains", default_mains_globs)
59+
mains = list()
60+
for main_glob in mains_globs:
61+
items = glob(main_glob)
62+
# extend first list without duplicates
63+
mains.extend(x for x in items if x not in mains)
64+
3865
# main = mains[2]
39-
for main in mains:
66+
for main in mains:
4067
print(">> Main:", main)
4168
sp = main.split("/")
42-
act = build_action(sp[1],sp[2])
69+
act = build_action(sp[1], sp[2])
4370
deployments.add(act)
44-
packages.add(sp[1])
71+
packages.add(sp[1])
72+
73+
# => SINGLES
74+
default_singles_globs = ["packages/*/*.py",
75+
"packages/*/*.js",
76+
"packages/*/*.php",
77+
"packages/*/*.go"]
78+
singles_globs = get_nuvolaris_config("singles", default_singles_globs)
79+
singles = list()
80+
for single_glob in singles_globs:
81+
items = glob(single_glob)
82+
singles.extend(x for x in items if x not in singles)
4583

46-
singles = glob("packages/*/*.py") + glob("packages/*/*.js")
4784
# single = singles[0]
4885
for single in singles:
4986
print(">> Action:", single)
@@ -52,11 +89,10 @@ def scan():
5289
packages.add(sp[1])
5390

5491
print("> Deploying:")
55-
5692
for package in packages:
5793
print(">> Package:", package)
5894
deploy_package(package)
59-
95+
6096
for action in deployments:
6197
print(">>> Action:", action)
62-
deploy_action(action)
98+
deploy_action(action)

0 commit comments

Comments
 (0)